fix event and state help text
authorTaylor Richards <taylor@icculus.org>
Wed, 14 Mar 2018 02:10:16 +0000 (22:10 -0400)
committerTaylor Richards <taylor@icculus.org>
Wed, 14 Mar 2018 02:10:16 +0000 (22:10 -0400)
include/gamesequence.h
src/gamesequence/gamesequence.cpp

index 297e683..84fee53 100644 (file)
 #define GS_EVENT_END_DEMO                                                      60              // end of demo campaign
 #define GS_EVENT_LOOP_BRIEF                                            61              // campaign loop brief
 #define GS_EVENT_CAMPAIGN_CHEAT                                        62              // skip to a mission in a campaign
-#define GS_EVENT_PXO                                                   74
-#define GS_EVENT_PXO_HELP                                              75
+#define GS_EVENT_PXO                                                   63
+#define GS_EVENT_PXO_HELP                                              64
 
 // IMPORTANT:  When you add a new event, update the initialization for GS_event_text[]
 //             which is done in GameSequence.cpp
@@ -414,56 +414,56 @@ extern const char *GS_event_text[];               // text description for the GS_EVENT_* #def
 //
 // IMPORTANT:  When you add a new state, update the initialization for GS_state_text[]
 //             which is done in GameSequence.cpp
