1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Shift+T: only allow item transformation if item is corpse or resulting item is of the same item class, also check it's not transformation into same item.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2022-02-11 11:22:33 +00:00
parent b8b48e7d2e
commit 3a9d6d65e4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+7 -4
View File
@@ -370,7 +370,7 @@ void HandleTacticalTransformItem( void );
void HandleTacticalTransformFlashlight(void);
void HandleTacticalTransformLaser(void);
void HandleTacticalTransformScope(void);
BOOLEAN FindTransformation( UINT16 usItem, TransformInfoStruct **pTransformation );
BOOLEAN FindTransformation(UINT16 usItem, TransformInfoStruct **pTransformation, BOOLEAN fTactical = FALSE);
BOOLEAN FindLaserTransformation(UINT16 usItem, TransformInfoStruct **pTransformation);
BOOLEAN FindScopeTransformation(UINT16 usItem, TransformInfoStruct **pTransformation);
@@ -8752,7 +8752,7 @@ void HandleTacticalTransformItem(void)
usItem = pSoldier->inv[HANDPOS].usItem;
if (FindTransformation(usItem, &pTransformation))
if (FindTransformation(usItem, &pTransformation, TRUE))
{
if (pTransformation->usAPCost > 0 && gTacticalStatus.uiFlags & INCOMBAT && gTacticalStatus.uiFlags & TURNBASED)
ScreenMsg(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s (%d AP)", pTransformation->szMenuRowText, pTransformation->usAPCost);
@@ -8772,7 +8772,7 @@ void HandleTacticalTransformItem(void)
}
}
BOOLEAN FindTransformation( UINT16 usItem, TransformInfoStruct **pTransformation )
BOOLEAN FindTransformation(UINT16 usItem, TransformInfoStruct **pTransformation, BOOLEAN fTactical)
{
// find transformation
for ( UINT32 x = 0; x < MAXITEMS + 1; ++x )
@@ -8781,7 +8781,10 @@ BOOLEAN FindTransformation( UINT16 usItem, TransformInfoStruct **pTransformation
{
break;
}
if ( Transform[x].usItem == usItem )
if (Transform[x].usItem == usItem &&
(!fTactical ||
HasItemFlag(usItem, CORPSE) ||
Transform[x].usResult[0] != usItem && Item[Transform[x].usResult[0]].usItemClass == Item[usItem].usItemClass))
{
*pTransformation = &Transform[x];
return TRUE;