1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

added squadnames to a few locations

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-02-27 23:13:27 +00:00
parent 92cd435806
commit b4f60527cd
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+4 -1
View File
@@ -10621,7 +10621,10 @@ void CreateAssignmentsBox( void )
if( ( uiCounter == ASSIGN_MENU_ON_DUTY ) && ( pSoldier != NULL ) && ( pSoldier->bAssignment < ON_DUTY ) ) if( ( uiCounter == ASSIGN_MENU_ON_DUTY ) && ( pSoldier != NULL ) && ( pSoldier->bAssignment < ON_DUTY ) )
{ {
// show his squad # in brackets // show his squad # in brackets
swprintf( sString, L"%s(%d)", pAssignMenuStrings[uiCounter], pSoldier->bAssignment + 1 ); if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L"%s(%s)", pAssignMenuStrings[uiCounter], SquadNames[ pSoldier->bAssignment ].squadname );
else
swprintf( sString, L"%s(%d)", pAssignMenuStrings[uiCounter], pSoldier->bAssignment + 1 );
} }
else else
{ {
Strategic/Strategic Movement.cpp
+5 -1
View File
@@ -5269,7 +5269,11 @@ BOOLEAN HandlePlayerGroupEnteringSectorToCheckForNPCsOfNote( GROUP *pGroup )
// build string for squad // build string for squad
GetSectorIDString( sSectorX, sSectorY, bSectorZ, wSectorName, FALSE ); GetSectorIDString( sSectorX, sSectorY, bSectorZ, wSectorName, FALSE );
swprintf( sString, pLandMarkInSectorString[ 0 ], pGroup->pPlayerList->pSoldier->bAssignment + 1, wSectorName );
if ( gGameExternalOptions.fUseXMLSquadNames && pGroup->pPlayerList->pSoldier->bAssignment < ON_DUTY )
swprintf( sString, pLandMarkInSectorString[ 0 ], SquadNames[ pGroup->pPlayerList->pSoldier->bAssignment ].squadname, wSectorName );
else
swprintf( sString, pLandMarkInSectorString[ 0 ], pGroup->pPlayerList->pSoldier->bAssignment + 1, wSectorName );
if ( GroupAtFinalDestination( pGroup ) ) if ( GroupAtFinalDestination( pGroup ) )
{ {
Tactical/Interface.cpp
+6 -1
View File
@@ -60,6 +60,7 @@
#include "Queen Command.h" #include "Queen Command.h"
// HEADROCK HAM 4: Included for new CTH indicator // HEADROCK HAM 4: Included for new CTH indicator
#include "weapons.h" #include "weapons.h"
#include "Map Screen Interface.h" // added by Flugente for SquadNames
#endif #endif
@@ -1884,7 +1885,11 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
} }
else if ( pSoldier->bTeam == gbPlayerNum && pSoldier->bAssignment < ON_DUTY && pSoldier->bAssignment != CurrentSquad() && !( pSoldier->flags.uiStatusFlags & SOLDIER_MULTI_SELECTED ) ) else if ( pSoldier->bTeam == gbPlayerNum && pSoldier->bAssignment < ON_DUTY && pSoldier->bAssignment != CurrentSquad() && !( pSoldier->flags.uiStatusFlags & SOLDIER_MULTI_SELECTED ) )
{ {
swprintf( NameStr, gzLateLocalizedString[ 34 ], ( pSoldier->bAssignment + 1 ) ); if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( NameStr, SquadNames[ pSoldier->bAssignment ].squadname );
else
swprintf( NameStr, gzLateLocalizedString[ 34 ], ( pSoldier->bAssignment + 1 ) );
FindFontCenterCoordinates( sXPos, (INT16)(sYPos ), (INT16)(80 ), 1, NameStr, TINYFONT1, &sX, &sY ); FindFontCenterCoordinates( sXPos, (INT16)(sYPos ), (INT16)(80 ), 1, NameStr, TINYFONT1, &sX, &sY );
gprintfdirty( sX, sY, NameStr ); gprintfdirty( sX, sY, NameStr );
mprintf( sX, sY, NameStr ); mprintf( sX, sY, NameStr );
Tactical/Turn Based Input.cpp
+5 -2
View File
@@ -2091,8 +2091,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
{ {
HandleLocateSelectMerc( pNewSoldier->ubID, LOCATEANDSELECT_MERC ); HandleLocateSelectMerc( pNewSoldier->ubID, LOCATEANDSELECT_MERC );
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], ( CurrentSquad( ) + 1 ) ); if ( gGameExternalOptions.fUseXMLSquadNames && pNewSoldier->bAssignment < ON_DUTY )
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], ( pNewSoldier->bAssignment + 1 ) ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], SquadNames[ pNewSoldier->bAssignment ].squadname );
else
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], ( CurrentSquad( ) + 1 ) );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_SQUAD_ACTIVE ], ( pNewSoldier->bAssignment + 1 ) );
// Center to guy.... // Center to guy....
LocateSoldier( gusSelectedSoldier, SETLOCATOR ); LocateSoldier( gusSelectedSoldier, SETLOCATOR );