diff --git a/GameSettings.cpp b/GameSettings.cpp index 5bbcd60e6..2daf95de2 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -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); diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h index 8ac145c31..2934b2034 100644 --- a/Strategic/Map Screen Interface.h +++ b/Strategic/Map Screen Interface.h @@ -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{