From e3e0226071c7936a7d666a618960a3e98162fde3 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Mon, 24 May 2021 17:07:53 +0000 Subject: [PATCH] fixed incorrect squad name when selecting merc with option USE_XML_SQUADNAMES = TRUE git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9045 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle UI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index bcece36f..d89a4f1d 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -1569,7 +1569,7 @@ UINT32 UIHandleSelectMerc( UI_EVENT *pUIEvent ) if ( CurrentSquad( ) != iCurrentSquad ) { if ( gGameExternalOptions.fUseXMLSquadNames && CurrentSquad( ) + 1 < min( ON_DUTY, gSquadNameVector.size() ) ) - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[MSG_SQUAD_ACTIVE_STRING], gSquadNameVector[CurrentSquad() + 1].c_str() ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[MSG_SQUAD_ACTIVE_STRING], gSquadNameVector[CurrentSquad()].c_str() ); else ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], ( CurrentSquad( ) + 1 ) ); }