mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Bugfix: Enemy/Militia Profiles will not overwrite tanks anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1649,7 +1649,14 @@ BOOLEAN TacticalCopySoldierFromCreateStruct( SOLDIERTYPE *pSoldier, SOLDIERCREAT
|
|||||||
if ( 1 )
|
if ( 1 )
|
||||||
{
|
{
|
||||||
INT8 type = -1;
|
INT8 type = -1;
|
||||||
if ( pCreateStruct->bTeam == ENEMY_TEAM && gGameExternalOptions.fSoldierProfiles_Enemy )
|
|
||||||
|
// silversurfer: Don't replace tanks!
|
||||||
|
if ( pCreateStruct->bBodyType != TANK_NE && pCreateStruct->bBodyType != TANK_NW )
|
||||||
|
{
|
||||||
|
// We have a function for this
|
||||||
|
type = pSoldier->GetSoldierProfileType( pCreateStruct->bTeam );
|
||||||
|
|
||||||
|
/* if ( pCreateStruct->bTeam == ENEMY_TEAM && gGameExternalOptions.fSoldierProfiles_Enemy )
|
||||||
{
|
{
|
||||||
switch( pCreateStruct->ubSoldierClass )
|
switch( pCreateStruct->ubSoldierClass )
|
||||||
{
|
{
|
||||||
@@ -1678,6 +1685,7 @@ BOOLEAN TacticalCopySoldierFromCreateStruct( SOLDIERTYPE *pSoldier, SOLDIERCREAT
|
|||||||
type = 3;
|
type = 3;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( type > -1 )
|
if ( type > -1 )
|
||||||
|
|||||||
Reference in New Issue
Block a user