From 73a7031c2952e40bf82e7d4756bb2fe6207963b3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 4 Oct 2011 10:31:12 +0000 Subject: [PATCH] - Bugfix: Robot (from Madlab) was not shown in personnel screen. This is a very old bug which goes back to revision 2498, when Many Mercenary was included (thx to Scheinworld and DepressivesBrot for helping to fix the bug) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4678 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/personnel.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 6a1ee236..d20d14ec 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -566,9 +566,14 @@ void EnterPersonnel( void ) idx <= gTacticalStatus.Team[ pTeamSoldier->bTeam ].bLastID; ++idx) { pTeamSoldier = MercPtrs[ idx ]; - if ((pTeamSoldier->bActive) && - !(pTeamSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE) && - /*(pTeamSoldier->stats.bLife > 0 ) && */ !AM_A_ROBOT(pTeamSoldier)) { + + // WANNE: Bugfix: Also show the roboter in ther personnel screen. This bug was introduced in revision 2498, when Many Mercenary was included. + //if ((pTeamSoldier->bActive) && + // !(pTeamSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE) && + // /*(pTeamSoldier->stats.bLife > 0 ) && */ !AM_A_ROBOT(pTeamSoldier) ) + + if ((pTeamSoldier->bActive) && !(pTeamSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE)) + { currentTeamList[++maxCurrentTeamIndex] = idx; } }