-#define GS_STATE_MAIN_MENU                                                     1
-#define GS_STATE_GAME_PLAY                                                     2
-#define GS_STATE_GAME_PAUSED                                           3
-#define GS_STATE_QUIT_GAME                                                     4
-#define GS_STATE_OPTIONS_MENU                                          5
-#define GS_STATE_BARRACKS_MENU                                 7
-#define GS_STATE_TECH_MENU                                                     8
-#define GS_STATE_TRAINING_MENU                                 9
-#define GS_STATE_LOAD_MISSION_MENU                             10
-#define GS_STATE_BRIEFING                                                      11
-#define GS_STATE_SHIP_SELECT                                           12
-#define GS_STATE_DEBUG_PAUSED                                          13
-#define GS_STATE_HUD_CONFIG                                            14
-#define GS_STATE_MULTI_JOIN_GAME                                       15
-#define GS_STATE_CONTROL_CONFIG                                        16
-#define GS_STATE_WEAPON_SELECT                                 17
-#define GS_STATE_MISSION_LOG_SCROLLBACK                18
-#define GS_STATE_DEATH_DIED                                            19              //      Player just died
-#define GS_STATE_DEATH_BLEW_UP                                 20              //      Saw ship explode.
-#define GS_STATE_SIMULATOR_ROOM                                        21
-#define GS_STATE_CREDITS                                                       22
-#define GS_STATE_SHOW_GOALS                                            23
-#define GS_STATE_HOTKEY_SCREEN                                 24
-#define GS_STATE_VIEW_MEDALS                                           25              // Go to the View Medals screen
-#define GS_STATE_MULTI_HOST_SETUP                              26              // state where host sets up multiplayer game
-#define GS_STATE_MULTI_CLIENT_SETUP                            27              // client setup for multiplayer game
-#define GS_STATE_DEBRIEF                                                       28
-#define GS_STATE_VIEW_CUTSCENES                         29
-#define GS_STATE_MULTI_STD_WAIT                                        30
-#define GS_STATE_STANDALONE_MAIN                                  31
-#define GS_STATE_MULTI_PAUSED                                32
-#define GS_STATE_TEAM_SELECT                                           33
-#define GS_STATE_TRAINING_PAUSED                                       34               // game is paused while training msg is being read.
-#define GS_STATE_INGAME_PRE_JOIN                                  35            // go to ship selection screen for ingame join
-#define GS_STATE_EVENT_DEBUG                                           36               // an event debug trace scroll list display screen
-#define GS_STATE_STANDALONE_POSTGAME                   37               // debriefing, etc.
-#define GS_STATE_INITIAL_PLAYER_SELECT                 38
-#define GS_STATE_MULTI_MISSION_SYNC                            39
-#define GS_STATE_MULTI_START_GAME                              40
-#define GS_STATE_MULTI_HOST_OPTIONS                            41
-#define GS_STATE_MULTI_DOGFIGHT_DEBRIEF                42
-#define GS_STATE_CAMPAIGN_ROOM                                 43
-#define GS_STATE_CMD_BRIEF                                                     44              // command briefing screen
-#define GS_STATE_RED_ALERT                                                     45              // red alert screen
-#define GS_STATE_END_OF_CAMPAIGN                                       46              // end of main campaign -- only applicable in single player
-#define GS_STATE_GAMEPLAY_HELP                                 47
-#define GS_STATE_END_DEMO                                                      48              // end of demo campaign (upsell then main menu)
-#define GS_STATE_LOOP_BRIEF                                            49
-#define GS_STATE_PXO                                                   59
-#define GS_STATE_PXO_HELP                                              60
+#define GS_STATE_MAIN_MENU                                             1
+#define GS_STATE_GAME_PLAY                                             2
+#define GS_STATE_GAME_PAUSED                                   3
+#define GS_STATE_QUIT_GAME                                             4
+#define GS_STATE_OPTIONS_MENU                                  5
+#define GS_STATE_BARRACKS_MENU                                 6
+#define GS_STATE_TECH_MENU                                             7
+#define GS_STATE_TRAINING_MENU                                 8
+#define GS_STATE_LOAD_MISSION_MENU                             9
+#define GS_STATE_BRIEFING                                              10
+#define GS_STATE_SHIP_SELECT                                   11
+#define GS_STATE_DEBUG_PAUSED                                  12
+#define GS_STATE_HUD_CONFIG                                            13
+#define GS_STATE_MULTI_JOIN_GAME                               14
+#define GS_STATE_CONTROL_CONFIG                                        15
+#define GS_STATE_WEAPON_SELECT                                 16
+#define GS_STATE_MISSION_LOG_SCROLLBACK                        17
+#define GS_STATE_DEATH_DIED                                            18              //      Player just died
+#define GS_STATE_DEATH_BLEW_UP                                 19              //      Saw ship explode.
+#define GS_STATE_SIMULATOR_ROOM                                        20
+#define GS_STATE_CREDITS                                               21
+#define GS_STATE_SHOW_GOALS                                            22
+#define GS_STATE_HOTKEY_SCREEN                                 23
+#define GS_STATE_VIEW_MEDALS                                   24              // Go to the View Medals screen
+#define GS_STATE_MULTI_HOST_SETUP                              25              // state where host sets up multiplayer game
+#define GS_STATE_MULTI_CLIENT_SETUP                            26              // client setup for multiplayer game
+#define GS_STATE_DEBRIEF                                               27
+#define GS_STATE_VIEW_CUTSCENES                                        28
+#define GS_STATE_MULTI_STD_WAIT                                        29
+#define GS_STATE_STANDALONE_MAIN                               30
+#define GS_STATE_MULTI_PAUSED                                  31
+#define GS_STATE_TEAM_SELECT                                   32
+#define GS_STATE_TRAINING_PAUSED                               33               // game is paused while training msg is being read.
+#define GS_STATE_INGAME_PRE_JOIN                               34               // go to ship selection screen for ingame join
+#define GS_STATE_EVENT_DEBUG                                   35               // an event debug trace scroll list display screen
+#define GS_STATE_STANDALONE_POSTGAME                   36               // debriefing, etc.
+#define GS_STATE_INITIAL_PLAYER_SELECT                 37
+#define GS_STATE_MULTI_MISSION_SYNC                            38
+#define GS_STATE_MULTI_START_GAME                              39
+#define GS_STATE_MULTI_HOST_OPTIONS                            40
+#define GS_STATE_MULTI_DOGFIGHT_DEBRIEF                        41
+#define GS_STATE_CAMPAIGN_ROOM                                 42
+#define GS_STATE_CMD_BRIEF                                             43              // command briefing screen
+#define GS_STATE_RED_ALERT                                             44              // red alert screen
+#define GS_STATE_END_OF_CAMPAIGN                               45              // end of main campaign -- only applicable in single player
+#define GS_STATE_GAMEPLAY_HELP                                 46
+#define GS_STATE_END_DEMO                                              47              // end of demo campaign (upsell then main menu)
+#define GS_STATE_LOOP_BRIEF                                            48
+#define GS_STATE_PXO                                                   49
+#define GS_STATE_PXO_HELP                                              50
 
 
 // IMPORTANT:  When you add a new state, update the initialization for GS_state_text[]
