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

-fixed camo not working after a merge until the item was removed and replaced

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-09 16:02:51 +00:00
parent 6c284a1862
commit 3460c7bca5
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.407" };
INT16 zVersionLabel[256] = { L"Release v1.13.413" };
#endif
INT8 czVersionNumber[16] = { "Build 06.08.04" };
INT8 czVersionNumber[16] = { "Build 06.08.09" };
INT16 zTrackingNumber[16] = { L"Z" };
Tactical/Items.cpp
+16 -13
View File
@@ -3338,6 +3338,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
{
DoMercBattleSound( pSoldier, BATTLE_SOUND_COOL1 );
}
ApplyEquipmentBonuses(pSoldier);
return TRUE;
}
else
@@ -3429,6 +3430,8 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
}
break;
}
if ( pSoldier != NULL )
ApplyEquipmentBonuses(pSoldier);
return( TRUE );
}
return( FALSE );
@@ -7321,22 +7324,22 @@ void ApplyEquipmentBonuses(SOLDIERTYPE * pSoldier)
if ( oldCamo != newCamo )
pSoldier->wornCamo = (INT8)newCamo;
newCamo = GetWornUrbanCamo ( pSoldier );
oldCamo = pSoldier->wornUrbanCamo;
if ( oldCamo != newCamo )
pSoldier->wornUrbanCamo = (INT8)newCamo;
INT16 newUrbanCamo = GetWornUrbanCamo ( pSoldier );
INT16 oldUrbanCamo = pSoldier->wornUrbanCamo;
if ( oldUrbanCamo != newUrbanCamo )
pSoldier->wornUrbanCamo = (INT8)newUrbanCamo;
newCamo = GetWornDesertCamo ( pSoldier );
oldCamo = pSoldier->wornDesertCamo;
if ( oldCamo != newCamo )
pSoldier->wornDesertCamo = (INT8)newCamo;
INT16 newDesertCamo = GetWornDesertCamo ( pSoldier );
INT16 oldDesertCamo = pSoldier->wornDesertCamo;
if ( oldDesertCamo != newDesertCamo )
pSoldier->wornDesertCamo = (INT8)newDesertCamo;
newCamo = GetWornSnowCamo ( pSoldier );
oldCamo = pSoldier->wornSnowCamo;
if ( oldCamo != newCamo )
pSoldier->wornSnowCamo = (INT8)newCamo;
INT16 newSnowCamo = GetWornSnowCamo ( pSoldier );
INT16 oldSnowCamo = pSoldier->wornSnowCamo;
if ( oldSnowCamo != newSnowCamo )
pSoldier->wornSnowCamo = (INT8)newSnowCamo;
if ( newCamo > oldCamo && pSoldier->bTeam == OUR_TEAM )
if ( (newCamo > oldCamo || newUrbanCamo > oldUrbanCamo || newDesertCamo > oldDesertCamo || newSnowCamo > oldSnowCamo )&& pSoldier->bTeam == OUR_TEAM )
DoMercBattleSound( pSoldier, BATTLE_SOUND_COOL1 );
//Madd: do this regardless of camo. This will need to be called to do custom part colours and new overlays anyway.