From 5c9ff9cbc478733c8bb2b6d0d848afec7e223e19 Mon Sep 17 00:00:00 2001 From: SpaceViking Date: Mon, 15 Dec 2008 23:32:24 +0000 Subject: [PATCH] Use local buffer for storing modified string instead of original copy git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2458 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 77fe3721..a6411e8b 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -1984,21 +1984,24 @@ void HandleSoldierPickupItem( SOLDIERTYPE *pSoldier, INT32 iItemIndex, INT16 sGr gfDisarmingBuriedBomb = TRUE; gbTrapDifficulty = gWorldItems[ iItemIndex ].object[0]->data.bTrap; + // WDS - Use local buffer for storing modified string instead of original copy + CHAR16 buffer[99]; wchar_t * ptr; + wcscpy(buffer,TacticalStr[ DISARM_TRAP_PROMPT ]); if((gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.fEnemyInSector)) { wchar_t * string = L" ("; wchar_t string2[20]; - ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string); + ptr = wcscat(buffer, string); _ltow(APBPConstants[AP_DISARM_MINE], string2, 10); - ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string2); + ptr = wcscat(buffer, string2); string = L"AP)"; - ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string); + ptr = wcscat(buffer, string); } else { - ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], L""); + ptr = wcscat(buffer, L""); } DoMessageBox( MSG_BOX_BASIC_STYLE, ptr, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_YESNO, BoobyTrapMessageBoxCallBack, NULL );