index 2f2a096..24c8c3e 100644 (file)
@@ -268,80 +268,69 @@ static int state_in_event_processer = 0;
 //XSTR:OFF
 const char *GS_event_text[] =
 {
-       "GS_EVENT_MAIN_MENU",
+       "GS_EVENT_MAIN_MENU",                                   // 0
        "GS_EVENT_START_GAME",
        "GS_EVENT_ENTER_GAME",
        "GS_EVENT_START_GAME_QUICK",
-       "GS_EVENT_END_GAME",                                                                    
-       "GS_EVENT_QUIT_GAME",                                                           // 5
+       "GS_EVENT_END_GAME",
+       "GS_EVENT_QUIT_GAME",                                   // 5
        "GS_EVENT_PAUSE_GAME",
        "GS_EVENT_PREVIOUS_STATE",
        "GS_EVENT_OPTIONS_MENU",
        "GS_EVENT_BARRACKS_MENU",                                                       
-       "GS_EVENT_TRAINING_MENU",                                                       // 10
+       "GS_EVENT_TRAINING_MENU",                               // 10
        "GS_EVENT_TECH_MENU",
        "GS_EVENT_LOAD_MISSION_MENU",
        "GS_EVENT_SHIP_SELECTION",
-       "GS_EVENT_TOGGLE_FULLSCREEN",                                           
-       "GS_EVENT_WEAPON_SELECT_HELP",                                  // 15
-       "GS_EVENT_START_BRIEFING",
+       "GS_EVENT_TOGGLE_FULLSCREEN",
+       "GS_EVENT_START_BRIEFING",                              // 15
        "GS_EVENT_DEBUG_PAUSE_GAME",
        "GS_EVENT_HUD_CONFIG",
-       "GS_EVENT_MULTI_SETUP",                                                         
-       "GS_EVENT_MULTI_JOIN_GAME",                                             // 20
+       "GS_EVENT_MULTI_JOIN_GAME",
        "GS_EVENT_CONTROL_CONFIG",
-       "GS_EVENT_EVENT_DEBUG",
-       "GS_EVENT_MULTI_PROTO_CHOICE",
-       "GS_EVENT_SAVE_RESTORE",                                                        
-       "GS_EVENT_CHOOSE_SAVE_OR_RESTORE",                              // 25
+       "GS_EVENT_EVENT_DEBUG",                                 // 20
        "GS_EVENT_WEAPON_SELECTION",
        "GS_EVENT_MISSION_LOG_SCROLLBACK",
-       "GS_EVENT_MAIN_MENU_HELP",                                                      
        "GS_EVENT_GAMEPLAY_HELP",
-       "GS_EVENT_SHIP_SELECT_HELP",                                            // 30
        "GS_EVENT_DEATH_DIED",
-       "GS_EVENT_DEATH_BLEW_UP",
+       "GS_EVENT_DEATH_BLEW_UP",                               // 25
        "GS_EVENT_NEW_CAMPAIGN",
        "GS_EVENT_CREDITS",
-       "GS_EVENT_SHOW_GOALS",                                                          // 35
+       "GS_EVENT_SHOW_GOALS",
        "GS_EVENT_HOTKEY_SCREEN",
-       "GS_EVENT_HOTKEY_SCREEN_HELP",                                  
-       "GS_EVENT_VIEW_MEDALS",
+       "GS_EVENT_VIEW_MEDALS",                                 // 30
        "GS_EVENT_MULTI_HOST_SETUP",
-       "GS_EVENT_MULTI_CLIENT_SETUP",                                  // 40
+       "GS_EVENT_MULTI_CLIENT_SETUP",
        "GS_EVENT_DEBRIEF",
-       "GS_EVENT_NAVMAP",                                                                      
-       "GS_EVENT_MULTI_JOIN_TRACKER",
        "GS_EVENT_GOTO_VIEW_CUTSCENES_SCREEN",
-       "GS_EVENT_MULTI_STD_WAIT",                                                      // 45
+       "GS_EVENT_MULTI_STD_WAIT",                              // 35
        "GS_EVENT_STANDALONE_MAIN",
        "GS_EVENT_MULTI_PAUSE",
-       "GS_EVENT_BRIEFING_HELP",
        "GS_EVENT_TEAM_SELECT",
-       "GS_EVENT_TRAINING_PAUSE",                                                      // 50   
-       "GS_EVENT_MULTI_HELP",                                                          
-       "GS_EVENT_INGAME_PRE_JOIN",
+       "GS_EVENT_TRAINING_PAUSE",
+       "GS_EVENT_INGAME_PRE_JOIN",                             // 40
        "GS_EVENT_PLAYER_WARPOUT_START",
        "GS_EVENT_PLAYER_WARPOUT_START_FORCED",
-       "GS_EVENT_PLAYER_WARPOUT_STOP",                                 // 55
-       "GS_EVENT_PLAYER_WARPOUT_DONE_STAGE1",                  
-       "GS_EVENT_PLAYER_WARPOUT_DONE_STAGE2",
+       "GS_EVENT_PLAYER_WARPOUT_STOP",
+       "GS_EVENT_PLAYER_WARPOUT_DONE_STAGE1",
+       "GS_EVENT_PLAYER_WARPOUT_DONE_STAGE2",  // 45
        "GS_EVENT_PLAYER_WARPOUT_DONE",
        "GS_EVENT_STANDALONE_POSTGAME",
-       "GS_EVENT_INITIAL_PLAYER_SELECT",                               // 60
-       "GS_EVENT_GAME_INIT",                                                           
-       "GS_EVENT_MULTI_MISSION_SYNC",
-       "GS_EVENT_MULTI_CAMPAIGN_SELECT",
-       "GS_EVENT_MULTI_SERVER_TRANSFER",
-       "GS_EVENT_MULTI_START_GAME",                                            // 65
-       "GS_EVENT_MULTI_HOST_OPTIONS",                                  
+       "GS_EVENT_INITIAL_PLAYER_SELECT",
+       "GS_EVENT_GAME_INIT",
+       "GS_EVENT_MULTI_MISSION_SYNC",                  // 50
+       "GS_EVENT_MULTI_START_GAME",
+       "GS_EVENT_MULTI_HOST_OPTIONS",
        "GS_EVENT_MULTI_DOGFIGHT_DEBRIEF",
        "GS_EVENT_CAMPAIGN_ROOM",
-       "GS_EVENT_CMD_BRIEF",
-       "GS_EVENT_TOGGLE_GLIDE",                                                        // 70
-       "GS_EVENT_RED_ALERT",                                                           
+       "GS_EVENT_CMD_BRIEF",                                   // 55
+       "GS_EVENT_TOGGLE_GLIDE",
+       "GS_EVENT_RED_ALERT",
        "GS_EVENT_SIMULATOR_ROOM",
        "GS_EVENT_EMD_CAMPAIGN",
+       "GS_EVENT_END_DEMO",                                    // 60
+       "GS_EVENT_LOOP_BRIEF",
+       "GS_EVENT_CAMPAIGN_CHEAT",
        "GS_EVENT_PXO",
        "GS_EVENT_PXO_HELP"
 };
