From 6794dcfbe0c6809d04057b272bd486427e0953ec Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 31 Aug 2013 16:48:37 +0000 Subject: [PATCH] - Bugfix: Fixed issue with the Leather Shop Deed quest (by silversurfer) o On modified maps Kyle couldn't reach the temp money for the reward. Now there is a new parameter in Mod_Settings.ini called KYLE_MONEY_POSITION = x. The default for x is 14952 which is for vanilla map. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6343 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 ++ GameSettings.h | 3 +++ Tactical/Interface Dialogue.cpp | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index c4644e81..67c3b73b 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -2346,6 +2346,8 @@ void LoadModSettings(){ gModSettings.usPornShopRoomBrenda = iniReader.ReadInteger("San Mona", "PORN_SHOP_ROOM_BRENDA", 47); gModSettings.usPornShopRoomTony = iniReader.ReadInteger("San Mona", "PORN_SHOP_ROOM_TONY", 50); + gModSettings.iKyleMoneyGridNo = iniReader.ReadInteger("San Mona", "KYLE_MONEY_POSITION", 14952); + gModSettings.usLeatherShop = iniReader.ReadInteger("San Mona", "ANGELS_LEATHERSHOP", 2); gModSettings.iBambiDoorGridNo = iniReader.ReadInteger("San Mona", "DOOR_TO_BAMBIS_ROOM", 12290); gModSettings.iCarlaDoorGridNo = iniReader.ReadInteger("San Mona", "DOOR_TO_CARLAS_ROOM", 13413); diff --git a/GameSettings.h b/GameSettings.h index 7ae8f38b..db84fe61 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -1676,6 +1676,9 @@ typedef struct UINT16 usPornShopRoomBrenda; UINT16 usPornShopRoomTony; + // Kyle Lemmons Leather Shop Deed Quest + INT32 iKyleMoneyGridNo; + //Brothel Quests UINT16 usLeatherShop; INT32 iCarlaDoorGridNo; diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index d5815171..b422a7af 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -2437,7 +2437,9 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum // add a money item with $10000 to the tile in front of Kyle // and then have him pick it up { - INT32 sGridNo = 14952; //dnl!!! + // this isn't mod friendly. Let's make a new Mod_Settings.ini value + // INT32 sGridNo = 14952; //dnl!!! + INT32 sGridNo = gModSettings.iKyleMoneyGridNo; INT32 iWorldItem; pSoldier = FindSoldierByProfileID( ubTargetNPC, FALSE );