From 0e3865a4efb83d1336158977d1a730c0bd5a913e Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 29 Jul 2013 09:15:21 +0000 Subject: [PATCH] - Fixed a few compilation warnings (uninitialized variables, ...) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6257 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/AimLinks.cpp | 2 -- Strategic/Ja25 Strategic Ai.cpp | 3 ++- Strategic/LuaInitNPCs.cpp | 1 - Tactical/Ja25_Tactical.cpp | 3 ++- Tactical/Soldier Init List.cpp | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Laptop/AimLinks.cpp b/Laptop/AimLinks.cpp index c6f79665d..8b5138658 100644 --- a/Laptop/AimLinks.cpp +++ b/Laptop/AimLinks.cpp @@ -162,8 +162,6 @@ BOOLEAN EnterAimLinks() void ExitAimLinks() { - INT16 i; - RemoveAimDefaults(); #ifdef JA2UB diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index 0aa0a9ce1..c6cde521f 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -2442,9 +2442,10 @@ BOOLEAN AreAllPlayerMercTraversingBetweenSectors() BOOLEAN RecordJa25StrategicAiDecisions( INT16 sSectorAttacked, UINT8 ubNumEnemies ) { + /* CHAR8 zOutputString[512]; HWFILE hFile; -/* + //open up the debug file hFile = FileOpen( JA25_SAI_DEBUG_FILE, FILE_ACCESS_WRITE | FILE_OPEN_ALWAYS, FALSE ); if( !hFile ) diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index 5f088012b..2ca536810 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -8044,7 +8044,6 @@ static int l_CreateItemInv (lua_State *L) { UINT8 n = lua_gettop(L); int i; - INT32 iWorldItem; OBJECTTYPE Object; UINT8 UBID = 0; SOLDIERTYPE * pSoldier; diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp index a3b0b9156..4b8ebba7d 100644 --- a/Tactical/Ja25_Tactical.cpp +++ b/Tactical/Ja25_Tactical.cpp @@ -1319,7 +1319,8 @@ void HandleDeathInPowerGenSector( SOLDIERTYPE *pSoldier ) UINT8 ubNumFlagedEnemiesInSector=0; UINT32 sRandomSlotGridNo; UINT8 uiCnt; - SOLDIERINITNODE *pInitListSoldier; + + //SOLDIERINITNODE *pInitListSoldier; #define NUM_ENEMIES_SLOTS 4 diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index cdb36cccf..29ab0c6f1 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -1404,7 +1404,6 @@ void AddSoldierInitListMilitia( UINT8 ubNumGreen, UINT8 ubNumRegs, UINT8 ubNumEl UINT8 ubFreeSlots; UINT8 *pCurrSlots=NULL; UINT8 *pCurrTotal=NULL; - UINT8 ubCurrClass; DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("AddSoldierInitListMilitia")); @@ -2853,4 +2852,4 @@ void SectorAddPrisonersofWar( INT16 sMapX, INT16 sMapY, INT16 sMapZ ) else break; } -} +}