hush warnings about strcat and other redefinitions by undefining them first

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 66f228c8ba1df405eec5587528757a5c7f34582d..e970291bff259f9aec806880d1d7940ad1159146 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -880,7 +880,7 @@ static void M_ScanSaves (void)
 
        for (i=0 ; i<MAX_SAVEGAMES ; i++)
        {
-               strcpy (m_filenames[i], "--- UNUSED SLOT ---");
+               strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i]));
                loadable[i] = false;
                sprintf (name, "s%i.sav", (int)i);
                f = FS_Open (name, "rb", false, false);
@@ -1299,7 +1299,7 @@ void M_Menu_Setup_f (void)
        key_dest = key_menu;
        m_state = m_setup;
        m_entersound = true;
-       strcpy(setup_myname, cl_name.string);
+       strlcpy(setup_myname, cl_name.string, sizeof(setup_myname));
        setup_top = setup_oldtop = cl_color.integer >> 4;
        setup_bottom = setup_oldbottom = cl_color.integer & 15;
        setup_rate = cl_rate.integer;
@@ -2647,7 +2647,7 @@ static void M_Keys_Draw (void)
 
                // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer
                if (keys[0] == -1)
-                       strcpy(keystring, "???");
+                       strlcpy(keystring, "???", sizeof(keystring));
                else
                {
                        keystring[0] = 0;
@@ -2656,8 +2656,8 @@ static void M_Keys_Draw (void)
                                if (keys[j] != -1)
                                {
                                        if (j > 0)
-                                               strcat(keystring, " or ");
-                                       strcat(keystring, Key_KeynumToString (keys[j]));
+                                               strlcat(keystring, " or ", sizeof(keystring));
+                                       strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring));
                                }
                        }
                }
@@ -3850,6 +3850,19 @@ static episode_t defeatindetail2episodes[] =
        {"ATAC Campaign", 0, 3},
 };
 
+static level_t prydonlevels[] =
+{
+       {"curig2", "Capel Curig"},      // 0
+
+       {"tdastart", "Gateway"},                                // 1
+};
+
+static episode_t prydonepisodes[] =
+{
+       {"Prydon Gate", 0, 1},
+       {"The Dark Age", 1, 1}
+};
+
 static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
 static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
 static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
@@ -3860,6 +3873,7 @@ static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvs
 static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
 static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
 static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static gamelevels_t prydongame = {"Prydon Gate", prydonlevels, prydonepisodes, 2};
 
 typedef struct gameinfo_s
 {
@@ -3880,13 +3894,22 @@ static gameinfo_t gamelist[] =
        {GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
        {GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
        {GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
-       {(gamemode_t)-1, &sharewarequakegame, &registeredquakegame} // final fallback
+       {GAME_PRYDON, &prydongame, &prydongame},
+       {GAME_NORMAL, NULL, NULL} // terminator
 };
 
 static gamelevels_t *lookupgameinfo(void)
 {
-       int i;
-       for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
+       int i = 0;
+       while (gamelist[i].gameid != gamemode)
+       {
+               if (gamelist[i].notregistered == NULL)
+               {
+                       i = 0;
+                       break;
+               }
+               i++;
+       }
        if (registered.integer)
                return gamelist[i].registered;
        else