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

- bugfix: Loading maps in map editor with creatures. They did not show up

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-06-07 18:27:56 +00:00
parent 2015c0f362
commit 2baa1b7c94
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead Types.h
+1
View File
@@ -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
Tactical/Overhead.cpp
+28 -12
View File
@@ -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 )