qboolean m_entersound; // play after drawing a frame, so caching
// won't disrupt the sound
-//qboolean m_recursiveDraw;
int m_return_state;
qboolean m_return_onerror;
demonames_t Demos[35];
+float menu_x, menu_y, menu_width, menu_height;
+
+void M_DrawBackground(void)
+{
+ menu_width = 320;
+ menu_height = 200;
+ menu_x = (vid.conwidth - menu_width) * 0.5;
+ menu_y = (vid.conheight - menu_height) * 0.5;
+ DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+}
+
/*
================
M_DrawCharacter
Draws one solid graphics character
================
*/
-void M_DrawCharacter (int cx, int line, int num)
+void M_DrawCharacter (float cx, float cy, int num)
{
- Draw_Character ( cx + ((vid.width - 320)>>1), line, num);
+ char temp[2];
+ temp[0] = num;
+ temp[1] = 0;
+ DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
-void M_Print (int cx, int cy, char *str)
+void M_Print (float cx, float cy, char *str)
{
+ /*
while (*str)
{
- M_DrawCharacter (cx, cy, (*str)+128);
- str++;
+ M_DrawCharacter (cx, cy, (*str++)+128);
cx += 8;
}
+ */
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
-void M_PrintWhite (int cx, int cy, char *str)
+void M_PrintWhite (float cx, float cy, char *str)
{
- while (*str)
- {
- M_DrawCharacter (cx, cy, *str);
- str++;
- cx += 8;
- }
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
-void M_DrawPic (int x, int y, qpic_t *pic)
+void M_DrawPic (float cx, float cy, char *picname)
{
- Draw_Pic (x + ((vid.width - 320)>>1), y, pic);
+ DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0);
}
byte identityTable[256];
}
-void M_DrawPicTranslate (int x, int y, qpic_t *pic)
+void M_DrawPicTranslate (float cx, float cy, char *picname)
{
- Draw_PicTranslate (x + ((vid.width - 320)>>1), y, pic, translationTable);
+ DrawQ_PicTranslate (menu_x + cx, menu_y + cy, picname, translationTable);
}
-void M_DrawTextBox (int x, int y, int width, int lines)
+void M_DrawTextBox (float x, float y, float width, float height)
{
- qpic_t *p;
- int cx, cy;
- int n;
+ int n;
+ float cx, cy;
// draw left side
cx = x;
cy = y;
- p = Draw_CachePic ("gfx/box_tl.lmp");
- M_DrawPic (cx, cy, p);
- p = Draw_CachePic ("gfx/box_ml.lmp");
- for (n = 0; n < lines; n++)
+ M_DrawPic (cx, cy, "gfx/box_tl.lmp");
+ for (n = 0; n < height; n++)
{
cy += 8;
- M_DrawPic (cx, cy, p);
+ M_DrawPic (cx, cy, "gfx/box_ml.lmp");
}
- p = Draw_CachePic ("gfx/box_bl.lmp");
- M_DrawPic (cx, cy+8, p);
+ M_DrawPic (cx, cy+8, "gfx/box_bl.lmp");
// draw middle
cx += 8;
while (width > 0)
{
cy = y;
- p = Draw_CachePic ("gfx/box_tm.lmp");
- M_DrawPic (cx, cy, p);
- p = Draw_CachePic ("gfx/box_mm.lmp");
- for (n = 0; n < lines; n++)
+ M_DrawPic (cx, cy, "gfx/box_tm.lmp");
+ for (n = 0; n < height; n++)
{
cy += 8;
- if (n == 1)
- p = Draw_CachePic ("gfx/box_mm2.lmp");
- M_DrawPic (cx, cy, p);
+ if (n >= 1)
+ M_DrawPic (cx, cy, "gfx/box_mm2.lmp");
+ else
+ M_DrawPic (cx, cy, "gfx/box_mm.lmp");
}
- p = Draw_CachePic ("gfx/box_bm.lmp");
- M_DrawPic (cx, cy+8, p);
+ M_DrawPic (cx, cy+8, "gfx/box_bm.lmp");
width -= 2;
cx += 16;
}
// draw right side
cy = y;
- p = Draw_CachePic ("gfx/box_tr.lmp");
- M_DrawPic (cx, cy, p);
- p = Draw_CachePic ("gfx/box_mr.lmp");
- for (n = 0; n < lines; n++)
+ M_DrawPic (cx, cy, "gfx/box_tr.lmp");
+ for (n = 0; n < height; n++)
{
cy += 8;
- M_DrawPic (cx, cy, p);
+ M_DrawPic (cx, cy, "gfx/box_mr.lmp");
}
- p = Draw_CachePic ("gfx/box_br.lmp");
- M_DrawPic (cx, cy+8, p);
+ M_DrawPic (cx, cy+8, "gfx/box_br.lmp");
}
//=============================================================================
void menuitem_image_drawfunc(struct menuitem_s *item)
{
- qpic_t *p = Draw_CachePic (item->string);
// FIXME: handle color flashs and such when selected
- M_DrawPic (item->x, item->y, p);
+ M_DrawPic (item->x, item->y, item->string);
}
void menuitem_command_usefunc(struct menuitem_s *item)
void M_Menu_Main_f (void)
{
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
if (NehGameType == TYPE_DEMO)
MAIN_ITEMS = 4;
void M_Main_Draw (void)
{
int f;
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_main.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp");
// Nehahra
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
if (NehGameType == TYPE_BOTH)
- M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp"));
+ M_DrawPic (72, 32, "gfx/mainmenu.lmp");
else if (NehGameType == TYPE_GAME)
- M_DrawPic (72, 32, Draw_CachePic ("gfx/gamemenu.lmp"));
+ M_DrawPic (72, 32, "gfx/gamemenu.lmp");
else
- M_DrawPic (72, 32, Draw_CachePic ("gfx/demomenu.lmp"));
+ M_DrawPic (72, 32, "gfx/demomenu.lmp");
}
else
- M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp"));
+ M_DrawPic (72, 32, "gfx/mainmenu.lmp");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_main_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
+ M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i.lmp", f+1));
}
case K_ENTER:
m_entersound = true;
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
switch (NehGameType)
{
void M_SinglePlayer_Draw (void)
{
int f;
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
- M_DrawPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") );
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp");
+ M_DrawPic (72, 32, "gfx/sp_menu.lmp");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_singleplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
+ M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
}
if (sv.active)
Cbuf_AddText ("disconnect\n");
Cbuf_AddText ("maxplayers 1\n");
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
Cbuf_AddText ("map nehstart\n");
else
Cbuf_AddText ("map start\n");
void M_Load_Draw (void)
{
int i;
- qpic_t *p;
+ cachepic_t *p;
p = Draw_CachePic ("gfx/p_load.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
for (i=0 ; i< MAX_SAVEGAMES; i++)
M_Print (16, 32 + 8*i, m_filenames[i]);
void M_Save_Draw (void)
{
int i;
- qpic_t *p;
+ cachepic_t *p;
p = Draw_CachePic ("gfx/p_save.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
for (i=0 ; i<MAX_SAVEGAMES ; i++)
M_Print (16, 32 + 8*i, m_filenames[i]);
void M_MultiPlayer_Draw (void)
{
int f;
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
- M_DrawPic (72, 32, Draw_CachePic ("gfx/mp_menu.lmp") );
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+ M_DrawPic (72, 32, "gfx/mp_menu.lmp");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
+ M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
if (ipxAvailable || tcpipAvailable)
return;
m_entersound = true;
strcpy(setup_myname, cl_name.string);
strcpy(setup_hostname, hostname.string);
- setup_top = setup_oldtop = ((int)cl_color.value) >> 4;
- setup_bottom = setup_oldbottom = ((int)cl_color.value) & 15;
+ setup_top = setup_oldtop = cl_color.integer >> 4;
+ setup_bottom = setup_oldbottom = cl_color.integer & 15;
}
void M_Setup_Draw (void)
{
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_Print (64, 40, "Hostname");
M_DrawTextBox (160, 32, 16, 1);
M_DrawTextBox (64, 140-8, 14, 1);
M_Print (72, 140, "Accept Changes");
- p = Draw_CachePic ("gfx/bigbox.lmp");
- M_DrawPic (160, 64, p);
- p = Draw_CachePic ("gfx/menuplyr.lmp");
+ M_DrawPic (160, 64, "gfx/bigbox.lmp");
M_BuildTranslationTable(setup_top*16, setup_bottom*16);
- M_DrawPicTranslate (172, 72, p);
+ M_DrawPicTranslate (172, 72, "gfx/menuplyr.lmp");
M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1));
void M_Net_Draw (void)
{
int f;
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
f = 32;
if (ipxAvailable)
- p = Draw_CachePic ("gfx/netmen3.lmp");
+ M_DrawPic (72, f, "gfx/netmen3.lmp");
else
- p = Draw_CachePic ("gfx/dim_ipx.lmp");
- M_DrawPic (72, f, p);
+ M_DrawPic (72, f, "gfx/dim_ipx.lmp");
f += 19;
if (tcpipAvailable)
- p = Draw_CachePic ("gfx/netmen4.lmp");
+ M_DrawPic (72, f, "gfx/netmen4.lmp");
else
- p = Draw_CachePic ("gfx/dim_tcp.lmp");
- M_DrawPic (72, f, p);
+ M_DrawPic (72, f, "gfx/dim_tcp.lmp");
if (m_net_items == 5) // JDC, could just be removed
{
f += 19;
- p = Draw_CachePic ("gfx/netmen5.lmp");
- M_DrawPic (72, f, p);
+ M_DrawPic (72, f, "gfx/netmen5.lmp");
}
f = (320-26*8)/2;
M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]);
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
+ M_DrawPic (54, 32 + m_net_cursor * 20, va("gfx/menudot%i.lmp", f+1));
}
//=============================================================================
/* OPTIONS MENU */
-#define OPTIONS_ITEMS (vid_menudrawfn ? 24 : 23)
+#define OPTIONS_ITEMS (vid_menudrawfn ? 25 : 24)
#define SLIDER_RANGE 10
Cvar_SetValue ("viewsize", bound(30, scr_viewsize.value + dir * 10, 120));
break;
case 4:
- Cvar_SetValue ("r_ser", !r_ser.value);
+ Cvar_SetValue ("r_ser", !r_ser.integer);
break;
case 5: // overbright rendering
- Cvar_SetValue ("gl_lightmode", !gl_lightmode.value);
+ Cvar_SetValue ("gl_lightmode", !gl_lightmode.integer);
break;
- case 6: // sky quality
- Cvar_SetValue ("r_skyquality", bound(0, r_skyquality.value + dir, 4));
+ case 6: // dithering
+ Cvar_SetValue ("gl_dither", !gl_dither.integer);
break;
- case 7: // hardware gamma
+ case 7: // sky quality
+ Cvar_SetValue ("r_skyquality", bound(0, r_skyquality.integer + dir, 2));
+ break;
+
+ case 8: // hardware gamma
Cvar_SetValue ("vid_gamma", bound(1, vid_gamma.value + dir * 0.25, 5));
break;
- case 8: // hardware brightness
+ case 9: // hardware brightness
Cvar_SetValue ("vid_brightness", bound(1, vid_brightness.value + dir * 0.25, 5));
break;
- case 9: // hardware contrast
+ case 10: // hardware contrast
Cvar_SetValue ("vid_contrast", bound(0.2, vid_contrast.value + dir * 0.08, 1));
break;
- case 10: // software brightness
+ case 11: // software brightness
Cvar_SetValue ("r_brightness", bound(1, r_brightness.value + dir * 0.25, 5));
break;
- case 11: // software base brightness
+ case 12: // software base brightness
Cvar_SetValue ("r_contrast", bound(0.2, r_contrast.value + dir * 0.08, 1));
break;
- case 12: // music volume
+ case 13: // music volume
#ifdef _WIN32
Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 1.0, 1));
#else
#endif
break;
- case 13: // sfx volume
+ case 14: // sfx volume
Cvar_SetValue ("volume", bound(0, volume.value + dir * 0.1, 1));
break;
- case 14: // always run
+ case 15: // always run
if (cl_forwardspeed.value > 200)
{
Cvar_SetValue ("cl_forwardspeed", 200);
}
break;
- case 15: // lookspring
- Cvar_SetValue ("lookspring", !lookspring.value);
+ case 16: // lookspring
+ Cvar_SetValue ("lookspring", !lookspring.integer);
break;
- case 16: // lookstrafe
- Cvar_SetValue ("lookstrafe", !lookstrafe.value);
+ case 17: // lookstrafe
+ Cvar_SetValue ("lookstrafe", !lookstrafe.integer);
break;
- case 17: // mouse speed
+ case 18: // mouse speed
Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50));
break;
- case 18: // mouse look
- Cvar_SetValue ("freelook", !freelook.value);
+ case 19: // mouse look
+ Cvar_SetValue ("freelook", !freelook.integer);
break;
- case 19: // invert mouse
+ case 20: // invert mouse
Cvar_SetValue ("m_pitch", -m_pitch.value);
break;
- case 20: // windowed mouse
- Cvar_SetValue ("vid_mouse", !vid_mouse.value);
+ case 21: // windowed mouse
+ Cvar_SetValue ("vid_mouse", !vid_mouse.integer);
break;
- case 21:
- Cvar_SetValue ("crosshair", bound(0, crosshair.value + dir, 5));
+ case 22:
+ Cvar_SetValue ("crosshair", bound(0, crosshair.integer + dir, 5));
break;
- case 22: // show framerate
- Cvar_SetValue ("showfps", !showfps.value);
+ case 23: // show framerate
+ Cvar_SetValue ("showfps", !showfps.integer);
break;
}
}
void M_Options_Draw (void)
{
float y;
- qpic_t *p;
+ cachepic_t *p;
- M_DrawPic(16, 4, Draw_CachePic("gfx/qplaque.lmp") );
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic("gfx/p_option.lmp");
- M_DrawPic((320-p->width)/2, 4, p);
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
y = 32;
M_Print(16, y, " Customize controls");y += 8;
M_Print(16, y, " Go to console");y += 8;
M_Print(16, y, " Reset to defaults");y += 8;
M_Print(16, y, " Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
- M_Print(16, y, "Hidden Surface Removal");M_DrawCheckbox(220, y, r_ser.value);y += 8;
- M_Print(16, y, " Overbright Rendering");M_DrawCheckbox(220, y, gl_lightmode.value);y += 8;
- M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 4);y += 8;
+ M_Print(16, y, "Hidden Surface Removal");M_DrawCheckbox(220, y, r_ser.integer);y += 8;
+ M_Print(16, y, " Overbright Rendering");M_DrawCheckbox(220, y, gl_lightmode.integer);y += 8;
+ M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
+ M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 2);y += 8;
M_Print(16, y, " Hardware Gamma");M_DrawSlider(220, y, (vid_gamma.value - 1) / 4);y += 8;
M_Print(16, y, " Hardware Brightness");M_DrawSlider(220, y, (vid_brightness.value - 1) / 4);y += 8;
M_Print(16, y, " Hardware Contrast");M_DrawSlider(220, y, (vid_contrast.value - 0.2) / 0.8);y += 8;
M_Print(16, y, " CD Music Volume");M_DrawSlider(220, y, bgmvolume.value);y += 8;
M_Print(16, y, " Sound Volume");M_DrawSlider(220, y, volume.value);y += 8;
M_Print(16, y, " Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8;
- M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.value);y += 8;
- M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.value);y += 8;
+ M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8;
+ M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8;
M_Print(16, y, " Mouse Speed");M_DrawSlider(220, y, (sensitivity.value - 1)/50);y += 8;
- M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.value);y += 8;
+ M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8;
M_Print(16, y, " Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8;
- M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.value);y += 8;
+ M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8;
M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
- M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.value);y += 8;
+ M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
if (vid_menudrawfn)
M_Print(16, y, " Video Options");
y += 8;
int keys[2];
char *name;
int x, y;
- qpic_t *p;
+ cachepic_t *p;
p = Draw_CachePic ("gfx/ttl_cstm.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
if (bind_grab)
M_Print (12, 32, "Press a key or button for this action");
void M_Help_Draw (void)
{
- M_DrawPic (0, 0, Draw_CachePic ( va("gfx/help%i.lmp", help_page)) );
+ M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page));
}
" this game just like ",
" everything else? ",
" ",
-
+
" Milord, methinks that ",
" thou art a lowly ",
" quitter. Is this true? ",
void M_Quit_Draw (void)
{
- if (wasInMenus)
- {
- m_state = m_quit_prevstate;
-// m_recursiveDraw = true;
- M_Draw ();
- m_state = m_quit;
- }
-
/*
#ifdef _WIN32
M_DrawTextBox (0, 0, 38, 23);
void M_LanConfig_Draw (void)
{
- qpic_t *p;
+ cachepic_t *p;
int basex;
char *startJoin;
char *protocol;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
basex = (320-p->width)/2;
- M_DrawPic (basex, 4, p);
+ M_DrawPic (basex, 4, "gfx/p_multi.lmp");
if (StartingGame)
startJoin = "New Game";
void M_GameOptions_Draw (void)
{
- qpic_t *p;
+ cachepic_t *p;
int x;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
+ M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_DrawTextBox (152, 32, 10, 1);
M_Print (160, 40, "begin game");
M_Print (160, 56, va("%i", maxplayers) );
M_Print (0, 64, " Game Type");
- if (!coop.value && !deathmatch.value)
+ if (!coop.integer && !deathmatch.integer)
Cvar_SetValue("deathmatch", 1);
- if (coop.value)
+ if (coop.integer)
M_Print (160, 64, "Cooperative");
else
M_Print (160, 64, "Deathmatch");
M_Print (0, 72, " Teamplay");
- if (rogue)
+ if (gamemode == GAME_ROGUE)
{
char *msg;
- switch((int)teamplay.value)
+ switch((int)teamplay.integer)
{
case 1: msg = "No Friendly Fire"; break;
case 2: msg = "Friendly Fire"; break;
{
char *msg;
- switch((int)teamplay.value)
+ switch((int)teamplay.integer)
{
case 1: msg = "No Friendly Fire"; break;
case 2: msg = "Friendly Fire"; break;
}
M_Print (0, 80, " Skill");
- if (skill.value == 0)
+ if (skill.integer == 0)
M_Print (160, 80, "Easy difficulty");
- else if (skill.value == 1)
+ else if (skill.integer == 1)
M_Print (160, 80, "Normal difficulty");
- else if (skill.value == 2)
+ else if (skill.integer == 2)
M_Print (160, 80, "Hard difficulty");
else
M_Print (160, 80, "Nightmare difficulty");
M_Print (0, 88, " Frag Limit");
- if (fraglimit.value == 0)
+ if (fraglimit.integer == 0)
M_Print (160, 88, "none");
else
- M_Print (160, 88, va("%i frags", (int)fraglimit.value));
+ M_Print (160, 88, va("%i frags", fraglimit.integer));
M_Print (0, 96, " Time Limit");
- if (timelimit.value == 0)
+ if (timelimit.integer == 0)
M_Print (160, 96, "none");
else
- M_Print (160, 96, va("%i minutes", (int)timelimit.value));
+ M_Print (160, 96, va("%i minutes", timelimit.integer));
M_Print (0, 112, " Episode");
- //MED 01/06/97 added hipnotic episodes
- if (hipnotic)
- M_Print (160, 112, hipnoticepisodes[startepisode].description);
- //PGM 01/07/97 added rogue episodes
- else if (rogue)
- M_Print (160, 112, rogueepisodes[startepisode].description);
- else if (nehahra)
- M_Print (160, 112, nehahraepisodes[startepisode].description);
- else
- M_Print (160, 112, episodes[startepisode].description);
+ //MED 01/06/97 added hipnotic episodes
+ if (gamemode == GAME_HIPNOTIC)
+ M_Print (160, 112, hipnoticepisodes[startepisode].description);
+ //PGM 01/07/97 added rogue episodes
+ else if (gamemode == GAME_ROGUE)
+ M_Print (160, 112, rogueepisodes[startepisode].description);
+ else if (gamemode == GAME_NEHAHRA)
+ M_Print (160, 112, nehahraepisodes[startepisode].description);
+ else
+ M_Print (160, 112, episodes[startepisode].description);
M_Print (0, 120, " Level");
- //MED 01/06/97 added hipnotic episodes
- if (hipnotic)
- {
- M_Print (160, 120, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name);
- }
- //PGM 01/07/97 added rogue episodes
- else if (rogue)
- {
- M_Print (160, 120, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name);
- }
- else if (nehahra)
- {
- M_Print (160, 120, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name);
- }
- else
- {
- M_Print (160, 120, levels[episodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, levels[episodes[startepisode].firstLevel + startlevel].name);
- }
+ //MED 01/06/97 added hipnotic episodes
+ if (gamemode == GAME_HIPNOTIC)
+ {
+ M_Print (160, 120, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 128, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name);
+ }
+ //PGM 01/07/97 added rogue episodes
+ else if (gamemode == GAME_ROGUE)
+ {
+ M_Print (160, 120, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 128, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name);
+ }
+ else if (gamemode == GAME_NEHAHRA)
+ {
+ M_Print (160, 120, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 128, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name);
+ }
+ else
+ {
+ M_Print (160, 120, levels[episodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 128, levels[episodes[startepisode].firstLevel + startlevel].name);
+ }
// line cursor
M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
break;
case 2:
- if (deathmatch.value) // changing from deathmatch to coop
+ if (deathmatch.integer) // changing from deathmatch to coop
{
Cvar_SetValue ("coop", 1);
Cvar_SetValue ("deathmatch", 0);
break;
case 3:
- if (rogue)
+ if (gamemode == GAME_ROGUE)
count = 6;
else
count = 2;
- Cvar_SetValue ("teamplay", teamplay.value + dir);
- if (teamplay.value > count)
+ Cvar_SetValue ("teamplay", teamplay.integer + dir);
+ if (teamplay.integer > count)
Cvar_SetValue ("teamplay", 0);
- else if (teamplay.value < 0)
+ else if (teamplay.integer < 0)
Cvar_SetValue ("teamplay", count);
break;
case 4:
- Cvar_SetValue ("skill", skill.value + dir);
- if (skill.value > 3)
+ Cvar_SetValue ("skill", skill.integer + dir);
+ if (skill.integer > 3)
Cvar_SetValue ("skill", 0);
- if (skill.value < 0)
+ if (skill.integer < 0)
Cvar_SetValue ("skill", 3);
break;
case 5:
- Cvar_SetValue ("fraglimit", fraglimit.value + dir*10);
- if (fraglimit.value > 100)
+ Cvar_SetValue ("fraglimit", fraglimit.integer + dir*10);
+ if (fraglimit.integer > 100)
Cvar_SetValue ("fraglimit", 0);
- if (fraglimit.value < 0)
+ if (fraglimit.integer < 0)
Cvar_SetValue ("fraglimit", 100);
break;
case 7:
startepisode += dir;
//MED 01/06/97 added hipnotic count
- if (hipnotic)
+ if (gamemode == GAME_HIPNOTIC)
count = 6;
//PGM 01/07/97 added rogue count
//PGM 03/02/97 added 1 for dmatch episode
- else if (rogue)
+ else if (gamemode == GAME_ROGUE)
count = 4;
- else if (nehahra)
+ else if (gamemode == GAME_NEHAHRA)
count = 4;
- else if (registered.value)
+ else if (registered.integer)
count = 7;
else
count = 2;
case 8:
startlevel += dir;
//MED 01/06/97 added hipnotic episodes
- if (hipnotic)
+ if (gamemode == GAME_HIPNOTIC)
count = hipnoticepisodes[startepisode].levels;
//PGM 01/06/97 added hipnotic episodes
- else if (rogue)
+ else if (gamemode == GAME_ROGUE)
count = rogueepisodes[startepisode].levels;
- else if (nehahra)
+ else if (gamemode == GAME_NEHAHRA)
count = nehahraepisodes[startepisode].levels;
else
count = episodes[startepisode].levels;
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
// SCR_BeginLoadingPlaque ();
- if (hipnotic)
+ if (gamemode == GAME_HIPNOTIC)
Cbuf_AddText ( va ("map %s\n", hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name) );
- else if (rogue)
+ else if (gamemode == GAME_ROGUE)
Cbuf_AddText ( va ("map %s\n", roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name) );
- else if (nehahra)
+ else if (gamemode == GAME_NEHAHRA)
Cbuf_AddText ( va ("map %s\n", nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name) );
else
Cbuf_AddText ( va ("map %s\n", levels[episodes[startepisode].firstLevel + startlevel].name) );
void M_Search_Draw (void)
{
- qpic_t *p;
+ cachepic_t *p;
int x;
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
x = (320/2) - ((12*8)/2) + 4;
M_DrawTextBox (x-8, 32, 12, 1);
M_Print (x, 40, "Searching...");
{
int n;
char string [64];
- qpic_t *p;
+ cachepic_t *p;
if (!slist_sorted)
{
}
p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
for (n = 0; n < hostCacheCount; n++)
{
if (hostcache[n].maxusers)
Cmd_AddCommand ("help", M_Menu_Help_f);
Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
if (COM_FileExists("maps/neh1m4.bsp"))
{
}
}
-
void M_Draw (void)
{
if (m_state == m_none || key_dest != key_menu)
return;
- /*
- if (!m_recursiveDraw)
- {
- if (scr_con_current)
- {
- Draw_ConsoleBackground (vid.height);
- S_ExtraUpdate ();
- }
- }
- else
- {
- m_recursiveDraw = false;
- }
- */
+ M_DrawBackground();
switch (m_state)
{
projects / xonotic / darkplaces.git / blobdiff