mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Merged from revision: 6814
- 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:
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user