diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index 9ceb7a32f..0c3296fe2 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -23,6 +23,7 @@ #define MIN_AMB_LEVEL_FOR_MERC_LIGHTS 9 +#define MAXTEAMS_SP 6 // WANNE: for singleplayer #define MAXTEAMS 11 //hayden #define MAXMERCS MAX_NUM_SOLDIERS diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 0703d2081..7cb739bb3 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -327,7 +327,7 @@ CHAR8 gzDirectionStr[][ 30 ] = }; // TEMP VALUES FOR TEAM DEAFULT POSITIONS -UINT8 bDefaultTeamRanges[ MAXTEAMS ][ 2 ] = +UINT8 bDefaultTeamRangesMP[ MAXTEAMS ][ 2 ] = { 0, 19, //20 US @@ -343,14 +343,15 @@ UINT8 bDefaultTeamRanges[ MAXTEAMS ][ 2 ] = MAX_NUM_SOLDIERS, TOTAL_SOLDIERS - 1 // PLANNING SOLDIERS }; -//{ -// 0, 19, //20 US -// 20, 51, //32 ENEMY -// 52, 83, //32 CREATURE -// 84, 115, //32 REBELS ( OUR GUYS ) -// 116, MAX_NUM_SOLDIERS - 1, //32 CIVILIANS -//MAX_NUM_SOLDIERS, TOTAL_SOLDIERS - 1 // PLANNING SOLDIERS -//}; +UINT8 bDefaultTeamRanges[ MAXTEAMS_SP ][ 2 ] = +{ + 0, 19, //20 US + 20, 51, //32 ENEMY + 52, 83, //32 CREATURE + 84, 115, //32 REBELS ( OUR GUYS ) + 116, MAX_NUM_SOLDIERS - 1, //32 CIVILIANS + MAX_NUM_SOLDIERS, TOTAL_SOLDIERS - 1 // PLANNING SOLDIERS +}; COLORVAL bDefaultTeamColors[ MAXTEAMS ] = { @@ -648,12 +649,27 @@ BOOLEAN InitOverhead( ) memset( &gTacticalStatus, 0, sizeof( TacticalStatusType ) ); + UINT8 maxteams; + if (!is_networked) + maxteams = MAXTEAMS_SP; + else + maxteams = MAXTEAMS; + // Set team values - for( cnt = 0; cnt < MAXTEAMS; cnt++ ) + for( cnt = 0; cnt < maxteams; cnt++ ) { // For now, set hard-coded values - gTacticalStatus.Team[ cnt ].bFirstID = bDefaultTeamRanges[ cnt ][0]; - gTacticalStatus.Team[ cnt ].bLastID = bDefaultTeamRanges[ cnt ][1]; + if (!is_networked) + { + gTacticalStatus.Team[ cnt ].bFirstID = bDefaultTeamRanges[ cnt ][0]; + gTacticalStatus.Team[ cnt ].bLastID = bDefaultTeamRanges[ cnt ][1]; + } + else + { + gTacticalStatus.Team[ cnt ].bFirstID = bDefaultTeamRangesMP[ cnt ][0]; + gTacticalStatus.Team[ cnt ].bLastID = bDefaultTeamRangesMP[ cnt ][1]; + } + gTacticalStatus.Team[ cnt ].RadarColor = bDefaultTeamColors[ cnt ]; if ( cnt == gbPlayerNum || cnt == PLAYER_PLAN )