From fcc2aa6f21822e4eb791976f660d628bad73f64d Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 2 Mar 2014 15:11:32 +0000 Subject: [PATCH] Merged revision(s) 7010 from branches/ja2_source_official_2014: Fix: when militia picked up items, a wrong item name was displayed git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7011 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 8bbf2be8..3c8882ed 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -2503,7 +2503,7 @@ void HandleSoldierPickupItem( SOLDIERTYPE *pSoldier, INT32 iItemIndex, INT32 sGr // HEADROCK HAM 3.5: On-screen message when militia pick up items. if ( pSoldier->bTeam == MILITIA_TEAM ) { - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113HAMMessage[4], Item[gWorldItems[ pItemPool->iItemIndex ].object.usItem].szItemName ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113HAMMessage[4], Item[gWorldItems[ iItemIndex ].object.usItem].szItemName ); } SoldierGetItemFromWorld( pSoldier, iItemIndex, sGridNo, bZLevel, NULL ); }