Merge pull request #71 from savaughn/main-menu-clean-up

Main menu clean up

.gitignore

@@ -19,4 +19,6 @@ obj/
 *.DS_Store
 src/pokeromtrader
 
+tests/*
+
 settings.json

include/common.h

@@ -103,6 +103,7 @@ enum E_LOG_MESSAGE_TYPE
 };
 
 enum textures {
+        T_NONE = -1,
         T_EVOLVE,
         T_LOGO,
         T_QUIT,

src/chelper.c

@@ -1,11 +1,18 @@
+#include <string.h>
 #include "chelper.h"
 
 void set_default_value_string(const char *eval_str, const char *default_value, char *out_str) {
     if (eval_str == NULL) {
-        // If eval_str is NULL, set out_str to the default_value
+        // Default value is too big for the output buffer
+        if (default_value != NULL && strlen(default_value) + 1 > sizeof(out_str)) {
+            return;
+        }
         strcpy(out_str, default_value);
     } else {
         // Otherwise, copy eval_str to out_str
+        if (strlen(eval_str) + 1 >sizeof(out_str)) {
+            return;
+        }
         strcpy(out_str, eval_str);
     }
 }

src/components/MenuButton.c

@@ -43,7 +43,6 @@ bool draw_menu_button(int x, int y, const char *text, int text_size)
     else
     {
         DrawText(text, x + 10, y + 5, text_size, BLACK);
+        return false;
     }
-
-    return false;
 }

src/raylibhelper.c

@@ -299,15 +299,11 @@ void draw_raylib_screen_loop(
             draw_evolve(pkmn_save_player1, player1_save_path, trainer1, &current_screen);
             break;
         case SCREEN_ABOUT:
-        {
             draw_about(&current_screen, is_build_prerelease);
             break;
-        }
         case SCREEN_LEGAL:
-        {
             draw_legal(&current_screen);
             break;
-        }
         default:
             BeginDrawing();
             ClearBackground(BACKGROUND_COLOR);