fixed some very ewww bugs (a few .c files made their way into the .o lists)

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index b4ee44b8e00d5337cd97930656e5dbaa979d794b..23fbafcd2feeae2dfd5920e693855412b236662f 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1957,7 +1957,9 @@ void M_Keys_Key (int k)
 
 int video_cursor = 0;
 int video_cursor_table[] = {56, 68, 80, 92, 116};
-unsigned short video_resolutions[][2] = {{512,384}, {640,480}, {800,600}, {1024,768}, {1280,960}};
+// note: if modes are added to the beginning of this list, update the
+// video_resolution = x; in M_Menu_Video_f below
+unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}};
 int video_resolution;
 
 extern int current_vid_fullscreen;
@@ -1984,7 +1986,8 @@ void M_Menu_Video_f (void)
        // Default to 800x600 if we didn't find it
        if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
        {
-               video_resolution = 2;
+               // may need to update this number if mode list changes
+               video_resolution = 4;
                Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
                Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
        }
@@ -2169,7 +2172,7 @@ int               msgNumber;
 int            m_quit_prevstate;
 qboolean       wasInMenus;
 
-char *quitMessage [] = 
+char *quitMessage [] =
 {
 /* .........1.........2.... */
 /*
@@ -2197,12 +2200,12 @@ char *quitMessage [] =
   "   big loser in life.   ",
   "  Press N to stay proud ",
   "    and successful!     ",
- 
+
   "   If you press Y to    ",
   "  quit, I will summon   ",
   "  Satan all over your   ",
   "      hard drive!       ",
- 
+
   "  Um, Asmodeus dislikes ",
   " his children trying to ",
   " quit. Press Y to return",
@@ -2699,12 +2702,15 @@ level_t         transfusionlevels[] =
        {"e1m1",                "Cradle to Grave"},
        {"e1m2",                "Wrong Side of the Tracks"},
        {"e1m7",                "Altar of Stone"},
+       {"e2m8",                "The Lair of Shial"},
        {"e3m7",                "The Pit of Cerberus"},
        {"e4m8",                "The Hall of the Epiphany"},
+       {"e4m9",                "Mall of the Dead"},
 
        {"dm1",                 "Monolith Building 11"},
        {"dm2",                 "Power!"},
        {"dm3",                 "Area 15"},
+       {"e6m1",                "Welcome to Your Life"},
        {"e6m8",                "Beauty and the Beast"},
 
        {"cpbb01",              "Crypt of Despair"},
@@ -2733,12 +2739,12 @@ level_t         transfusionlevels[] =
 episode_t      transfusionepisodes[] =
 {
        {"Blood", 0, 8},
-       {"Blood Single Player", 8, 5},
-       {"Plasma Pack", 13, 4},
-       {"Cryptic Passage", 17, 2},
-       {"Blood 2", 19, 5},
-       {"Transfusion", 24, 6},
-       {"Conversions", 30, 5}
+       {"Blood Single Player", 8, 7},
+       {"Plasma Pack", 15, 5},
+       {"Cryptic Passage", 20, 2},
+       {"Blood 2", 22, 5},
+       {"Transfusion", 27, 6},
+       {"Conversions", 33, 5}
 };
 
 gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};