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

- Bugfix: Prevent merc swapping in tactical while they are talking (by silversurfer)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-11 19:02:00 +00:00
parent 8171fdbe7e
commit 4266ba809d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+5
View File
@@ -264,6 +264,7 @@ void CheatCreateItem();
// silversurfer: added for merc portrait swapping in tactical // silversurfer: added for merc portrait swapping in tactical
void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection ); void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection );
extern INT8 GetTeamSlotFromPlayerID( UINT8 ubID ); extern INT8 GetTeamSlotFromPlayerID( UINT8 ubID );
extern FACETYPE *gpCurrentTalkingFace;
void GetTBMouseButtonInput( UINT32 *puiNewEvent ) void GetTBMouseButtonInput( UINT32 *puiNewEvent )
{ {
@@ -7178,6 +7179,10 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
if ( gsCurInterfacePanel != TEAM_PANEL ) if ( gsCurInterfacePanel != TEAM_PANEL )
return; return;
// if someone is talking don't swap!
if ( gpCurrentTalkingFace != NULL )
return;
UINT8 ubSourceMerc = gusSelectedSoldier; UINT8 ubSourceMerc = gusSelectedSoldier;
UINT8 ubTargetMerc; UINT8 ubTargetMerc;
UINT8 ubGroupID = pSoldier->ubGroupID; UINT8 ubGroupID = pSoldier->ubGroupID;