From defef00330c4bcacfcf52cd39d23a70a18048f04 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 1 Jun 2012 17:47:51 +0000 Subject: [PATCH] Bugfix: P_Items were only allowed up to 10 in the ini file - now corrected to 20. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5324 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 3 ++- TileEngine/Interactive Tiles.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index ea9edfac..48b9a6ab 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -35,6 +35,7 @@ #include "Game Clock.h" #include "Init.h" #include "displaycover.h" + #include "InterfaceItemImages.h" #endif #include "KeyMap.h" @@ -678,7 +679,7 @@ void LoadGameExternalOptions() gGameExternalOptions.fUseXmlTileSets = iniReader.ReadBoolean("Data File Settings","USE_XML_TILESETS", FALSE); //Madd: set number of pItem files to be used - gGameExternalOptions.ubNumPItems = iniReader.ReadInteger("Data File Settings","NUM_P_ITEMS", 3, 3, 10); + gGameExternalOptions.ubNumPItems = iniReader.ReadInteger("Data File Settings","NUM_P_ITEMS", 3, 3, MAX_PITEMS); //################# Merc Recruitment Settings ################# diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index 20f0c9fb..ed5894d3 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -203,7 +203,6 @@ BOOLEAN SoldierHandleInteractiveObject( SOLDIERTYPE *pSoldier ) UINT16 usStructureID; INT32 sGridNo; - sGridNo = pSoldier->aiData.sPendingActionData2; usStructureID = (UINT16)pSoldier->aiData.uiPendingActionData1;