*/
#include "quakedef.h"
+#include "image.h"
-#ifdef _WIN32
-#include "winquake.h"
-#endif
-
-void (*vid_menudrawfn)(void);
-void (*vid_menukeyfn)(int key);
#define TYPE_DEMO 1
#define TYPE_GAME 2
void M_Menu_Net_f (void);
void M_Menu_Options_f (void);
void M_Menu_Options_Effects_f (void);
+ void M_Menu_Options_ColorControl_f (void);
void M_Menu_Keys_f (void);
void M_Menu_Video_f (void);
void M_Menu_Help_f (void);
void M_Menu_LanConfig_f (void);
void M_Menu_GameOptions_f (void);
void M_Menu_Search_f (void);
+void M_Menu_InetSearch_f (void);
void M_Menu_ServerList_f (void);
void M_Main_Draw (void);
void M_Net_Draw (void);
void M_Options_Draw (void);
void M_Options_Effects_Draw (void);
+ void M_Options_ColorControl_Draw (void);
void M_Keys_Draw (void);
void M_Video_Draw (void);
void M_Help_Draw (void);
void M_LanConfig_Draw (void);
void M_GameOptions_Draw (void);
void M_Search_Draw (void);
+void M_InetSearch_Draw (void);
void M_ServerList_Draw (void);
void M_Main_Key (int key);
void M_Net_Key (int key);
void M_Options_Key (int key);
void M_Options_Effects_Key (int key);
+ void M_Options_ColorControl_Key (int key);
void M_Keys_Key (int key);
void M_Video_Key (int key);
void M_Help_Key (int key);
void M_LanConfig_Key (int key);
void M_GameOptions_Key (int key);
void M_Search_Key (int key);
+void M_InetSearch_Key (int key);
void M_ServerList_Key (int key);
qboolean m_entersound; // play after drawing a frame, so caching
DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
-void M_Print (float cx, float cy, char *str)
+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);
}
-void M_PrintWhite (float cx, float cy, char *str)
+void M_PrintWhite (float cx, float cy, const char *str)
{
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
//=============================================================================
-int m_save_demonum;
+//int m_save_demonum;
/*
================
m_state = m_none;
return;
}
- if (key_dest == key_console)
- {
- Con_ToggleConsole_f ();
- }
- else
- {
+ //if (key_dest == key_console)
+ // Con_ToggleConsole_f ();
+ //else
M_Menu_Main_f ();
- }
}
int demo_cursor;
void M_Demo_Draw (void)
{
- int i;
+ int i;
- for (i=0; i < NumberOfNehahraDemos; i++)
+ for (i = 0;i < NumberOfNehahraDemos;i++)
M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
// line cursor
void M_Menu_Demos_f (void)
{
- key_dest = key_menu;
- m_state = m_demo;
- m_entersound = true;
+ key_dest = key_menu;
+ m_state = m_demo;
+ m_entersound = true;
}
void M_Demo_Key (int k)
else
MAIN_ITEMS = 5;
+ /*
if (key_dest != key_menu)
{
m_save_demonum = cls.demonum;
cls.demonum = -1;
}
+ */
key_dest = key_menu;
m_state = m_main;
m_entersound = true;
case K_ESCAPE:
key_dest = key_game;
m_state = m_none;
- cls.demonum = m_save_demonum;
- if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
- CL_NextDemo ();
+ //cls.demonum = m_save_demonum;
+ //if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
+ // CL_NextDemo ();
break;
case K_DOWNARROW:
if (ipxAvailable || tcpipAvailable)
return;
- M_PrintWhite ((320/2) - ((27*8)/2), 148, "No Communications Available");
+ M_PrintWhite ((320/2) - ((27*8)/2), 168, "No Communications Available");
}
M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16);
for (i = 0;i < menuplyr_width * menuplyr_height;i++)
- trans[i] = d_8to24table[translation[pixels[i]]];
+ trans[i] = palette_complete[translation[pixels[i]]];
Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans);
}
#define SLIDER_RANGE 10
-void M_DrawSlider (int x, int y, float range)
+void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
{
- int i;
-
- if (range < 0)
- range = 0;
- if (range > 1)
- range = 1;
+ char text[16];
+ int i;
+ float range;
+ range = bound(0, (num - rangemin) / (rangemax - rangemin), 1);
M_DrawCharacter (x-8, y, 128);
- for (i=0 ; i<SLIDER_RANGE ; i++)
+ for (i = 0;i < SLIDER_RANGE;i++)
M_DrawCharacter (x + i*8, y, 129);
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
+ sprintf(text, "%g", num);
+ M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
void M_DrawCheckbox (int x, int y, int on)
}
-#define OPTIONS_ITEMS 28
+#define OPTIONS_ITEMS 27
-int options_cursor;
+int options_cursor;
void M_Menu_Options_f (void)
{
m_entersound = true;
}
+extern cvar_t gl_delayfinish;
+extern cvar_t slowmo;
void M_Menu_Options_AdjustSliders (int dir)
{
switch (options_cursor)
{
- case 5:
- Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
- break;
case 6:
- Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
+ Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
break;
case 7:
- Cvar_SetValueQuick (&r_sky, !r_sky.integer);
+ Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
break;
case 8:
- Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
+ Cvar_SetValueQuick (&r_sky, !r_sky.integer);
break;
case 9:
- Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
+ Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
break;
case 10:
- Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
+ Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
break;
case 11:
- Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+ Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
break;
case 12:
- Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
+ Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
break;
case 13:
- Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
- break;
- case 14:
- Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
+ Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
break;
- case 15: // music volume
+ case 14: // music volume
#ifdef _WIN32
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
#else
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
#endif
break;
- case 16: // sfx volume
+ case 15: // sfx volume
Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
break;
- case 17:
+ case 16:
Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
break;
- case 18:
+ case 17:
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
break;
- case 19: // static crosshair
+ case 18: // static crosshair
Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
break;
- case 20: // show framerate
+ case 19: // show framerate
Cvar_SetValueQuick (&showfps, !showfps.integer);
break;
- case 21: // always run
+ case 20: // always run
if (cl_forwardspeed.value > 200)
{
Cvar_SetValueQuick (&cl_forwardspeed, 200);
Cvar_SetValueQuick (&cl_backspeed, 400);
}
break;
- case 22: // lookspring
+ case 21: // lookspring
Cvar_SetValueQuick (&lookspring, !lookspring.integer);
break;
- case 23: // lookstrafe
+ case 22: // lookstrafe
Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
break;
- case 24: // mouse speed
+ case 23: // mouse speed
Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
break;
- case 25: // mouse look
+ case 24: // mouse look
Cvar_SetValueQuick (&freelook, !freelook.integer);
break;
- case 26: // invert mouse
+ case 25: // invert mouse
Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
break;
- case 27: // windowed mouse
+ case 26: // windowed mouse
Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
break;
}
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_ItemPrint(16, y, " Video Options", vid_menudrawfn != NULL);y += 8;
+ M_Print(16, y, " Video Options");y += 8;
M_Print(16, y, " Effects Options");y += 8;
- M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value);y += 8;
- M_Print(16, y, " Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
+ M_Print(16, y, " Color Control Options");y += 8;
+ M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value, 0, 1);y += 8;
+ M_Print(16, y, " Screen size");M_DrawSlider(220, y, scr_viewsize.value, 30, 120);y += 8;
M_Print(16, y, " Sky");M_DrawCheckbox(220, y, r_sky.integer);y += 8;
- M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, (v_overbrightbits.value) / 4);y += 8;
+ M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, v_overbrightbits.value, 0, 4);y += 8;
M_Print(16, y, " Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8;
M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
- M_ItemPrint(16, y, "Hardware Gamma Control", hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
- M_ItemPrint(16, y, " Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
- M_Print(16, y, " Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
- M_Print(16, y, " Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
- M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
- M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
- M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
- M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);y += 8;
+ M_Print(16, y, "Delay refresh (faster)");M_DrawCheckbox(220, y, gl_delayfinish.integer);y += 8;
+ M_ItemPrint(16, y, " Game Speed", sv.active);M_DrawSlider(220, y, slowmo.value, 0, 5);y += 8;
+ M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value, 0, 1);y += 8;
+ M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value, 0, 1);y += 8;
+ M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value, 0, 5);y += 8;
+ M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, crosshair_size.value, 1, 5);y += 8;
M_Print(16, y, " Static Crosshair");M_DrawCheckbox(220, y, crosshair_static.integer);y += 8;
M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);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 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;
Cbuf_AddText ("exec default.cfg\n");
break;
case 3:
- if (vid_menudrawfn)
- M_Menu_Video_f ();
+ M_Menu_Video_f ();
break;
case 4:
M_Menu_Options_Effects_f ();
break;
+ case 5:
+ M_Menu_Options_ColorControl_f ();
+ break;
default:
M_Menu_Options_AdjustSliders (1);
break;
}
}
-#define OPTIONS_EFFECTS_ITEMS 12
+#define OPTIONS_EFFECTS_ITEMS 16
int options_effects_cursor;
extern cvar_t cl_particles;
extern cvar_t cl_explosions;
extern cvar_t cl_stainmaps;
+extern cvar_t r_explosionclip;
+extern cvar_t r_dlightmap;
extern cvar_t r_modellights;
+extern cvar_t r_coronas;
+extern cvar_t gl_flashblend;
extern cvar_t cl_particles_bulletimpacts;
extern cvar_t cl_particles_smoke;
extern cvar_t cl_particles_sparks;
Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
break;
case 1:
- Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+ Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
break;
case 2:
- Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+ Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
break;
case 3:
- Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
+ Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
break;
case 4:
- Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
+ Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
break;
case 5:
- Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+ Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
break;
case 6:
- Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+ Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
break;
case 7:
- Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+ Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
break;
case 8:
- Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+ Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
break;
case 9:
- Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+ Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
break;
case 10:
- Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+ Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
break;
case 11:
+ Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+ break;
+ case 12:
+ Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+ break;
+ case 13:
+ Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+ break;
+ case 14:
+ Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+ break;
+ case 15:
Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
break;
}
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
y = 32;
- M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);y += 8;
+ M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value, 0, 8);y += 8;
+ M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8;
+ M_Print(16, y, " Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8;
+ M_Print(16, y, " Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8;
M_Print(16, y, " Particles");M_DrawCheckbox(220, y, cl_particles.integer);y += 8;
M_Print(16, y, " Explosions");M_DrawCheckbox(220, y, cl_explosions.integer);y += 8;
+ M_Print(16, y, " Explosion Clipping");M_DrawCheckbox(220, y, r_explosionclip.integer);y += 8;
M_Print(16, y, " Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.integer);y += 8;
M_Print(16, y, " Detail Texturing");M_DrawCheckbox(220, y, r_detailtextures.integer);y += 8;
M_Print(16, y, " Bullet Impacts");M_DrawCheckbox(220, y, cl_particles_bulletimpacts.integer);y += 8;
M_Print(16, y, " Sparks");M_DrawCheckbox(220, y, cl_particles_sparks.integer);y += 8;
M_Print(16, y, " Bubbles");M_DrawCheckbox(220, y, cl_particles_bubbles.integer);y += 8;
M_Print(16, y, " Blood");M_DrawCheckbox(220, y, cl_particles_blood.integer);y += 8;
- M_Print(16, y, " Blood Size");M_DrawSlider(220, y, (cl_particles_blood_size.value - 2) / 18);y += 8;
- M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, (cl_particles_blood_alpha.value - 0.2) / 0.8);y += 8;
+ M_Print(16, y, " Blood Size");M_DrawSlider(220, y, cl_particles_blood_size.value, 2, 20);y += 8;
+ M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, cl_particles_blood_alpha.value, 0.2, 1);y += 8;
// cursor
M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1));
}
}
+
+
+
+
+#define OPTIONS_COLORCONTROL_ITEMS 18
+
+int options_colorcontrol_cursor;
+
+// intensity value to match up to 50% dither to 'correct' quake
+cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25"};
+
+void M_Menu_Options_ColorControl_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_options_colorcontrol;
+ m_entersound = true;
+}
+
+
+void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+{
+ float f;
+ S_LocalSound ("misc/menu3.wav");
+
+ switch (options_colorcontrol_cursor)
+ {
+ case 1:
+ Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+ break;
+ case 2:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5));
+ break;
+ case 3:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_contrast, bound(1, v_contrast.value + dir * 0.125, 5));
+ break;
+ case 4:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
+ break;
+ case 5:
+ Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer);
+ break;
+ case 6:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_r, bound(0, v_color_black_r.value + dir * 0.0125, 0.8));
+ break;
+ case 7:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_g, bound(0, v_color_black_g.value + dir * 0.0125, 0.8));
+ break;
+ case 8:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_b, bound(0, v_color_black_b.value + dir * 0.0125, 0.8));
+ break;
+ case 9:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(0, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3 + dir * 0.0125, 0.8);
+ Cvar_SetValueQuick (&v_color_black_r, f);
+ Cvar_SetValueQuick (&v_color_black_g, f);
+ Cvar_SetValueQuick (&v_color_black_b, f);
+ break;
+ case 10:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_r, bound(0, v_color_grey_r.value + dir * 0.0125, 0.95));
+ break;
+ case 11:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_g, bound(0, v_color_grey_g.value + dir * 0.0125, 0.95));
+ break;
+ case 12:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_b, bound(0, v_color_grey_b.value + dir * 0.0125, 0.95));
+ break;
+ case 13:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(0, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3 + dir * 0.0125, 0.95);
+ Cvar_SetValueQuick (&v_color_grey_r, f);
+ Cvar_SetValueQuick (&v_color_grey_g, f);
+ Cvar_SetValueQuick (&v_color_grey_b, f);
+ break;
+ case 14:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_r, bound(1, v_color_white_r.value + dir * 0.125, 5));
+ break;
+ case 15:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_g, bound(1, v_color_white_g.value + dir * 0.125, 5));
+ break;
+ case 16:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_b, bound(1, v_color_white_b.value + dir * 0.125, 5));
+ break;
+ case 17:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(1, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3 + dir * 0.125, 5);
+ Cvar_SetValueQuick (&v_color_white_r, f);
+ Cvar_SetValueQuick (&v_color_white_g, f);
+ Cvar_SetValueQuick (&v_color_white_b, f);
+ break;
+ }
+}
+
+void M_Options_ColorControl_Draw (void)
+{
+ float x, y, c, s, t, u, v;
+ cachepic_t *p;
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
+
+ y = 32;
+ M_Print(16, y, " Reset to defaults");y += 8;
+ M_ItemPrint(16, y, "Hardware Gamma Control", vid_hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
+ M_ItemPrint(16, y, " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_gamma.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " Contrast", !v_color_enable.integer);M_DrawSlider(220, y, v_contrast.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " Brightness", !v_color_enable.integer);M_DrawSlider(220, y, v_brightness.value, 0, 0.8);y += 8;
+ M_Print(16, y, " Color Level Controls");M_DrawCheckbox(220, y, v_color_enable.integer);y += 8;
+ M_ItemPrint(16, y, " Black: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_r.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_g.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_b.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_r.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_g.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_b.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " White: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_r.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_g.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_b.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);y += 8;
+
+ y += 4;
+ DrawQ_Fill(menu_x, menu_y + y, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);y += 4;
+ s = (float) 312 / 2 * vid.realwidth / vid.conwidth;
+ t = (float) 4 / 2 * vid.realheight / vid.conheight;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4;
+
+ c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
+ s = (float) 48 / 2 * vid.realwidth / vid.conwidth;
+ t = (float) 48 / 2 * vid.realheight / vid.conheight;
+ u = s * 0.5;
+ v = t * 0.5;
+ y += 8;
+ x = 4;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, 0, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 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 + y + 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);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, c, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 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 + y + 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);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, 0, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 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 + y + 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);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, c, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 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 + y + 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);
+
+ // cursor
+ M_DrawCharacter(200, 32 + options_colorcontrol_cursor*8, 12+((int)(realtime*4)&1));
+}
+
+
+void M_Options_ColorControl_Key (int k)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ M_Menu_Main_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (options_colorcontrol_cursor)
+ {
+ case 0:
+ Cvar_SetValueQuick(&v_hwgamma, 1);
+ Cvar_SetValueQuick(&v_gamma, 1);
+ Cvar_SetValueQuick(&v_contrast, 1);
+ Cvar_SetValueQuick(&v_brightness, 0);
+ Cvar_SetValueQuick(&v_color_enable, 0);
+ Cvar_SetValueQuick(&v_color_black_r, 0);
+ Cvar_SetValueQuick(&v_color_black_g, 0);
+ Cvar_SetValueQuick(&v_color_black_b, 0);
+ Cvar_SetValueQuick(&v_color_grey_r, 0);
+ Cvar_SetValueQuick(&v_color_grey_g, 0);
+ Cvar_SetValueQuick(&v_color_grey_b, 0);
+ Cvar_SetValueQuick(&v_color_white_r, 1);
+ Cvar_SetValueQuick(&v_color_white_g, 1);
+ Cvar_SetValueQuick(&v_color_white_b, 1);
+ Cbuf_AddText ("exec default.cfg\n");
+ break;
+ default:
+ M_Menu_Options_ColorControl_AdjustSliders (1);
+ break;
+ }
+ return;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor--;
+ if (options_colorcontrol_cursor < 0)
+ options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor++;
+ if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
+ options_colorcontrol_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (1);
+ break;
+ }
+}
+
+
//=============================================================================
/* KEYS MENU */
{
{"+forward", "walk forward"},
{"+back", "backpedal"},
+{"+left", "turn left"},
+{"+right", "turn right"},
{"+moveleft", "step left"},
{"+moveright", "step right"},
{"+jump", "jump / swim up"},
//=============================================================================
/* VIDEO MENU */
+#define VIDEO_ITEMS 5
+
+int video_cursor = 0;
+int video_cursor_table[] = {56, 68, 80, 92, 116};
+// 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;
+extern int current_vid_width;
+extern int current_vid_height;
+extern int current_vid_bitsperpixel;
+extern int current_vid_stencil;
+
+
void M_Menu_Video_f (void)
{
key_dest = key_menu;
m_state = m_video;
m_entersound = true;
+
+ // Look for the current resolution
+ for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++)
+ {
+ if (video_resolutions[video_resolution][0] == current_vid_width &&
+ video_resolutions[video_resolution][1] == current_vid_height)
+ break;
+ }
+
+ // Default to 800x600 if we didn't find it
+ if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+ {
+ // 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]);
+ }
}
void M_Video_Draw (void)
{
- (*vid_menudrawfn) ();
+ cachepic_t *p;
+ const char* string;
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/vidmodes.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
+
+ // 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);
+
+ // 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");
+
+ // Fullscreen
+ M_Print(16, video_cursor_table[2], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
+
+ // Stencil
+ M_Print(16, video_cursor_table[3], " Stencil");
+ M_DrawCheckbox(220, video_cursor_table[3], vid_stencil.integer);
+
+ // "Apply" button
+ M_Print(220, video_cursor_table[4], "Apply");
+
+ // Cursor
+ M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
+}
+
+
+void M_Menu_Video_AdjustSliders (int dir)
+{
+ S_LocalSound ("misc/menu3.wav");
+
+ switch (video_cursor)
+ {
+ // Resolution
+ case 0:
+ {
+ int new_resolution = video_resolution + dir;
+ if (new_resolution < 0)
+ video_resolution = sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1;
+ else if (new_resolution > (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1))
+ video_resolution = 0;
+ else
+ video_resolution = new_resolution;
+
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ break;
+ }
+
+ // Bits per pixel
+ case 1:
+ Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
+ break;
+ case 2:
+ Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
+ break;
+ case 3:
+ Cvar_SetValueQuick (&vid_stencil, !vid_stencil.integer);
+ break;
+ }
}
void M_Video_Key (int key)
{
- (*vid_menukeyfn) (key);
+ switch (key)
+ {
+ case K_ESCAPE:
+ // vid_shared.c has a copy of the current video config. We restore it
+ Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen);
+ Cvar_SetValueQuick(&vid_width, current_vid_width);
+ Cvar_SetValueQuick(&vid_height, current_vid_height);
+ Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
+ Cvar_SetValueQuick(&vid_stencil, current_vid_stencil);
+
+ S_LocalSound ("misc/menu1.wav");
+ M_Menu_Options_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (video_cursor)
+ {
+ case 4:
+ Cbuf_AddText ("vid_restart\n");
+ M_Menu_Options_f ();
+ break;
+ default:
+ M_Menu_Video_AdjustSliders (1);
+ }
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor--;
+ if (video_cursor < 0)
+ video_cursor = VIDEO_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor++;
+ if (video_cursor >= VIDEO_ITEMS)
+ video_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Video_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Video_AdjustSliders (1);
+ break;
+ }
}
//=============================================================================
int m_quit_prevstate;
qboolean wasInMenus;
-char *quitMessage [] =
+char *quitMessage [] =
{
/* .........1.........2.... */
/*
" 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",
case 'Y':
case 'y':
- key_dest = key_console;
Host_Quit_f ();
break;
/* LAN CONFIG MENU */
int lanConfig_cursor = -1;
-int lanConfig_cursor_table [] = {72, 92, 124};
-#define NUM_LANCONFIG_CMDS 3
+int lanConfig_cursor_table [] = {72, 92, 112, 144};
+#define NUM_LANCONFIG_CMDS 4
int lanConfig_port;
char lanConfig_portname[6];
if (JoiningGame)
{
M_Print (basex, lanConfig_cursor_table[1], "Search for local games...");
- M_Print (basex, 108, "Join game at:");
- M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1);
- M_Print (basex+16, lanConfig_cursor_table[2], lanConfig_joinname);
+ M_Print (basex, lanConfig_cursor_table[2], "Search for internet games...");
+ M_Print (basex, 128, "Join game at:");
+ M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
+ M_Print (basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
}
else
{
if (lanConfig_cursor == 0)
M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1));
- if (lanConfig_cursor == 2)
- M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
+ if (lanConfig_cursor == 3)
+ M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [3], 10+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (basex, 148, m_return_reason);
+ M_PrintWhite (basex, 168, m_return_reason);
}
M_ConfigureNetSubsystem ();
- if (lanConfig_cursor == 1)
+ if (lanConfig_cursor == 1 || lanConfig_cursor == 2)
{
if (StartingGame)
{
M_Menu_GameOptions_f ();
break;
}
- M_Menu_Search_f();
+ if (lanConfig_cursor == 1)
+ M_Menu_Search_f();
+ else
+ M_Menu_InetSearch_f();
break;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
m_return_state = m_state;
m_return_onerror = true;
lanConfig_portname[strlen(lanConfig_portname)-1] = 0;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
if (strlen(lanConfig_joinname))
lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0;
if (key < 32 || key > 127)
break;
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
l = strlen(lanConfig_joinname);
if (l < 21)
}
}
- if (StartingGame && lanConfig_cursor == 2)
+ if (StartingGame && lanConfig_cursor == 3)
{
if (key == K_UPARROW)
lanConfig_cursor = 1;
{"bb3", "Bodies"},
{"bb4", "The Tower"},
{"bb5", "Click!"},
+ {"bb6", "Twin Fortress"},
{"bb7", "Midgard"},
{"bb8", "Fun With Heads"},
+
{"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"},
{"crypt", "The Crypt"},
{"bb3_2k1", "Bodies Infusion"},
+ {"dcamp", "DeathCamp"},
+ {"highnoon", "HighNoon"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
- {"ded_simp", "Dead Simple"},
+
{"dranzbb6", "Black Coffee"},
- {"qe1m7", "The House of Chthon"}
+ {"fragm", "Frag'M"},
+ {"maim", "Maim"},
+ {"qe1m7", "The House of Chthon"},
+ {"simple", "Dead Simple"}
};
episode_t transfusionepisodes[] =
{
- {"Blood", 0, 9},
- {"Plasma Pack", 9, 4},
- {"Cryptic Passage", 13, 2},
- {"Blood 2", 15, 5},
- {"Custom", 20, 7}
+ {"Blood", 0, 8},
+ {"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};
gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 5};
+gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
typedef struct
{
qboolean m_serverInfoMessage = false;
double m_serverInfoMessageTime;
+extern cvar_t sv_public;
+
void M_Menu_GameOptions_f (void)
{
key_dest = key_menu;
if (maxplayers == 0)
maxplayers = svs.maxclients;
if (maxplayers < 2)
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
}
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 112, 120};
-#define NUM_GAMEOPTIONS 9
+int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 120, 128};
+#define NUM_GAMEOPTIONS 10
int gameoptions_cursor;
void M_GameOptions_Draw (void)
else
M_Print (160, 96, va("%i minutes", timelimit.integer));
+ M_Print (0, 104, " Public server");
+ M_Print (160, 104, (sv_public.integer == 0) ? "no" : "yes");
+
g = lookupgameinfo();
- M_Print (0, 112, " Episode");
- M_Print (160, 112, g->episodes[startepisode].description);
+ M_Print (0, 120, " Episode");
+ M_Print (160, 120, g->episodes[startepisode].description);
- M_Print (0, 120, " Level");
- M_Print (160, 120, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+ M_Print (0, 128, " Level");
+ M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 136, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
// line cursor
M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
M_Print (x, 146, " More than 64 players?? ");
M_Print (x, 154, " First, question your ");
M_Print (x, 162, " sanity, then email ");
- M_Print (x, 170, " havoc@gamevisions.com ");
+ M_Print (x, 170, " havoc@telefragged.com ");
}
else
{
{
case 1:
maxplayers += dir;
- if (maxplayers > svs.maxclientslimit)
+ if (maxplayers > MAX_SCOREBOARD)
{
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
m_serverInfoMessage = true;
m_serverInfoMessageTime = realtime;
}
break;
case 7:
+ Cvar_SetValueQuick (&sv_public, !sv_public.integer);
+ break;
+
+ case 8:
startepisode += dir;
g = lookupgameinfo();
startlevel = 0;
break;
- case 8:
+ case 9:
startlevel += dir;
g = lookupgameinfo();
void M_Search_Draw (void)
{
+ const char* string;
cachepic_t *p;
int x;
return;
}
- M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found");
+ if (gamemode == GAME_TRANSFUSION)
+ string = "No Transfusion servers found";
+ else
+ string = "No Quake servers found";
+ M_PrintWhite ((320/2) - ((22*8)/2), 64, string);
if ((realtime - searchCompleteTime) < 3.0)
return;
{
}
+//=============================================================================
+/* INTERNET SEARCH MENU */
+
+void M_Menu_InetSearch_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_search;
+ m_entersound = false;
+ slistSilent = true;
+ slistLocal = false;
+ searchComplete = false;
+ NET_InetSlist_f();
+
+}
+
+
+void M_InetSearch_Draw (void)
+{
+ M_Search_Draw (); // it's the same one, so why bother?
+}
+
+
+void M_InetSearch_Key (int key)
+{
+}
+
//=============================================================================
/* SLIST MENU */
M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (16, 148, m_return_reason);
+ M_PrintWhite (16, 168, m_return_reason);
}
Cmd_AddCommand ("menu_setup", M_Menu_Setup_f);
Cmd_AddCommand ("menu_options", M_Menu_Options_f);
Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
+ Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
+ Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddCommand ("menu_video", M_Menu_Video_f);
Cmd_AddCommand ("help", M_Menu_Help_f);
M_Options_Effects_Draw ();
break;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Draw ();
+ break;
+
case m_keys:
M_Keys_Draw ();
break;
M_Options_Effects_Key (key);
return;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Key (key);
+ return;
+
case m_keys:
M_Keys_Key (key);
return;
projects / xonotic / darkplaces.git / blobdiff