From 775dfc683c99fe77980384df199617b11acc6a84 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Thu, 17 Aug 2006 02:47:44 +0000 Subject: [PATCH] Fixed a crash bug on AMD64 dealing with integer sizes (bug #895) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2410 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/sc2code/state.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 3b52774fb..2fd393383 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.6: +- Fixed an integer-size error that was causing crashes on AMD64, from + Solomon Peachy (#895) - Michael - Added some generic lib code to be used by future code. - SvdB - Joystick support is now optional; from SvdB, Alex - Restructed and normalized savegame and game-state reading/writing code; diff --git a/sc2/src/sc2code/state.h b/sc2/src/sc2code/state.h index 1caf833ce..f81ceb3ef 100644 --- a/sc2/src/sc2code/state.h +++ b/sc2/src/sc2code/state.h @@ -32,9 +32,9 @@ extern void InitGroupInfo (BOOLEAN FirstTime); extern void UninitGroupInfo (void); extern BOOLEAN GetGroupInfo (DWORD offset, BYTE which_group); extern DWORD PutGroupInfo (DWORD offset, BYTE which_group); -#define GROUPS_RANDOM 0L -#define GROUPS_ADD_NEW (~0L) -#define GROUP_LIST 0 +#define GROUPS_RANDOM ((DWORD)(0L)) +#define GROUPS_ADD_NEW ((DWORD)(~0L)) +#define GROUP_LIST ((BYTE)0) #define GROUP_INIT_IP ((BYTE)~0) #define GROUP_LOAD_IP GROUP_LIST #define GROUP_SAVE_IP ((BYTE)~0)