Merge pull request #19 from JayWalker512/stupid-laptop-res

Added support for 1366x768 laptop resolution in video menu. This will break existing configs one again if a mode of 1440x900 or higher is used.
This commit is contained in:
Yamagi 2013-01-20 03:08:00 -08:00
commit 2300a547a8
2 changed files with 10 additions and 7 deletions

View file

@ -123,7 +123,7 @@ typedef struct vidmode_s
int mode;
} vidmode_t;
/* This must be the same as in menu.c! */
/* This must be the same as in videomenu.c! */
vidmode_t vid_modes[] = {
{"Mode 0: 320x240", 320, 240, 0},
{"Mode 1: 400x300", 400, 300, 1},
@ -142,12 +142,13 @@ vidmode_t vid_modes[] = {
{"Mode 14: 1280x854", 1280, 854, 14},
{"Mode 15: 1280x960", 1280, 860, 15},
{"Mode 16: 1280x1024", 1280, 1024, 16},
{"Mode 17: 1440x900", 1440, 900, 17},
{"Mode 18: 1600x1200", 1600, 1200, 18},
{"Mode 19: 1680x1050", 1680, 1050, 19},
{"Mode 20: 1920x1080", 1920, 1080, 20},
{"Mode 21: 1920x1200", 1920, 1200, 21},
{"Mode 22: 2048x1536", 2048, 1536, 22},
{"Mode 17: 1366x768", 1366, 768, 17},
{"Mode 18: 1440x900", 1440, 900, 18},
{"Mode 19: 1600x1200", 1600, 1200, 19},
{"Mode 20: 1680x1050", 1680, 1050, 20},
{"Mode 21: 1920x1080", 1920, 1080, 21},
{"Mode 22: 1920x1200", 1920, 1200, 22},
{"Mode 23: 2048x1536", 2048, 1536, 23},
};
qboolean

View file

@ -191,6 +191,7 @@ VID_MenuInit(void)
"[1280 854 ]",
"[1280 960 ]",
"[1280 1024]",
"[1366 768 ]",
"[1440 900 ]",
"[1600 1200]",
"[1680 1050]",
@ -211,6 +212,7 @@ VID_MenuInit(void)
"Auto",
"4:3",
"5:4",
"683:384",
"16:10",
"16:9",
"Custom",