1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use local buffer for storing modified string instead of original copy

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
SpaceViking
2008-12-15 23:32:24 +00:00
parent 269b3e8bf2
commit 5c9ff9cbc4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+7 -4
View File
@@ -1984,21 +1984,24 @@ void HandleSoldierPickupItem( SOLDIERTYPE *pSoldier, INT32 iItemIndex, INT16 sGr
gfDisarmingBuriedBomb = TRUE; gfDisarmingBuriedBomb = TRUE;
gbTrapDifficulty = gWorldItems[ iItemIndex ].object[0]->data.bTrap; 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; wchar_t * ptr;
wcscpy(buffer,TacticalStr[ DISARM_TRAP_PROMPT ]);
if((gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.fEnemyInSector)) if((gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.fEnemyInSector))
{ {
wchar_t * string = L" ("; wchar_t * string = L" (";
wchar_t string2[20]; wchar_t string2[20];
ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string); ptr = wcscat(buffer, string);
_ltow(APBPConstants[AP_DISARM_MINE], string2, 10); _ltow(APBPConstants[AP_DISARM_MINE], string2, 10);
ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string2); ptr = wcscat(buffer, string2);
string = L"AP)"; string = L"AP)";
ptr = wcscat(TacticalStr[ DISARM_TRAP_PROMPT ], string); ptr = wcscat(buffer, string);
} }
else 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 ); DoMessageBox( MSG_BOX_BASIC_STYLE, ptr, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_YESNO, BoobyTrapMessageBoxCallBack, NULL );