X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=eca046cf10cc57a4d5641b4e92e6d23284f74e44;hp=a3b37a6290e7c0972d9184f3fe04dd6ed5b69fb9;hb=66ba61eab96c3f91e48a2768238c4096efbdb063;hpb=11e05215e5f3cee630f54b9836dab1b36b5b4ffc diff --git a/menu.c b/menu.c index a3b37a62..eca046cf 100644 --- a/menu.c +++ b/menu.c @@ -115,7 +115,7 @@ void M_Update_Return_Reason(char *s) // Nehahra #define NumberOfNehahraDemos 34 -typedef struct +typedef struct nehahrademonames_s { char *name; char *desc; @@ -186,6 +186,11 @@ void M_DrawCharacter (float cx, float cy, int num) DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0); } +void M_PrintColored(float cx, float cy, const char *str) +{ + DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL); +} + void M_Print(float cx, float cy, const char *str) { DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); @@ -196,7 +201,7 @@ void M_PrintRed (float cx, float cy, const char *str) DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0); } -void M_ItemPrint(float cx, float cy, char *str, int unghosted) +void M_ItemPrint(float cx, float cy, const char *str, int unghosted) { if (unghosted) DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); @@ -204,18 +209,18 @@ void M_ItemPrint(float cx, float cy, char *str, int unghosted) DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0); } -void M_DrawPic (float cx, float cy, char *picname) +void M_DrawPic (float cx, float cy, const char *picname) { DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0); } -qbyte identityTable[256]; -qbyte translationTable[256]; +unsigned char identityTable[256]; +unsigned char translationTable[256]; void M_BuildTranslationTable(int top, int bottom) { int j; - qbyte *dest, *source; + unsigned char *dest, *source; for (j = 0; j < 256; j++) identityTable[j] = j; @@ -247,42 +252,42 @@ void M_DrawTextBox (float x, float y, float width, float height) // draw left side cx = x; cy = y; - M_DrawPic (cx, cy, "gfx/box_tl.lmp"); + M_DrawPic (cx, cy, "gfx/box_tl"); for (n = 0; n < height; n++) { cy += 8; - M_DrawPic (cx, cy, "gfx/box_ml.lmp"); + M_DrawPic (cx, cy, "gfx/box_ml"); } - M_DrawPic (cx, cy+8, "gfx/box_bl.lmp"); + M_DrawPic (cx, cy+8, "gfx/box_bl"); // draw middle cx += 8; while (width > 0) { cy = y; - M_DrawPic (cx, cy, "gfx/box_tm.lmp"); + M_DrawPic (cx, cy, "gfx/box_tm"); for (n = 0; n < height; n++) { cy += 8; if (n >= 1) - M_DrawPic (cx, cy, "gfx/box_mm2.lmp"); + M_DrawPic (cx, cy, "gfx/box_mm2"); else - M_DrawPic (cx, cy, "gfx/box_mm.lmp"); + M_DrawPic (cx, cy, "gfx/box_mm"); } - M_DrawPic (cx, cy+8, "gfx/box_bm.lmp"); + M_DrawPic (cx, cy+8, "gfx/box_bm"); width -= 2; cx += 16; } // draw right side cy = y; - M_DrawPic (cx, cy, "gfx/box_tr.lmp"); + M_DrawPic (cx, cy, "gfx/box_tr"); for (n = 0; n < height; n++) { cy += 8; - M_DrawPic (cx, cy, "gfx/box_mr.lmp"); + M_DrawPic (cx, cy, "gfx/box_mr"); } - M_DrawPic (cx, cy+8, "gfx/box_br.lmp"); + M_DrawPic (cx, cy+8, "gfx/box_br"); } //============================================================================= @@ -433,25 +438,25 @@ void M_Main_Draw (void) } M_Background(320, 200); - M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/ttl_main.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp"); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/ttl_main", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main"); // Nehahra if (gamemode == GAME_NEHAHRA) { if (NehGameType == TYPE_BOTH) - M_DrawPic (72, 32, "gfx/mainmenu.lmp"); + M_DrawPic (72, 32, "gfx/mainmenu"); else if (NehGameType == TYPE_GAME) - M_DrawPic (72, 32, "gfx/gamemenu.lmp"); + M_DrawPic (72, 32, "gfx/gamemenu"); else - M_DrawPic (72, 32, "gfx/demomenu.lmp"); + M_DrawPic (72, 32, "gfx/demomenu"); } else - M_DrawPic (72, 32, "gfx/mainmenu.lmp"); + M_DrawPic (72, 32, "gfx/mainmenu"); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i", f+1)); } @@ -718,13 +723,13 @@ void M_SinglePlayer_Draw (void) M_Background(320, 200); - M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/ttl_sgl.lmp", false); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/ttl_sgl", false); // Some mods don't have a single player mode if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { - M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp"); + M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl"); M_DrawTextBox (60, 8 * 8, 23, 4); if (gamemode == GAME_NEXUIZ) @@ -739,12 +744,12 @@ void M_SinglePlayer_Draw (void) { int f; - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp"); - M_DrawPic (72, 32, "gfx/sp_menu.lmp"); + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl"); + M_DrawPic (72, 32, "gfx/sp_menu"); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i", f+1)); } } @@ -819,7 +824,7 @@ int loadable[MAX_SAVEGAMES]; void M_ScanSaves (void) { - size_t i, j, len; + int i, j, len; char name[MAX_OSPATH]; char buf[SAVEGAME_COMMENT_LENGTH + 256]; const char *t; @@ -885,8 +890,8 @@ void M_Load_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_load.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp" ); + p = Draw_CachePic ("gfx/p_load", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" ); for (i=0 ; i< MAX_SAVEGAMES; i++) M_Print(16, 32 + 8*i, m_filenames[i]); @@ -903,8 +908,8 @@ void M_Save_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_save.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); + p = Draw_CachePic ("gfx/p_save", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save"); for (i=0 ; iwidth)/2, 4, "gfx/p_multi.lmp"); - M_DrawPic (72, 32, "gfx/mp_menu.lmp"); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/p_multi", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); + M_DrawPic (72, 32, "gfx/mp_menu"); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i", f+1)); } @@ -1254,7 +1259,7 @@ void M_Menu_Setup_f (void) } static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load; -static qbyte *menuplyr_pixels; +static unsigned char *menuplyr_pixels; static unsigned int *menuplyr_translated; typedef struct ratetable_s @@ -1297,13 +1302,13 @@ void M_Setup_Draw (void) M_Background(320, 200); - M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/p_multi", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_Print(64, 40, "Your name"); M_DrawTextBox (160, 32, 16, 1); - M_Print(168, 40, setup_myname); + M_PrintColored(168, 40, setup_myname); if (gamemode != GAME_GOODVSBAD2) { @@ -1320,18 +1325,19 @@ void M_Setup_Draw (void) // LordHavoc: rewrote this code greatly if (menuplyr_load) { - qbyte *data, *f; + unsigned char *data, *f; + fs_offset_t filesize; menuplyr_load = false; menuplyr_top = -1; menuplyr_bottom = -1; - if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true))) + if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize))) { - data = LoadLMP (f, 0, 0, true); + data = LoadLMP (f, filesize, 0, 0, true); menuplyr_width = image_width; menuplyr_height = image_height; Mem_Free(f); - menuplyr_pixels = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height); - menuplyr_translated = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4); + menuplyr_pixels = (unsigned char *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height); + menuplyr_translated = (unsigned int *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4); memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height); Mem_Free(data); } @@ -1346,10 +1352,10 @@ void M_Setup_Draw (void) M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16); for (i = 0;i < menuplyr_width * menuplyr_height;i++) menuplyr_translated[i] = palette_complete[translationTable[menuplyr_pixels[i]]]; - Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)menuplyr_translated); + Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated); } - M_DrawPic(160, 48, "gfx/bigbox.lmp"); - M_DrawPic(172, 56, "gfx/menuplyr.lmp"); + M_DrawPic(160, 48, "gfx/bigbox"); + M_DrawPic(172, 56, "gfx/menuplyr"); } if (setup_cursor == 0) @@ -1445,7 +1451,7 @@ forward: break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; if (setup_cursor == 0) { @@ -1545,9 +1551,9 @@ void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1)); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&r_sky, !r_sky.integer); + Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4)); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&gl_combine, !gl_combine.integer); + Cvar_SetValueQuick (&r_sky, !r_sky.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_dither, !gl_dither.integer); else if (options_cursor == optnum++) @@ -1563,7 +1569,7 @@ void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5)); + Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5)); else if (options_cursor == optnum++) @@ -1605,7 +1611,7 @@ int optnum; int opty; int optcursor; -void M_Options_PrintCommand(char *s, int enabled) +void M_Options_PrintCommand(const char *s, int enabled) { if (opty >= 32) { @@ -1616,7 +1622,7 @@ void M_Options_PrintCommand(char *s, int enabled) optnum++; } -void M_Options_PrintCheckbox(char *s, int enabled, int yes) +void M_Options_PrintCheckbox(const char *s, int enabled, int yes) { if (opty >= 32) { @@ -1628,7 +1634,7 @@ void M_Options_PrintCheckbox(char *s, int enabled, int yes) optnum++; } -void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, float maxvalue) +void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue) { if (opty >= 32) { @@ -1647,9 +1653,9 @@ void M_Options_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer)); - M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp", false); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); + M_DrawPic(16, 4, "gfx/qplaque"); + p = Draw_CachePic("gfx/p_option", false); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optnum = 0; optcursor = options_cursor; @@ -1674,8 +1680,8 @@ void M_Options_Draw (void) M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170); M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer); M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1); + M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4); M_Options_PrintCheckbox(" Sky", true, r_sky.integer); - M_Options_PrintCheckbox(" Texture Combine", true, gl_combine.integer); M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer); M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy); M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5); @@ -1764,7 +1770,7 @@ void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 37 +#define OPTIONS_EFFECTS_ITEMS 35 int options_effects_cursor; @@ -1776,11 +1782,9 @@ void M_Menu_Options_Effects_f (void) } -extern cvar_t r_detailtextures; extern cvar_t cl_stainmaps; extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; -extern cvar_t r_modellights; extern cvar_t r_coronas; extern cvar_t gl_flashblend; extern cvar_t cl_beams_polygon; @@ -1800,17 +1804,16 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) S_LocalSound ("sound/misc/menu3.wav"); optnum = 0; - if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4)); + if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps_clearonload, !cl_stainmaps_clearonload.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer); @@ -1836,7 +1839,6 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterwarp, bound(0, r_waterwarp.value + dir * 0.1, 1)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10)); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10)); } void M_Options_Effects_Draw (void) @@ -1846,26 +1848,25 @@ void M_Options_Effects_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer)); - M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp", false); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); + M_DrawPic(16, 4, "gfx/qplaque"); + p = Draw_CachePic("gfx/p_option", false); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_effects_cursor; optnum = 0; visible = (menu_height - 32) / 8; opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8; - M_Options_PrintSlider( " Lights Per Model", true, r_modellights.value, 0, 8); M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4); M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer); M_Options_PrintCheckbox(" Particles", true, cl_particles.integer); + M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer); M_Options_PrintSlider( " Particles Quality", true, cl_particles_quality.value, 1, 4); M_Options_PrintCheckbox(" Explosion Shell", true, cl_particles_explosions_shell.integer); M_Options_PrintCheckbox(" Explosion Shell Clip", true, r_explosionclip.integer); M_Options_PrintCheckbox(" Stainmaps", true, cl_stainmaps.integer); M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmaps_clearonload.integer); M_Options_PrintCheckbox(" Decals", true, cl_decals.integer); - M_Options_PrintCheckbox(" Detail Texturing", true, r_detailtextures.integer); M_Options_PrintCheckbox(" Bullet Impacts", true, cl_particles_bulletimpacts.integer); M_Options_PrintCheckbox(" Smoke", true, cl_particles_smoke.integer); M_Options_PrintCheckbox(" Sparks", true, cl_particles_sparks.integer); @@ -1891,7 +1892,6 @@ void M_Options_Effects_Draw (void) M_Options_PrintSlider( " Underwater View Warp", true, r_waterwarp.value, 0, 1); M_Options_PrintSlider( " Water Alpha (opacity)", true, r_wateralpha.value, 0, 1); M_Options_PrintSlider( " Water Movement", true, r_waterscroll.value, 0, 10); - M_Options_PrintSlider( " GeForce3 Water Shader", true, r_watershader.value, 0, 10); } @@ -1988,9 +1988,9 @@ void M_Options_Graphics_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer)); - M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp", false); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); + M_DrawPic(16, 4, "gfx/qplaque"); + p = Draw_CachePic("gfx/p_option", false); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_graphics_cursor; optnum = 0; @@ -2173,9 +2173,9 @@ void M_Options_ColorControl_Draw (void) M_Background(320, 256); - M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp", false); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); + M_DrawPic(16, 4, "gfx/qplaque"); + p = Draw_CachePic("gfx/p_option", false); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_colorcontrol_cursor; optnum = 0; @@ -2205,13 +2205,13 @@ void M_Options_ColorControl_Draw (void) DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4; s = (float) 312 / 2 * vid.width / vid_conwidth.integer; t = (float) 4 / 2 * vid.height / vid_conheight.integer; - DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4; DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4; DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);opty += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4; DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);opty += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4; DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4; c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake @@ -2222,20 +2222,20 @@ void M_Options_ColorControl_Draw (void) opty += 8; x = 4; DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0); x += 80; DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0); x += 80; DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0); x += 80; DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0); } @@ -2558,12 +2558,12 @@ void M_Keys_Draw (void) int keys[NUMKEYS]; int y; cachepic_t *p; - char keystring[1024]; + char keystring[MAX_INPUTLINE]; M_Background(320, 48 + 8 * numcommands); - p = Draw_CachePic ("gfx/ttl_cstm.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp"); + p = Draw_CachePic ("gfx/ttl_cstm", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm"); if (bind_grab) M_Print(12, 32, "Press a key or button for this action"); @@ -2722,40 +2722,116 @@ void M_Reset_Draw (void) //============================================================================= /* VIDEO MENU */ -#define VIDEO_ITEMS 5 +// note: if modes are added to the beginning of this list, update VID_DEFAULT +typedef struct video_resolution_s +{ + const char *type; + int width, height; + int conwidth, conheight; + double pixelheight; // pixel aspect +} +video_resolution_t; +video_resolution_t video_resolutions[] = +{ +{"Standard 4x3" , 320, 240, 320, 240, 1 }, +{"Standard 4x3" , 400, 300, 400, 300, 1 }, +{"Standard 4x3" , 512, 384, 512, 384, 1 }, +{"Standard 4x3" , 640, 480, 640, 480, 1 }, +{"Standard 4x3" , 800, 600, 640, 480, 1 }, +{"Standard 4x3" , 1024, 768, 640, 480, 1 }, +{"Standard 4x3" , 1152, 864, 640, 480, 1 }, +{"Standard 4x3" , 1280, 960, 640, 480, 1 }, +{"Standard 4x3" , 1600,1200, 640, 480, 1 }, +{"Standard 4x3" , 1792,1344, 640, 480, 1 }, +{"Standard 4x3" , 1920,1440, 640, 480, 1 }, +{"Standard 4x3" , 2048,1536, 640, 480, 1 }, +{"Short Pixel (CRT) 5x4" , 320, 256, 320, 256, 0.9375}, +{"Short Pixel (CRT) 5x4" , 640, 512, 640, 512, 0.9375}, +{"Short Pixel (CRT) 5x4" , 1280,1024, 640, 512, 0.9375}, +{"Tall Pixel (CRT) 8x5" , 320, 200, 320, 200, 1.2 }, +{"Tall Pixel (CRT) 8x5" , 640, 400, 640, 400, 1.2 }, +{"Tall Pixel (CRT) 8x5" , 840, 525, 640, 400, 1.2 }, +{"Tall Pixel (CRT) 8x5" , 960, 600, 640, 400, 1.2 }, +{"Tall Pixel (CRT) 8x5" , 1680,1050, 640, 400, 1.2 }, +{"Tall Pixel (CRT) 8x5" , 1920,1200, 640, 400, 1.2 }, +{"Square Pixel (LCD) 5x4" , 320, 256, 320, 256, 1 }, +{"Square Pixel (LCD) 5x4" , 640, 512, 640, 512, 1 }, +{"Square Pixel (LCD) 5x4" , 1280,1024, 640, 512, 1 }, +{"WideScreen 5x3" , 640, 384, 640, 384, 1 }, +{"WideScreen 5x3" , 1280, 768, 640, 384, 1 }, +{"WideScreen 8x5" , 320, 200, 320, 200, 1 }, +{"WideScreen 8x5" , 640, 400, 640, 400, 1 }, +{"WideScreen 8x5" , 840, 525, 640, 400, 1 }, +{"WideScreen 8x5" , 960, 600, 640, 400, 1 }, +{"WideScreen 8x5" , 1680,1050, 640, 400, 1 }, +{"WideScreen 8x5" , 1920,1200, 640, 400, 1 }, +{"WideScreen 8x5" , 2560,1600, 640, 400, 1 }, +{"WideScreen 8x5" , 3840,2400, 640, 400, 1 }, +{"WideScreen 14x9" , 840, 540, 640, 400, 1 }, +{"WideScreen 14x9" , 1680,1080, 640, 400, 1 }, +{"WideScreen 16x9" , 640, 360, 640, 360, 1 }, +{"WideScreen 16x9" , 683, 384, 683, 384, 1 }, +{"WideScreen 16x9" , 960, 540, 640, 360, 1 }, +{"WideScreen 16x9" , 1280, 720, 640, 360, 1 }, +{"WideScreen 16x9" , 1366, 768, 683, 384, 1 }, +{"WideScreen 16x9" , 1920,1080, 640, 360, 1 }, +{"WideScreen 16x9" , 2560,1440, 640, 360, 1 }, +{"WideScreen 16x9" , 3840,2160, 640, 360, 1 }, +{"NTSC 3x2" , 360, 240, 360, 240, 1.125 }, +{"NTSC 3x2" , 720, 480, 720, 480, 1.125 }, +{"PAL 14x11" , 360, 283, 360, 283, 0.9545}, +{"PAL 14x11" , 720, 566, 360, 566, 0.9545}, +{"NES 8x7" , 256, 224, 256, 224, 1.1667}, +{"SNES 8x7" , 512, 448, 512, 448, 1.1667}, +{NULL, 0, 0, 0, 0, 0} +}; +// this is the number of the default mode (640x480) in the list above +#define VID_DEFAULT 3 +#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1) +#define VIDEO_ITEMS 7 int video_cursor = 0; -int video_cursor_table[] = {56, 68, 80, 100, 130}; -// 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}, {0,0}}; -// this is the number of the 640x480 mode in the list -#define VID_640 3 -#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1) +int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162}; int video_resolution; - void M_Menu_Video_f (void) { + int i; + key_dest = key_menu; m_state = m_video; m_entersound = true; - // Look for the current resolution - for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++) + // Look for the closest match to the current resolution + video_resolution = 0; + for (i = 1;i < VID_RES_COUNT;i++) { - if (video_resolutions[video_resolution][0] == vid.width && - video_resolutions[video_resolution][1] == vid.height) - break; - } - - // Default to VID_640 if we didn't find it - if (video_resolution == VID_RES_COUNT) - { - // may need to update this number if mode list changes - video_resolution = VID_640; - Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]); - Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]); + // if the new mode would be a worse match in width, skip it + if (fabs(video_resolutions[i].width - vid.width) > fabs(video_resolutions[video_resolution].width - vid.width)) + continue; + // if it is equal in width, check height + if (video_resolutions[i].width == vid.width && video_resolutions[video_resolution].width == vid.width) + { + // if the new mode would be a worse match in height, skip it + if (fabs(video_resolutions[i].height - vid.height) > fabs(video_resolutions[video_resolution].height - vid.height)) + continue; + // if it is equal in width and height, check pixel aspect + if (video_resolutions[i].height == vid.height && video_resolutions[video_resolution].height == vid.height) + { + // if the new mode would be a worse match in pixel aspect, skip it + if (fabs(video_resolutions[i].pixelheight - vid_pixelheight.value) > fabs(video_resolutions[video_resolution].pixelheight - vid_pixelheight.value)) + continue; + // if it is equal in everything, skip it (prefer earlier modes) + if (video_resolutions[i].pixelheight == vid_pixelheight.value && video_resolutions[video_resolution].pixelheight == vid_pixelheight.value) + continue; + // better match for width, height, and pixel aspect + video_resolution = i; + } + else // better match for width and height + video_resolution = i; + } + else // better match for width + video_resolution = i; } } @@ -2763,33 +2839,43 @@ void M_Menu_Video_f (void) void M_Video_Draw (void) { cachepic_t *p; - const char* string; M_Background(320, 200); - M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/vidmodes.lmp", false); - M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp"); + M_DrawPic(16, 4, "gfx/qplaque"); + p = Draw_CachePic("gfx/vidmodes", false); + M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes"); - // Resolution - M_Print(16, video_cursor_table[0], " Resolution"); - string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]); - M_Print(220, video_cursor_table[0], string); + // Current Resolution + M_Print(16, video_cursor_table[0], " Current Resolution"); + if (vid_supportrefreshrate && vid.fullscreen) + M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate)); + else + M_Print(220, video_cursor_table[0], va("%dx%d", vid.width, vid.height)); + + // Proposed Resolution + M_Print(16, video_cursor_table[1], " New Resolution"); + M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height)); + M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type)); // Bits per pixel - M_Print(16, video_cursor_table[1], " Bits per pixel"); - M_Print(220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16"); + M_Print(16, video_cursor_table[2], " Bits per pixel"); + M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16"); + + // Refresh Rate + M_ItemPrint(16, video_cursor_table[3], " Refresh Rate", vid_supportrefreshrate); + M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150); // Fullscreen - M_Print(16, video_cursor_table[2], " Fullscreen"); - M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer); + M_Print(16, video_cursor_table[4], " Fullscreen"); + M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer); // "Apply" button - M_Print(220, video_cursor_table[3], "Apply"); + M_Print(220, video_cursor_table[5], "Apply"); // Vertical Sync - M_ItemPrint (0, video_cursor_table[4], " Vertical Sync", gl_videosyncavailable); - M_DrawCheckbox(220, video_cursor_table[4], vid_vsync.integer); + M_ItemPrint(16, video_cursor_table[6], " Vertical Sync", gl_videosyncavailable); + M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer); // Cursor M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1)); @@ -2803,30 +2889,35 @@ void M_Menu_Video_AdjustSliders (int dir) switch (video_cursor) { // Resolution - case 0: + case 1: { - int new_resolution = video_resolution + dir; - if (gamemode == GAME_FNIGGIUM ? new_resolution < VID_640 : new_resolution < 0) - video_resolution = VID_RES_COUNT - 1; - else if (new_resolution > VID_RES_COUNT - 1) - video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0; - else - video_resolution = new_resolution; - - Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]); - Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]); + int r; + for(r = 0;r < VID_RES_COUNT;r++) + { + video_resolution += dir; + if (video_resolution >= VID_RES_COUNT) + video_resolution = 0; + if (video_resolution < 0) + video_resolution = VID_RES_COUNT - 1; + if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer) + break; + } break; } // Bits per pixel - case 1: + case 2: Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32); break; - case 2: + // Refresh Rate + case 3: + Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir); + break; + case 4: Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer); break; - case 4: + case 6: Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer); break; } @@ -2840,9 +2931,9 @@ void M_Video_Key (int key, char ascii) case K_ESCAPE: // vid_shared.c has a copy of the current video config. We restore it Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen); - Cvar_SetValueQuick(&vid_width, vid.width); - Cvar_SetValueQuick(&vid_height, vid.height); Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel); + if (vid_supportrefreshrate) + Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate); S_LocalSound ("sound/misc/menu1.wav"); M_Menu_Options_f (); @@ -2852,7 +2943,12 @@ void M_Video_Key (int key, char ascii) m_entersound = true; switch (video_cursor) { - case 3: + case 5: + Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width); + Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height); + Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth); + Cvar_SetValueQuick (&vid_conheight, video_resolutions[video_resolution].conheight); + Cvar_SetValueQuick (&vid_pixelheight, video_resolutions[video_resolution].pixelheight); Cbuf_AddText ("vid_restart\n"); M_Menu_Options_f (); break; @@ -2905,7 +3001,7 @@ void M_Menu_Help_f (void) void M_Help_Draw (void) { M_Background(320, 200); - M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page)); + M_DrawPic (0, 0, va("gfx/help%i", help_page)); } @@ -2991,6 +3087,7 @@ int M_ChooseQuitMessage(int request) case GAME_HIPNOTIC: case GAME_ROGUE: case GAME_NEHAHRA: + case GAME_DEFEATINDETAIL2: if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Milord, methinks that","thou art a lowly","quitter. Is this true?",NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Do I need to bust your","face open for trying","to quit?",NULL,NULL,NULL,NULL,NULL); @@ -3065,7 +3162,7 @@ void M_Quit_Key (int key, char ascii) case 'N': if (wasInMenus) { - m_state = m_quit_prevstate; + m_state = (enum m_state_e)m_quit_prevstate; m_entersound = true; } else @@ -3146,10 +3243,10 @@ void M_LanConfig_Draw (void) M_Background(320, 200); - M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp", false); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/p_multi", false); basex = (320-p->width)/2; - M_DrawPic (basex, 4, "gfx/p_multi.lmp"); + M_DrawPic (basex, 4, "gfx/p_multi"); if (StartingGame) startJoin = "New Game"; @@ -3253,7 +3350,7 @@ void M_LanConfig_Key (int key, char ascii) break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; if (lanConfig_cursor == 2) @@ -3296,20 +3393,20 @@ void M_LanConfig_Key (int key, char ascii) //============================================================================= /* GAME OPTIONS MENU */ -typedef struct +typedef struct level_s { char *name; char *description; } level_t; -typedef struct +typedef struct episode_s { char *description; int firstLevel; int levels; } episode_t; -typedef struct +typedef struct gamelevels_s { char *gamename; level_t *levels; @@ -3664,6 +3761,18 @@ episode_t openquartzepisodes[] = {"Contrib", 7, 6}, }; +level_t defeatindetail2levels[] = +{ + {"atac3", "River Crossing"}, + {"atac4", "Canyon Chaos"}, + {"atac7", "Desert Stormer"}, +}; + +episode_t defeatindetail2episodes[] = +{ + {"ATAC Campaign", 0, 3}, +}; + gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7}; gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6}; @@ -3673,10 +3782,11 @@ gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepi gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1}; gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3}; +gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1}; -typedef struct +typedef struct gameinfo_s { - int gameid; + gamemode_t gameid; gamelevels_t *notregistered; gamelevels_t *registered; } @@ -3692,7 +3802,8 @@ gameinfo_t gamelist[] = {GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game}, {GAME_BATTLEMECH, &battlemechgame, &battlemechgame}, {GAME_OPENQUARTZ, &openquartzgame, &openquartzgame}, - {-1, &sharewarequakegame, ®isteredquakegame} // final fallback + {GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game}, + {(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback }; gamelevels_t *lookupgameinfo(void) @@ -3735,9 +3846,9 @@ void M_GameOptions_Draw (void) M_Background(320, 200); - M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp", false); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); + M_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/p_multi", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawTextBox (152, 32, 10, 1); M_Print(160, 40, "begin game"); @@ -4127,7 +4238,7 @@ void M_GameOptions_Key (int key, char ascii) break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; if (gameoptions_cursor == 9) { @@ -4180,15 +4291,15 @@ void M_ServerList_Draw (void) start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible); end = min(start + visible, serverlist_viewcount); - p = Draw_CachePic("gfx/p_multi.lmp", false); - M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp"); + p = Draw_CachePic("gfx/p_multi", false); + M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi"); if (end > start) { for (n = start;n < end;n++) { DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); - M_Print(0, y, serverlist_viewlist[n]->line1);y += 8; - M_Print(0, y, serverlist_viewlist[n]->line2);y += 8; + M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8; + M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8; } } else if (realtime - masterquerytime < 3) @@ -4612,7 +4723,8 @@ void MR_SetRouting (qboolean forceold); void MP_Error(const char *format, ...) { - char errorstring[4096]; + static qboolean processingError = false; + char errorstring[MAX_INPUTLINE]; va_list argptr; va_start (argptr, format); @@ -4620,7 +4732,13 @@ void MP_Error(const char *format, ...) va_end (argptr); Con_Printf( "Menu_Error: %s\n", errorstring ); - PRVM_Crash(); + if( !processingError ) { + processingError = true; + PRVM_Crash(); + processingError = false; + } else { + Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" ); + } // fall back to the normal menu @@ -4763,6 +4881,11 @@ void MP_Restart(void) static cvar_t forceqmenu = { 0, "forceqmenu", "0" }; +void (*MR_Keydown) (int key, char ascii); +void (*MR_Draw) (void); +void (*MR_ToggleMenu_f) (void); +void (*MR_Shutdown) (void); + void MR_SetRouting(qboolean forceold) { static qboolean m_init = FALSE, mp_init = FALSE;