int NehGameType;
-enum {m_none, m_main, m_demo, m_singleplayer, m_load, m_save, m_multiplayer, m_setup, m_net, m_options, m_video, m_keys, m_help, m_quit, m_lanconfig, m_gameoptions, m_search, m_slist} m_state;
+enum m_state_e m_state;
void M_Menu_Main_f (void);
void M_Menu_SinglePlayer_f (void);
qboolean m_entersound; // play after drawing a frame, so caching
// won't disrupt the sound
-qboolean m_recursiveDraw;
+//qboolean m_recursiveDraw;
int m_return_state;
qboolean m_return_onerror;
*/
void M_DrawCharacter (int cx, int line, int num)
{
- Draw_Character ( cx + ((vid.width - 320)>>1), line, num);
+ Draw_Character ( cx + ((vid.conwidth - 320)>>1), line, num);
}
void M_Print (int cx, int cy, char *str)
void M_DrawPic (int x, int y, qpic_t *pic)
{
- Draw_Pic (x + ((vid.width - 320)>>1), y, pic);
+ Draw_Pic (x + ((vid.conwidth - 320)>>1), y, pic);
}
byte identityTable[256];
void M_DrawPicTranslate (int x, int y, qpic_t *pic)
{
- Draw_PicTranslate (x + ((vid.width - 320)>>1), y, pic, translationTable);
+ Draw_PicTranslate (x + ((vid.conwidth - 320)>>1), y, pic, translationTable);
}
S_LocalSound ("misc/menu2.wav");
m_state = m_none;
key_dest = key_game;
- SCR_BeginLoadingPlaque ();
+// SCR_BeginLoadingPlaque ();
Cbuf_AddText (va ("playdemo %s\n", Demos[demo_cursor].name));
return;
void M_Menu_Main_f (void)
{
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
if (NehGameType == TYPE_DEMO)
MAIN_ITEMS = 4;
p = Draw_CachePic ("gfx/ttl_main.lmp");
M_DrawPic ( (320-p->width)/2, 4, p);
// Nehahra
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
if (NehGameType == TYPE_BOTH)
M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp"));
else
M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp"));
- f = (int)(host_time * 10)%6;
+ f = (int)(realtime * 10)%6;
M_DrawPic (54, 32 + m_main_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
}
case K_ENTER:
m_entersound = true;
- if (nehahra)
+ if (gamemode == GAME_NEHAHRA)
{
switch (NehGameType)
{
M_DrawPic ( (320-p->width)/2, 4, p);
M_DrawPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") );
- f = (int)(host_time * 10)%6;
+ f = (int)(realtime * 10)%6;
M_DrawPic (54, 32 + m_singleplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
}
switch (m_singleplayer_cursor)
{
case 0:
- if (sv.active)
- if (!SCR_ModalMessage("Are you sure you want to\nstart a new game?\n"))
- break;
key_dest = key_game;
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");
{
int i, j;
char name[MAX_OSPATH];
- FILE *f;
+ char *str;
+ QFile *f;
int version;
for (i=0 ; i<MAX_SAVEGAMES ; i++)
strcpy (m_filenames[i], "--- UNUSED SLOT ---");
loadable[i] = false;
sprintf (name, "%s/s%i.sav", com_gamedir, i);
- f = fopen (name, "r");
+ f = Qopen (name, "rz");
if (!f)
continue;
- fscanf (f, "%i\n", &version);
- fscanf (f, "%79s\n", name);
- strncpy (m_filenames[i], name, sizeof(m_filenames[i])-1);
+ str = Qgetline (f);
+ sscanf (str, "%i\n", &version);
+ str = Qgetline (f);
+ strncpy (m_filenames[i], str, sizeof(m_filenames[i])-1);
// change _ back to space
for (j=0 ; j<SAVEGAME_COMMENT_LENGTH ; j++)
if (m_filenames[i][j] == '_')
m_filenames[i][j] = ' ';
loadable[i] = true;
- fclose (f);
+ Qclose (f);
}
}
m_state = m_none;
key_dest = key_game;
- // Host_Loadgame_f can't bring up the loading plaque because too much
- // stack space has been used, so do it now
- SCR_BeginLoadingPlaque ();
+ // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue
+ //// Host_Loadgame_f can't bring up the loading plaque because too much
+ //// stack space has been used, so do it now
+//// SCR_BeginLoadingPlaque ();
- // issue the load command
+ // issue the load command
Cbuf_AddText (va ("load s%i\n", load_cursor) );
return;
M_DrawPic ( (320-p->width)/2, 4, p);
M_DrawPic (72, 32, Draw_CachePic ("gfx/mp_menu.lmp") );
- f = (int)(host_time * 10)%6;
+ f = (int)(realtime * 10)%6;
M_DrawPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
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;
}
M_Print (f, 142, net_helpMessage[m_net_cursor*4+0]);
M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]);
- f = (int)(host_time * 10)%6;
+ f = (int)(realtime * 10)%6;
M_DrawPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
}
//=============================================================================
/* OPTIONS MENU */
-#ifdef _WIN32
-#define OPTIONS_ITEMS 14
-#else
-#define OPTIONS_ITEMS 13
-#endif
+#define OPTIONS_ITEMS (vid_menudrawfn ? 25 : 24)
#define SLIDER_RANGE 10
key_dest = key_menu;
m_state = m_options;
m_entersound = true;
-
-#ifdef _WIN32
- if ((options_cursor == 13) && (modestate != MS_WINDOWED))
- {
- options_cursor = 0;
- }
-#endif
}
switch (options_cursor)
{
case 3: // screen size
- scr_viewsize.value += dir * 10;
- if (scr_viewsize.value < 30)
- scr_viewsize.value = 30;
- if (scr_viewsize.value > 120)
- scr_viewsize.value = 120;
- Cvar_SetValue ("viewsize", scr_viewsize.value);
- break;
- case 4: // brightness
- brightness.value += dir * 0.25;
- if (brightness.value < 1)
- brightness.value = 1;
- if (brightness.value > 5)
- brightness.value = 5;
- Cvar_SetValue ("brightness", brightness.value);
- break;
- case 5: // mouse speed
- sensitivity.value += dir * 0.5;
- if (sensitivity.value < 1)
- sensitivity.value = 1;
- if (sensitivity.value > 50)
- sensitivity.value = 50;
- Cvar_SetValue ("sensitivity", sensitivity.value);
- break;
- case 6: // music volume
+ Cvar_SetValue ("viewsize", bound(30, scr_viewsize.value + dir * 10, 120));
+ break;
+ case 4:
+ Cvar_SetValue ("r_ser", !r_ser.integer);
+ break;
+
+ case 5: // overbright rendering
+ Cvar_SetValue ("gl_lightmode", !gl_lightmode.integer);
+ break;
+
+ case 6: // dithering
+ Cvar_SetValue ("gl_dither", !gl_dither.integer);
+ break;
+
+ 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 9: // hardware brightness
+ Cvar_SetValue ("vid_brightness", bound(1, vid_brightness.value + dir * 0.25, 5));
+ break;
+
+ case 10: // hardware contrast
+ Cvar_SetValue ("vid_contrast", bound(0.2, vid_contrast.value + dir * 0.08, 1));
+ break;
+
+ case 11: // software brightness
+ Cvar_SetValue ("r_brightness", bound(1, r_brightness.value + dir * 0.25, 5));
+ break;
+
+ case 12: // software base brightness
+ Cvar_SetValue ("r_contrast", bound(0.2, r_contrast.value + dir * 0.08, 1));
+ break;
+
+ case 13: // music volume
#ifdef _WIN32
- bgmvolume.value += dir * 1.0;
+ Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 1.0, 1));
#else
- bgmvolume.value += dir * 0.1;
+ Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 0.1, 1));
#endif
- if (bgmvolume.value < 0)
- bgmvolume.value = 0;
- if (bgmvolume.value > 1)
- bgmvolume.value = 1;
- Cvar_SetValue ("bgmvolume", bgmvolume.value);
- break;
- case 7: // sfx volume
- volume.value += dir * 0.1;
- if (volume.value < 0)
- volume.value = 0;
- if (volume.value > 1)
- volume.value = 1;
- Cvar_SetValue ("volume", volume.value);
- break;
-
- case 8: // always run
+ break;
+
+ case 14: // sfx volume
+ Cvar_SetValue ("volume", bound(0, volume.value + dir * 0.1, 1));
+ break;
+
+ case 15: // always run
if (cl_forwardspeed.value > 200)
{
Cvar_SetValue ("cl_forwardspeed", 200);
}
break;
- case 9: // invert mouse
+ case 16: // lookspring
+ Cvar_SetValue ("lookspring", !lookspring.integer);
+ break;
+
+ case 17: // lookstrafe
+ Cvar_SetValue ("lookstrafe", !lookstrafe.integer);
+ break;
+
+ case 18: // mouse speed
+ Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50));
+ break;
+
+ case 19: // mouse look
+ Cvar_SetValue ("freelook", !freelook.integer);
+ break;
+
+ case 20: // invert mouse
Cvar_SetValue ("m_pitch", -m_pitch.value);
break;
- case 10: // lookspring
- Cvar_SetValue ("lookspring", !lookspring.value);
+ case 21: // windowed mouse
+ Cvar_SetValue ("vid_mouse", !vid_mouse.integer);
break;
- case 11: // lookstrafe
- Cvar_SetValue ("lookstrafe", !lookstrafe.value);
+ case 22:
+ Cvar_SetValue ("crosshair", bound(0, crosshair.integer + dir, 5));
break;
-#ifdef _WIN32
- case 13: // _windowed_mouse
- Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
+ case 23: // show framerate
+ Cvar_SetValue ("showfps", !showfps.integer);
break;
-#endif
}
}
void M_Options_Draw (void)
{
- float r;
+ float y;
qpic_t *p;
- M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
- p = Draw_CachePic ("gfx/p_option.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
-
- M_Print (16, 32, " Customize controls");
- M_Print (16, 40, " Go to console");
- M_Print (16, 48, " Reset to defaults");
-
- M_Print (16, 56, " Screen size");
- r = (scr_viewsize.value - 30) / (120 - 30);
- M_DrawSlider (220, 56, r);
-
- M_Print (16, 64, " Brightness");
- r = (brightness.value - 1) / 4;
- M_DrawSlider (220, 64, r);
-
- M_Print (16, 72, " Mouse Speed");
- r = (sensitivity.value - 1)/50;
- M_DrawSlider (220, 72, r);
-
- M_Print (16, 80, " CD Music Volume");
- r = bgmvolume.value;
- M_DrawSlider (220, 80, r);
-
- M_Print (16, 88, " Sound Volume");
- r = volume.value;
- M_DrawSlider (220, 88, r);
-
- M_Print (16, 96, " Always Run");
- M_DrawCheckbox (220, 96, cl_forwardspeed.value > 200);
-
- M_Print (16, 104, " Invert Mouse");
- M_DrawCheckbox (220, 104, m_pitch.value < 0);
-
- M_Print (16, 112, " Lookspring");
- M_DrawCheckbox (220, 112, lookspring.value);
-
- M_Print (16, 120, " Lookstrafe");
- M_DrawCheckbox (220, 120, lookstrafe.value);
-
+ M_DrawPic(16, 4, Draw_CachePic("gfx/qplaque.lmp") );
+ p = Draw_CachePic("gfx/p_option.lmp");
+ M_DrawPic((320-p->width)/2, 4, p);
+
+ 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.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, " Software Brightness");M_DrawSlider(220, y, (r_brightness.value - 1) / 4);y += 8;
+ M_Print(16, y, " Software Contrast");M_DrawSlider(220, y, (r_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.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.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.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.integer);y += 8;
if (vid_menudrawfn)
- M_Print (16, 128, " Video Options");
-
-#ifdef _WIN32
- if (modestate == MS_WINDOWED)
- {
- M_Print (16, 136, " Use Mouse");
- M_DrawCheckbox (220, 136, _windowed_mouse.value);
- }
-#endif
+ M_Print(16, y, " Video Options");
+ y += 8;
-// cursor
- M_DrawCharacter (200, 32 + options_cursor*8, 12+((int)(realtime*4)&1));
+ // cursor
+ M_DrawCharacter(200, 32 + options_cursor*8, 12+((int)(realtime*4)&1));
}
case 2:
Cbuf_AddText ("exec default.cfg\n");
break;
- case 12:
- M_Menu_Video_f ();
- break;
default:
- M_AdjustSliders (1);
+ // this is really just another case, but since it is calculated...
+ if (vid_menudrawfn && options_cursor == (OPTIONS_ITEMS - 1))
+ M_Menu_Video_f ();
+ else
+ M_AdjustSliders (1);
break;
}
return;
M_AdjustSliders (1);
break;
}
-
- if (options_cursor == 12 && vid_menudrawfn == NULL)
- {
- if (k == K_UPARROW)
- options_cursor = 11;
- else
- options_cursor = 0;
- }
-
-#ifdef _WIN32
- if ((options_cursor == 13) && (modestate != MS_WINDOWED))
- {
- if (k == K_UPARROW)
- options_cursor = 12;
- else
- options_cursor = 0;
- }
-#endif
}
//=============================================================================
int m_quit_prevstate;
qboolean wasInMenus;
-#ifndef _WIN32
+//#ifndef _WIN32
char *quitMessage [] =
{
/* .........1.........2.... */
+/*
" Are you gonna quit ",
" this game just like ",
" everything else? ",
" ",
-
+
" Milord, methinks that ",
" thou art a lowly ",
" quitter. Is this true? ",
" throw a blanket-party ",
" for you next time! ",
" "
+ */
+
+/* .........1.........2.... */
+ " ",
+ " Tired of fragging ",
+ " already? ",
+ " ",
+
+ " ",
+ " Quit now and forfeit ",
+ " your bodycount? ",
+ " ",
+
+ " ",
+ " Are you sure you ",
+ " want to quit? ",
+ " ",
+
+ " ",
+ " Off to do something ",
+ " constructive? ",
+ " ",
};
-#endif
+//#endif
void M_Menu_Quit_f (void)
{
m_quit_prevstate = m_state;
m_state = m_quit;
m_entersound = true;
- msgNumber = rand()&7;
+ msgNumber = rand()&3; //&7;
}
if (wasInMenus)
{
m_state = m_quit_prevstate;
- m_recursiveDraw = true;
+// m_recursiveDraw = true;
M_Draw ();
m_state = m_quit;
}
+/*
#ifdef _WIN32
M_DrawTextBox (0, 0, 38, 23);
M_PrintWhite (16, 12, " Quake version 1.09 by id Software\n\n");
M_PrintWhite (16, 172, "Nothing Interactive, Inc. All rights\n");
M_PrintWhite (16, 180, "reserved. Press y to exit\n");
#else
+*/
M_DrawTextBox (56, 76, 24, 4);
M_Print (64, 84, quitMessage[msgNumber*4+0]);
M_Print (64, 92, quitMessage[msgNumber*4+1]);
M_Print (64, 100, quitMessage[msgNumber*4+2]);
M_Print (64, 108, quitMessage[msgNumber*4+3]);
-#endif
+//#endif
}
//=============================================================================
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 ("disconnect\n");
Cbuf_AddText ("listen 0\n"); // so host_netport will be re-examined
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
- SCR_BeginLoadingPlaque ();
+// 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) );
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"))
{
if (m_state == m_none || key_dest != key_menu)
return;
+ /*
if (!m_recursiveDraw)
{
- scr_copyeverything = 1;
-
if (scr_con_current)
{
- Draw_ConsoleBackground (vid.height);
+ Draw_ConsoleBackground (vid.conheight);
S_ExtraUpdate ();
}
-// else
-// Draw_FadeScreen ();
-
- scr_fullupdate = 0;
}
else
{
m_recursiveDraw = false;
}
+ */
switch (m_state)
{
projects / xonotic / darkplaces.git / blobdiff