adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminated some MSVC (?) warnings.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1386 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2004-06-16 16:21:44 +00:00
parent a739db6786
commit 8aa026c23b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/battle.c
+1 -1
View File
@@ -207,7 +207,7 @@ DoBattle (BATTLE_STATE *bs)
SleepThreadUntil (bs->NextTime + BATTLE_FRAME_RATE); SleepThreadUntil (bs->NextTime + BATTLE_FRAME_RATE);
bs->NextTime = GetTimeCounter (); bs->NextTime = GetTimeCounter ();
} }
return GLOBAL (CurrentActivity) & IN_BATTLE; return (BOOLEAN) (GLOBAL (CurrentActivity) & IN_BATTLE);
} }
BOOLEAN BOOLEAN
sc2/src/sc2code/clock.c
+2 -1
View File
@@ -301,7 +301,8 @@ ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, PCOUNT pday_index,
*pyear_index = year_index; *pyear_index = year_index;
} }
return (!(year_index < GLOBAL (GameClock.year_index) // translation: return (BOOLEAN) !(date < GLOBAL (Gameclock.date));
return (BOOLEAN) (!(year_index < GLOBAL (GameClock.year_index)
|| (year_index == GLOBAL (GameClock.year_index) || (year_index == GLOBAL (GameClock.year_index)
&& (month_index < GLOBAL (GameClock.month_index) && (month_index < GLOBAL (GameClock.month_index)
|| (month_index == GLOBAL (GameClock.month_index) || (month_index == GLOBAL (GameClock.month_index)