@@ -352,66 +341,56 @@ const char *GS_event_text[] =
 const char *GS_state_text[] =
 {
        "NOT A VALID STATE",
-       "GS_STATE_MAIN_MENU",                                                           // 1
+       "GS_STATE_MAIN_MENU",                           // 1
        "GS_STATE_GAME_PLAY",
        "GS_STATE_GAME_PAUSED",
        "GS_STATE_QUIT_GAME",
-       "GS_STATE_OPTIONS_MENU",                                                        // 5
-       "GS_EVENT_WEAPON_SELECT_HELP",
+       "GS_STATE_OPTIONS_MENU",                        // 5
        "GS_STATE_BARRACKS_MENU",
        "GS_STATE_TECH_MENU",
        "GS_STATE_TRAINING_MENU",
-       "GS_STATE_LOAD_MISSION_MENU",                                           // 10
-       "GS_STATE_BRIEFING",
+       "GS_STATE_LOAD_MISSION_MENU",
+       "GS_STATE_BRIEFING",                            // 10
        "GS_STATE_SHIP_SELECT",
        "GS_STATE_DEBUG_PAUSED",
        "GS_STATE_HUD_CONFIG",
-       "GS_STATE_MULTI_SETUP",                                                         // 15
        "GS_STATE_MULTI_JOIN_GAME",
-       "GS_STATE_CONTROL_CONFIG",
-       "GS_STATE_MULTI_PROTO_CHOICE",
-       "GS_STATE_SAVE_RESTORE",
-       "GS_STATE_WEAPON_SELECT",                                                       // 20
+       "GS_STATE_CONTROL_CONFIG",                      // 15
+       "GS_STATE_WEAPON_SELECT",
        "GS_STATE_MISSION_LOG_SCROLLBACK",
-       "GS_STATE_MAIN_MENU_HELP",
-       "GS_STATE_GAMEPLAY_HELP",
-       "GS_STATE_SHIP_SELECT_HELP",
-       "GS_STATE_DEATH_DIED",                                                          // 25
+       "GS_STATE_DEATH_DIED",
        "GS_STATE_DEATH_BLEW_UP",
-       "GS_STATE_SIMULATOR_ROOM",
+       "GS_STATE_SIMULATOR_ROOM",                      // 20
        "GS_STATE_CREDITS",
        "GS_STATE_SHOW_GOALS",
-       "GS_STATE_HOTKEY_SCREEN",                                                       // 30
-       "GS_STATE_HOTKEY_SCREEN_HELP",
+       "GS_STATE_HOTKEY_SCREEN",
        "GS_STATE_VIEW_MEDALS",
-       "GS_STATE_MULTI_HOST_SETUP",
+       "GS_STATE_MULTI_HOST_SETUP",            // 25
        "GS_STATE_MULTI_CLIENT_SETUP",
-       "GS_STATE_DEBRIEF",                                                                     // 35
-       "GS_STATE_NAVMAP",
-       "GS_STATE_MULTI_JOIN_TRACKER",  
+       "GS_STATE_DEBRIEF",
        "GS_STATE_VIEW_CUTSCENES",
        "GS_STATE_MULTI_STD_WAIT",
-       "GS_STATE_STANDALONE_MAIN",                                             // 40
-       "GS_STATE_MULTI_PAUSED",        
-       "GS_STATE_BRIEFING_HELP",
+       "GS_STATE_STANDALONE_MAIN",                     // 30
+       "GS_STATE_MULTI_PAUSED",
        "GS_STATE_TEAM_SELECT",
        "GS_STATE_TRAINING_PAUSED",
-       "GS_STATE_MULTI_HELP",                                                          // 45
-       "GS_STATE_INGAME_PRE_JOIN",                                             
-       "GS_STATE_EVENT_DEBUG",
+       "GS_STATE_INGAME_PRE_JOIN",
+       "GS_STATE_EVENT_DEBUG",                         // 35
        "GS_STATE_STANDALONE_POSTGAME",
        "GS_STATE_INITIAL_PLAYER_SELECT",
-       "GS_STATE_MULTI_MISSION_SYNC",                                  // 50
-       "GS_STATE_MULTI_SERVER_TRANSFER",                               
+       "GS_STATE_MULTI_MISSION_SYNC",
        "GS_STATE_MULTI_START_GAME",
-       "GS_STATE_MULTI_HOST_OPTIONS",
-       "GS_STATE_MULTI_DOGFIGHT_DEBRIEF",                              
-       "GS_STATE_CAMPAIGN_ROOM",                                                       // 55
+       "GS_STATE_MULTI_HOST_OPTIONS",          // 40
+       "GS_STATE_MULTI_DOGFIGHT_DEBRIEF",
+       "GS_STATE_CAMPAIGN_ROOM",
        "GS_STATE_CMD_BRIEF",
        "GS_STATE_RED_ALERT",
-       "GS_STATE_END_OF_CAMPAIGN",
+       "GS_STATE_END_OF_CAMPAIGN",                     // 45
+       "GS_STATE_GAMEPLAY_HELP",
+       "GS_STATE_END_DEMO",
+       "GS_STATE_LOOP_BRIEF",
        "GS_STATE_PXO",
-       "GS_STATE_PXO_HELP"                                                             // 60
+       "GS_STATE_PXO_HELP"                                     // 50
 };
 //XSTR:ON