diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 0bc5f93b7..87ebfe7d5 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -1292,6 +1292,8 @@ void HourlyCamouflageUpdate( void ) { pSoldier->bCamo = 0; camoWoreOff = TRUE; + // ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WORN_OFF], pSoldier->name ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1319,6 +1321,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->urbanCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1346,6 +1349,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->desertCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1373,6 +1377,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->snowCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1395,6 +1400,8 @@ void HourlyCamouflageUpdate( void ) { pSoldier->bCamo = 0; camoWoreOff = TRUE; + // ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WORN_OFF], pSoldier->name ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1412,6 +1419,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->urbanCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1429,6 +1437,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->desertCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1446,6 +1455,7 @@ void HourlyCamouflageUpdate( void ) { pSoldier->snowCamo = 0; camoWoreOff = TRUE; + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WORN_OFF], pSoldier->name ); if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { @@ -1465,38 +1475,6 @@ void HourlyCamouflageUpdate( void ) { pSoldier->CreateSoldierPalettes( ); } - - if ( pSoldier->bCamo <= 0 ) - { - gCamoFace[pSoldier->ubProfile].gCamoface = FALSE; - DeleteSoldierFace( pSoldier );// remove face - pSoldier->iFaceIndex = InitSoldierFace( pSoldier );// create new face - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_JUNGLE_WORN_OFF], pSoldier->name ); - } - else if ( pSoldier->urbanCamo <= 0 ) - { - gCamoFace[pSoldier->ubProfile].gUrbanCamoface = FALSE; - DeleteSoldierFace( pSoldier );// remove face - pSoldier->iFaceIndex = InitSoldierFace( pSoldier );// create new face - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_URBAN_WORN_OFF], pSoldier->name ); - } - else if ( pSoldier->snowCamo <= 0 ) - { - gCamoFace[pSoldier->ubProfile].gSnowCamoface = FALSE; - DeleteSoldierFace( pSoldier );// remove face - pSoldier->iFaceIndex = InitSoldierFace( pSoldier );// create new face - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_SNOW_WORN_OFF], pSoldier->name ); - } - else if ( pSoldier->desertCamo <= 0 ) - { - gCamoFace[pSoldier->ubProfile].gDesertCamoface = FALSE; - DeleteSoldierFace( pSoldier );// remove face - pSoldier->iFaceIndex = InitSoldierFace( pSoldier );// create new face - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_DESERT_WORN_OFF], pSoldier->name ); - } - - // ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[STR_CAMMO_WORN_OFF], pSoldier->name ); - DirtyMercPanelInterface( pSoldier, DIRTYLEVEL2 ); camoWoreOff = FALSE; diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 714edaa33..a6482d2dd 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -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( ) ) diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 55ffa0b79..1dbed6675 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -1752,8 +1752,8 @@ CHAR16 Message[][STRING_LENGTH] = L"%s 的丛林迷彩油已经耗竭失效了。", L"%s 的丛林迷彩油已经冲刷失效了。", - L"%s 的城市伪装迷彩油已经耗竭失效了。", - L"%s 的城市伪装迷彩油已经冲刷失效了。", + L"%s 的城市迷彩油已经耗竭失效了。", + L"%s 的城市迷彩油已经冲刷失效了。", L"%s 的雪地迷彩油已经耗竭失效了。", L"%s 的雪地迷彩油已经冲刷失效了。", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 11cc2fd48..a1adfdb37 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -1749,8 +1749,8 @@ CHAR16 Message[][STRING_LENGTH] = L"%s's wood camouflage has worn off.", L"%s's wood camouflage has washed off.", - L"%s's urban camouflage urban has worn off.", - L"%s's urban camouflage urban has washed off.", + L"%s's urban camouflage has worn off.", + L"%s's urban camouflage has washed off.", L"%s's snow camouflage snow has worn off.", L"%s's snow camouflage has washed off.", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 5084259fa..9b15c5b2f 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -1753,8 +1753,8 @@ CHAR16 Message[][STRING_LENGTH] = L"%s's wood camouflage has worn off.", L"%s's wood camouflage has washed off.", - L"%s's urban camouflage urban has worn off.", - L"%s's urban camouflage urban has washed off.", + L"%s's urban camouflage has worn off.", + L"%s's urban camouflage has washed off.", L"%s's snow camouflage snow has worn off.", L"%s's snow camouflage has washed off.", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 3491a31da..b69f6b388 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -1745,8 +1745,8 @@ CHAR16 Message[][STRING_LENGTH] = L"%s's wood camouflage has worn off.", L"%s's wood camouflage has washed off.", - L"%s's urban camouflage urban has worn off.", - L"%s's urban camouflage urban has washed off.", + L"%s's urban camouflage has worn off.", + L"%s's urban camouflage has washed off.", L"%s's snow camouflage snow has worn off.", L"%s's snow camouflage has washed off.",