diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 328fa3bf1..aa568a168 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -80,6 +80,12 @@ void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier ) //if the soldier HAS a profile if( pSoldier->ubProfile != NO_PROFILE ) { + //shadooow: moved here so the "merc is dead" message appears before "history log changed" which is what happens in tactical + if (guiCurrentScreen != GAME_SCREEN || !pSoldier->bInSector) + { + ScreenMsg(FONT_RED, MSG_INTERFACE, pMercDeadString[0], pSoldier->name); + } + //add to the history log the fact that the merc died and the circumstances if( pSoldier->ubAttackerID != NOBODY ) { @@ -109,11 +115,6 @@ void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier ) } } - if ( guiCurrentScreen != GAME_SCREEN ) - { - ScreenMsg( FONT_RED, MSG_INTERFACE, pMercDeadString[ 0 ], pSoldier->name ); - } - // robot and EPCs don't count against death rate - the mercs back home don't particularly give a damn about locals & machines! if ( !AM_AN_EPC( pSoldier ) && !AM_A_ROBOT( pSoldier ) ) { diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index 10b947868..717d49f6f 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -46,7 +46,7 @@ BOOLEAN HandleStrategicDeath( SOLDIERTYPE *pSoldier ) } // if not in mapscreen - if ( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) ) + if ( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) && pSoldier->bInSector) { // ATE; At least make them dead! if( ( pSoldier->bAssignment != ASSIGNMENT_DEAD ) )