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

Merged from revision: 7500

Browse Source 
- Fixed wrong camo type worn off message (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-09-08 19:32:17 +00:00
parent 760a1b16f1
commit 84089c3c0c
6 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+18 -23
View File
@@ -9031,6 +9031,8 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
{
pSoldier->bCamo = 0;
camoWoreOff = TRUE;
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WASHED_OFF], pSoldier->GetName() );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->urbanCamo > 0 )
@@ -9059,6 +9061,7 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
{
pSoldier->urbanCamo = 0;
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->desertCamo > 0 )
@@ -9087,6 +9090,7 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
{
pSoldier->desertCamo = 0;
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->snowCamo > 0 )
@@ -9115,6 +9119,7 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
{
pSoldier->snowCamo = 0;
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WASHED_OFF], pSoldier->GetName() );
}
}
}
@@ -9130,7 +9135,11 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
// pSoldier->bCamo = __max( 0, pSoldier->bCamo - 1 );
if ( (pSoldier->bCamo)== 0)
{
camoWoreOff = TRUE;
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WASHED_OFF], pSoldier->GetName() );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->urbanCamo > 0 )
{
@@ -9140,7 +9149,10 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
// pSoldier->urbanCamo = __max( 0, pSoldier->urbanCamo - 1);
if ( (pSoldier->urbanCamo)== 0)
{
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->desertCamo > 0 )
{
@@ -9150,7 +9162,10 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
// pSoldier->desertCamo = __max( 0, pSoldier->desertCamo - 1);
if ( (pSoldier->desertCamo)== 0)
{
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->snowCamo > 0 )
{
@@ -9160,7 +9175,10 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
// pSoldier->snowCamo = __max( 0, pSoldier->snowCamo - 1);
if ( (pSoldier->snowCamo)== 0)
{
camoWoreOff = TRUE;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WASHED_OFF], pSoldier->GetName() );
}
}
}
/////////////////////////////////////////////////////////////////////////////////////
@@ -9172,31 +9190,8 @@ void WaterDamage( SOLDIERTYPE *pSoldier )
{
pSoldier->CreateSoldierPalettes( );
}
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WASHED_OFF], pSoldier->GetName() );
if ( pSoldier->bCamo <= 0 )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WASHED_OFF], pSoldier->GetName() );
}
else if ( pSoldier->urbanCamo <= 0 )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WASHED_OFF], pSoldier->GetName() );
}
else if ( pSoldier->snowCamo <= 0 )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WASHED_OFF], pSoldier->GetName() );
}
else if ( pSoldier->desertCamo <= 0 )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WASHED_OFF], pSoldier->GetName() );
}
}
if ( pSoldier->bTeam == gbPlayerNum && pSoldier->aiData.bMonsterSmell > 0 )
{
if ( pSoldier->MercInDeepWater( ) )