rename some flags/events

Author: tomdaley92

shared/chip8.c

@@ -245,7 +245,7 @@ void chip8_reset(bool verbose) {
     chip8.paused = 0;
 
     /* flip the GUI bit */
-    gui.soft_reset_flag = 0;
+    gui.reset_flag = 0;
 
     if (verbose) toast_show(TOAST_INFO, "Reset");
 
@@ -276,9 +276,9 @@ void chip8_run(){
         event = input_poll();
 
         /* do something based on response... */
-        if (event & USER_QUIT) return;
+        if (event & QUIT) return;
         if (event & LOAD_ROM) chip8_load_rom(NULL);
-        if (event & SOFT_RESET) chip8_reset(true);
+        if (event & RESET) chip8_reset(true);
         if (event & SAVE_PROFILE) chip8_save_profile();
 
         /* Update toast timers */

shared/gui.cc

@@ -210,7 +210,7 @@ static void gui_main_menu(void) {
             }
 
             if (ImGui::BeginMenu("Emulation")) {
-                ImGui::MenuItem("Reset", "F5", &gui.soft_reset_flag);
+                ImGui::MenuItem("Reset", "F5", &gui.reset_flag);
                 before = chip8.paused;
                 ImGui::MenuItem("Pause", "P", &chip8.paused);
                 if (before != chip8.paused) {
@@ -316,7 +316,7 @@ void gui_cleanup(void) {
 }
 
 void gui_init(void) {
-    gui.soft_reset_flag = 0;
+    gui.reset_flag = 0;
     gui.load_rom_flag = 0;
     gui.save_profile_flag = 0;
     gui.quit_flag = 0;

shared/gui.h

@@ -21,7 +21,7 @@ struct gui {
     bool show_about;
     bool show_usage;
 
-    bool soft_reset_flag;
+    bool reset_flag;
     bool load_rom_flag;
     bool save_profile_flag;
     bool quit_flag;

shared/input.c

@@ -41,12 +41,12 @@ static int input_process_events(void) {
     int response = CONTINUE;
 
     /* cose when the user clicks 'X' */
-    if (input.event.type == SDL_QUIT) response = USER_QUIT;
+    if (input.event.type == SDL_QUIT) response = QUIT;
 
     /* keystroke events */
     if (input.event.type == SDL_KEYDOWN) {
-        if (input.state[SDL_SCANCODE_ESCAPE]) response = USER_QUIT;
-        if (input.state[SDL_SCANCODE_F5]) response = SOFT_RESET;
+        if (input.state[SDL_SCANCODE_ESCAPE]) response = QUIT;
+        if (input.state[SDL_SCANCODE_F5]) response = RESET;
         if (input.state[SDL_SCANCODE_RETURN]) display_toggle_fullscreen();
         if (input.state[SDL_SCANCODE_P]) {
             chip8.paused = !chip8.paused;
@@ -78,7 +78,7 @@ static int input_process_events(void) {
         }
 
         /* the window manager requests that the window be closed */
-        if (input.event.window.event == SDL_WINDOWEVENT_CLOSE) response = USER_QUIT;
+        if (input.event.window.event == SDL_WINDOWEVENT_CLOSE) response = QUIT;
     }
 
     return response;
@@ -99,8 +99,8 @@ int input_poll(void) {
 
         /* check GUI */
         gui_process_events(&input.event);
-        if (gui.quit_flag) response |= USER_QUIT;
-        if (gui.soft_reset_flag) response |= SOFT_RESET;
+        if (gui.quit_flag) response |= QUIT;
+        if (gui.reset_flag) response |= RESET;
         if (gui.load_rom_flag) response |= LOAD_ROM;
         if (gui.save_profile_flag) response |= SAVE_PROFILE;
 

shared/input.h

@@ -13,8 +13,8 @@ extern "C" {
 /* there is a 4 ( and no 3), so each value
 can represent a unique bit position */
 #define CONTINUE 0
-#define USER_QUIT 1
-#define SOFT_RESET 2
+#define QUIT 1
+#define RESET 2
 #define LOAD_ROM 4
 #define SAVE_PROFILE 8