From 8aa026c23b2daa5ba8f6de705661a7d9ff8d40d2 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Wed, 16 Jun 2004 16:21:44 +0000 Subject: [PATCH] Eliminated some MSVC (?) warnings. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1386 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/battle.c | 2 +- sc2/src/sc2code/clock.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/battle.c b/sc2/src/sc2code/battle.c index 34a253057..cb9e0f2fe 100644 --- a/sc2/src/sc2code/battle.c +++ b/sc2/src/sc2code/battle.c @@ -207,7 +207,7 @@ DoBattle (BATTLE_STATE *bs) SleepThreadUntil (bs->NextTime + BATTLE_FRAME_RATE); bs->NextTime = GetTimeCounter (); } - return GLOBAL (CurrentActivity) & IN_BATTLE; + return (BOOLEAN) (GLOBAL (CurrentActivity) & IN_BATTLE); } BOOLEAN diff --git a/sc2/src/sc2code/clock.c b/sc2/src/sc2code/clock.c index 648610c87..6f0f66e1d 100644 --- a/sc2/src/sc2code/clock.c +++ b/sc2/src/sc2code/clock.c @@ -301,7 +301,8 @@ ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, PCOUNT pday_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) && (month_index < GLOBAL (GameClock.month_index) || (month_index == GLOBAL (GameClock.month_index)