1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

soldier tooltips now display energy and morale

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-26 21:19:31 +00:00
parent 44d98500f1
commit 6ad228e91e
13 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+3 -1
View File
@@ -52,7 +52,7 @@
#define GAME_SETTINGS_FILE "Ja2_Settings.INI"
#define GAME_EXTERNAL_OPTIONS_FILE "Ja2_Options.ini"
#define GAME_EXTERNAL_OPTIONS_FILE "Ja2_Options.ini"
#define AP_BP_CONSTANTS_FILE "APBPConstants.ini"
@@ -1147,6 +1147,8 @@ void LoadGameExternalOptions()
gGameExternalOptions.fEnableSoldierTooltipAttitude = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ATTITUDE", TRUE);
gGameExternalOptions.fEnableSoldierTooltipActionPoints = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS", TRUE);
gGameExternalOptions.fEnableSoldierTooltipHealth = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HEALTH", TRUE);
gGameExternalOptions.fEnableSoldierTooltipEnergy = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ENERGY", TRUE);
gGameExternalOptions.fEnableSoldierTooltipMorale = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_MORALE", TRUE);
gGameExternalOptions.fEnableSoldierTooltipTraits = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_TRAITS", TRUE); // added by SANDRO
gGameExternalOptions.fEnableSoldierTooltipHelmet = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HELMET", TRUE);
gGameExternalOptions.fEnableSoldierTooltipVest = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_VEST", TRUE);
GameSettings.h
+2
View File
@@ -692,6 +692,8 @@ typedef struct
BOOLEAN fEnableSoldierTooltipAttitude;
BOOLEAN fEnableSoldierTooltipActionPoints;
BOOLEAN fEnableSoldierTooltipHealth;
BOOLEAN fEnableSoldierTooltipEnergy;
BOOLEAN fEnableSoldierTooltipMorale;
BOOLEAN fEnableSoldierTooltipTraits; // added by SANDRO
BOOLEAN fEnableSoldierTooltipHelmet;
BOOLEAN fEnableSoldierTooltipVest;
Tactical/SoldierTooltips.cpp
+5 -1
View File
@@ -226,7 +226,11 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_APS], pStrInfo, pSoldier->bActionPoints );
if ( gGameExternalOptions.fEnableSoldierTooltipHealth )
swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_HEALTH], pStrInfo, pSoldier->stats.bLife );
if ( gGameExternalOptions.fEnableSoldierTooltipEnergy )
swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_ENERGY], pStrInfo, pSoldier->bBreath );
if ( gGameExternalOptions.fEnableSoldierTooltipMorale )
swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_MORALE], pStrInfo, pSoldier->aiData.bMorale );
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Added by SANDRO - show enemy skills
if ( gGameExternalOptions.fEnableSoldierTooltipTraits )
Utils/Text.h
+2
View File
@@ -558,6 +558,8 @@ enum
STR_TT_CAT_ATTITUDE,
STR_TT_CAT_CURRENT_APS,
STR_TT_CAT_CURRENT_HEALTH,
STR_TT_CAT_CURRENT_ENERGY,
STR_TT_CAT_CURRENT_MORALE,
STR_TT_CAT_HELMET,
STR_TT_CAT_VEST,
STR_TT_CAT_LEGGINGS,
Utils/_ChineseText.cpp
+2
View File
@@ -6124,6 +6124,8 @@ STR16 gzTooltipStrings[] =
L"%s|属|性: %d\n",
L"%s|当|前 |A|Ps: %d\n",
L"%s|当|前 |生|命: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|头|盔: %s\n",
L"%s|防|弹|衣: %s\n",
Utils/_DutchText.cpp
+2
View File
@@ -6130,6 +6130,8 @@ STR16 gzTooltipStrings[] =
L"%s|Attitude: %d\n",
L"%s|Current |A|Ps: %d\n",
L"%s|Current |Health: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Helmet: %s\n",
L"%s|Vest: %s\n",
Utils/_EnglishText.cpp
+2
View File
@@ -6124,6 +6124,8 @@ STR16 gzTooltipStrings[] =
L"%s|Attitude: %d\n",
L"%s|Current |A|Ps: %d\n",
L"%s|Current |Health: %d\n",
L"%s|Current |Breath: %d\n",
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Helmet: %s\n",
L"%s|Vest: %s\n",
Utils/_FrenchText.cpp
+2
View File
@@ -6121,6 +6121,8 @@ STR16 gzTooltipStrings[] =
L"%s|Attitude: %d\n",
L"%s|P|A |Actuel: %d\n",
L"%s|Santé |Actuel: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Casque: %s\n",
L"%s|Veste: %s\n",
Utils/_GermanText.cpp
+2
View File
@@ -5952,6 +5952,8 @@ STR16 gzTooltipStrings[] =
L"%s|Gesinnung: %d\n",
L"%s|Aktuelle |A|Ps: %d\n",
L"%s|Aktuelle |Gesundheit: %d\n",
L"%s|Aktueller |Atem: %d\n",
L"%s|Aktuelle |Moral: %d\n",
// Full info
L"%s|Helm: %s\n",
L"%s|Weste: %s\n",
Utils/_ItalianText.cpp
+2
View File
@@ -6116,6 +6116,8 @@ STR16 gzTooltipStrings[] =
L"%s|Attitude: %d\n",
L"%s|Current |A|Ps: %d\n",
L"%s|Current |Health: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Helmet: %s\n",
L"%s|Vest: %s\n",
Utils/_PolishText.cpp
+2
View File
@@ -6131,6 +6131,8 @@ STR16 gzTooltipStrings[] =
L"%s|Postawa: %d\n",
L"%s|Aktualne |P|A: %d\n",
L"%s|Aktualne |Zdrowie: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Hełm: %s\n",
L"%s|Kamizelka: %s\n",
Utils/_RussianText.cpp
+2
View File
@@ -6123,6 +6123,8 @@ STR16 gzTooltipStrings[] =
L"%s|Настрой: %d\n",
L"%s|Текущие |A|Ps: %d\n",
L"%s|Текущее |Здоровье: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Каска: %s\n",
L"%s|Жилет: %s\n",
Utils/_TaiwaneseText.cpp
+2
View File
@@ -6133,6 +6133,8 @@ STR16 gzTooltipStrings[] =
L"%s|Attitude: %d\n",
L"%s|Current |A|Ps: %d\n",
L"%s|Current |Health: %d\n",
L"%s|Current |Breath: %d\n", // TODO.Translate
L"%s|Current |Morale: %d\n",
// Full info
L"%s|Helmet: %s\n",
L"%s|Vest: %s\n",