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

Merged from revision: 6814

Browse Source 
- Fix: HOURS_BETWEEN_STRATEGIC_DECAY was not read from ini (by anv)
- Fix: squads exceeding 20 cannot be accessed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6815 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-22 21:37:13 +00:00
parent e3bc68948e
commit 491050e8c8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+3 -2
View File
@@ -3389,8 +3389,9 @@ void LoadMoraleSettings()
CIniReader iniReader(MORALE_SETTINGS_FILE);
gMoraleSettings.ubDefaultMorale = iniReader.ReadInteger("General Morale Settings","DEFAULT_MORALE", 50, 0, 100);
gMoraleSettings.bValues[MORALE_KILLED_ENEMY] = iniReader.ReadInteger("Tactical Morale Settings","MORALE_KILLED_ENEMY", 4, -100, 100);
gMoraleSettings.ubHoursBetweenStrategicDelay = iniReader.ReadInteger("General Morale Settings","HOURS_BETWEEN_STRATEGIC_DECAY", 3, 1, 100);
gMoraleSettings.bValues[MORALE_KILLED_ENEMY] = iniReader.ReadInteger("Tactical Morale Settings","MORALE_KILLED_ENEMY", 4, -100, 100);
gMoraleSettings.bValues[MORALE_SQUADMATE_DIED] = iniReader.ReadInteger("Tactical Morale Settings","MORALE_SQUADMATE_DIED", -5, -100, 100);
gMoraleSettings.bValues[MORALE_SUPPRESSED] = iniReader.ReadInteger("Tactical Morale Settings","MORALE_SUPPRESSED", -1, -100, 100);
gMoraleSettings.bValues[MORALE_AIRSTRIKE] = iniReader.ReadInteger("Tactical Morale Settings","MORALE_AIRSTRIKE", -2, -100, 100);
Strategic/Map Screen Interface.h
+4 -2
View File
@@ -154,7 +154,7 @@ enum{
};
// squad menu defines
/*// squad menu defines
enum{
SQUAD_MENU_1,
SQUAD_MENU_2,
@@ -178,8 +178,10 @@ enum{
SQUAD_MENU_20,
SQUAD_MENU_CANCEL,
MAX_SQUAD_MENU_STRING_COUNT,
};
};*/
#define SQUAD_MENU_CANCEL ON_DUTY
#define MAX_SQUAD_MENU_STRING_COUNT SQUAD_MENU_CANCEL + 1
// contract menu defines
enum{