From 214298e9b0961990124d6419a66c35ebce56b5e3 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sun, 14 Dec 2003 15:42:42 +0000 Subject: [PATCH] Removed a couple more warnings git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1302 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm.c | 2 +- sc2/src/sc2code/util.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index b3d0a3487..044fddc72 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -2143,7 +2143,7 @@ InitCommunication (RESOURCE which_comm) SetResourceIndex (hIndex); LocDataPtr = (LOCDATAPTR)init_race ( - status != YEHAT_REBEL_SHIP ? which_comm : YEHAT_REBEL_CONVERSATION + status != YEHAT_REBEL_SHIP ? which_comm : (RESOURCE)YEHAT_REBEL_CONVERSATION ); if (LocDataPtr) CommData = *LocDataPtr; diff --git a/sc2/src/sc2code/util.c b/sc2/src/sc2code/util.c index c1be66677..b6937c02b 100644 --- a/sc2/src/sc2code/util.c +++ b/sc2/src/sc2code/util.c @@ -227,5 +227,8 @@ WaitAnyButtonOrQuit (BOOLEAN CheckSpecial) !(GLOBAL (CurrentActivity) & CHECK_ABORT)) TaskSwitch (); + /* Satisfy unused parameter */ + (void) CheckSpecial; + return (GLOBAL (CurrentActivity) & CHECK_ABORT) != 0; }