From 144842b1f6f4a9bbf352753c0ca13824527220c4 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Thu, 14 Oct 2021 18:47:06 +0000 Subject: [PATCH] Fixed crash when Carmen attempts to give the diskette to the Barry. Note, this is rather a workaround than anything. The reason for this crash is that the Merchants.xml contains only 68 entries, but the total number of arms dealers is 80. Thus the remaining 12 slots are zero-fill and therefore the function to check if soldier is armsdealer will return true for Barry as his profile id is 0. A large rewrite of this additional arms dealers system is required. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9179 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Arms Dealer Init.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tactical/Arms Dealer Init.cpp b/Tactical/Arms Dealer Init.cpp index a8bfc29ed..4cc5d0834 100644 --- a/Tactical/Arms Dealer Init.cpp +++ b/Tactical/Arms Dealer Init.cpp @@ -1242,7 +1242,8 @@ BOOLEAN IsMercADealer( UINT8 ubMercID ) //loop through the list of arms dealers for ( UINT8 cnt = 0; cnt