void M_GameOptions_Draw (void);
void M_ServerList_Draw (void);
-void M_Main_Key (int key);
- void M_SinglePlayer_Key (int key);
- void M_Load_Key (int key);
- void M_Save_Key (int key);
- void M_MultiPlayer_Key (int key);
- void M_Setup_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_Quit_Key (int key);
-void M_LanConfig_Key (int key);
-void M_GameOptions_Key (int key);
-void M_ServerList_Key (int key);
+void M_Main_Key (int key, char ascii);
+ void M_SinglePlayer_Key (int key, char ascii);
+ void M_Load_Key (int key, char ascii);
+ void M_Save_Key (int key, char ascii);
+ void M_MultiPlayer_Key (int key, char ascii);
+ void M_Setup_Key (int key, char ascii);
+ void M_Options_Key (int key, char ascii);
+ void M_Options_Effects_Key (int key, char ascii);
+ void M_Options_ColorControl_Key (int key, char ascii);
+ void M_Keys_Key (int key, char ascii);
+ void M_Video_Key (int key, char ascii);
+ void M_Help_Key (int key, char ascii);
+ void M_Quit_Key (int key, char ascii);
+void M_LanConfig_Key (int key, char ascii);
+void M_GameOptions_Key (int key, char ascii);
+void M_ServerList_Key (int key, char ascii);
qboolean m_entersound; // play after drawing a frame, so caching
// won't disrupt the sound
m_entersound = true;
}
-void M_Demo_Key (int k)
+void M_Demo_Key (int k, char ascii)
{
switch (k)
{
}
-void M_Main_Key (int key)
+void M_Main_Key (int key, char ascii)
{
switch (key)
{
}
-void M_SinglePlayer_Key (int key)
+void M_SinglePlayer_Key (int key, char ascii)
{
if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
}
-void M_Load_Key (int k)
+void M_Load_Key (int k, char ascii)
{
switch (k)
{
}
-void M_Save_Key (int k)
+void M_Save_Key (int k, char ascii)
{
switch (k)
{
}
-void M_MultiPlayer_Key (int key)
+void M_MultiPlayer_Key (int key, char ascii)
{
switch (key)
{
}
-void M_Setup_Key (int k)
+void M_Setup_Key (int k, char ascii)
{
int l;
break;
default:
- if (k < 32 || k > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (setup_cursor == 0)
{
if (l < 15)
{
setup_myname[l+1] = 0;
- setup_myname[l] = k;
+ setup_myname[l] = ascii;
}
}
}
}
-#define OPTIONS_ITEMS 32
+#define OPTIONS_ITEMS 33
int options_cursor;
extern cvar_t gl_delayfinish;
extern cvar_t slowmo;
extern dllhandle_t jpeg_dll;
+extern cvar_t gl_texture_anisotropy;
void M_Menu_Options_AdjustSliders (int dir)
{
Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
else if (options_cursor == optnum++)
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
}
opty += 8;
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
M_DrawCheckbox(0 + strlen(s) * 8 + 8, opty, yes);
}
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
M_DrawSlider(0 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
}
M_Options_PrintCheckbox(" Texture Combine", true, gl_combine.integer);
M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer);
M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
+ M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 0, 8);
M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5);
M_Options_PrintSlider( " CD Music Volume", cdaudioinitialized, bgmvolume.value, 0, 1);
M_Options_PrintSlider( " Sound Volume", snd_initialized, volume.value, 0, 1);
}
-void M_Options_Key (int k)
+void M_Options_Key (int k, char ascii)
{
switch (k)
{
}
-void M_Options_Effects_Key (int k)
+void M_Options_Effects_Key (int k, char ascii)
{
switch (k)
{
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8;
M_Options_PrintCommand( " Reset to defaults", true);
- M_Options_PrintCheckbox("Hardware Gamma Control", vid_hardwaregammasupported, v_hwgamma.integer);
- M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_gamma.value, 1, 5);
+ M_Options_PrintCheckbox("Hardware Gamma Control", vid_hardwaregammasupported.integer, v_hwgamma.integer);
+ M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_gamma.value, 1, 5);
M_Options_PrintSlider( " Contrast", !v_color_enable.integer, v_contrast.value, 1, 5);
M_Options_PrintSlider( " Brightness", !v_color_enable.integer, v_brightness.value, 0, 0.8);
M_Options_PrintCheckbox(" Color Level Controls", true, v_color_enable.integer);
M_Options_PrintSlider( " Black: Green", v_color_enable.integer, v_color_black_g.value, 0, 0.8);
M_Options_PrintSlider( " Black: Blue ", v_color_enable.integer, v_color_black_b.value, 0, 0.8);
M_Options_PrintSlider( " Black: Grey ", v_color_enable.integer, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);
- M_Options_PrintSlider( " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);
+ M_Options_PrintSlider( " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95);
+ M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95);
+ M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95);
+ M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);
M_Options_PrintSlider( " White: Red ", v_color_enable.integer, v_color_white_r.value, 1, 5);
M_Options_PrintSlider( " White: Green", v_color_enable.integer, v_color_white_g.value, 1, 5);
M_Options_PrintSlider( " White: Blue ", v_color_enable.integer, v_color_white_b.value, 1, 5);
}
-void M_Options_ColorControl_Key (int k)
+void M_Options_ColorControl_Key (int k, char ascii)
{
switch (k)
{
case K_ESCAPE:
- M_Menu_Main_f ();
+ M_Menu_Options_f ();
break;
case K_ENTER:
}
-void M_Keys_Key (int k)
+void M_Keys_Key (int k, char ascii)
{
char cmd[80];
int keys[NUMKEYS];
int video_cursor_table[] = {56, 68, 80, 100};
// 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}};
+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}};
+#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
int video_resolution;
extern int current_vid_fullscreen;
m_entersound = true;
// Look for the current resolution
- for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++)
+ for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++)
{
if (video_resolutions[video_resolution][0] == current_vid_width &&
video_resolutions[video_resolution][1] == current_vid_height)
}
// Default to 800x600 if we didn't find it
- if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+ if (video_resolution == VID_RES_COUNT)
{
// may need to update this number if mode list changes
video_resolution = 4;
{
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 = VID_RES_COUNT - 1;
+ else if (new_resolution > VID_RES_COUNT)
video_resolution = 0;
else
video_resolution = new_resolution;
}
-void M_Video_Key (int key)
+void M_Video_Key (int key, char ascii)
{
switch (key)
{
m_entersound = true;
switch (video_cursor)
{
- case 4:
+ case 3:
Cbuf_AddText ("vid_restart\n");
M_Menu_Options_f ();
break;
}
-void M_Help_Key (int key)
+void M_Help_Key (int key, char ascii)
{
switch (key)
{
}
-void M_Quit_Key (int key)
+void M_Quit_Key (int key, char ascii)
{
switch (key)
{
}
-void M_LanConfig_Key (int key)
+void M_LanConfig_Key (int key, char ascii)
{
int l;
break;
default:
- if (key < 32 || key > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (lanConfig_cursor == 2)
if (l < 21)
{
lanConfig_joinname[l+1] = 0;
- lanConfig_joinname[l] = key;
+ lanConfig_joinname[l] = ascii;
}
}
- if (key < '0' || key > '9')
+ if (ascii < '0' || ascii > '9')
break;
if (lanConfig_cursor == 0)
{
if (l < 5)
{
lanConfig_portname[l+1] = 0;
- lanConfig_portname[l] = key;
+ lanConfig_portname[l] = ascii;
}
}
}
}
}
-void M_GameOptions_Key (int key)
+void M_GameOptions_Key (int key, char ascii)
{
gamelevels_t *g;
int l;
break;
default:
- if (key < 32 || key > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (gameoptions_cursor == 8)
{
if (l < 37)
{
memcpy(hostnamebuf, hostname.string, l);
- hostnamebuf[l] = key;
+ hostnamebuf[l] = ascii;
hostnamebuf[l+1] = 0;
Cvar_Set("hostname", hostnamebuf);
}
}
-void M_ServerList_Key(int k)
+void M_ServerList_Key(int k, char ascii)
{
switch (k)
{
//=============================================================================
/* Menu Subsystem */
-void M_Keydown(int key);
+void M_Keydown(int key, char ascii);
void M_Draw(void);
void M_ToggleMenu_f(void);
void M_Shutdown(void);
void M_Init (void)
{
- // set menu router function pointer
- MR_Keydown = M_Keydown;
- MR_Draw = M_Draw;
- MR_ToggleMenu_f = M_ToggleMenu_f;
- MR_Shutdown = M_Shutdown;
-
- // init
menu_mempool = Mem_AllocPool("Menu");
menuplyr_load = true;
menuplyr_pixels = NULL;
}
-void M_Keydown (int key)
+void M_Keydown (int key, char ascii)
{
switch (m_state)
{
return;
case m_main:
- M_Main_Key (key);
+ M_Main_Key (key, ascii);
return;
case m_demo:
- M_Demo_Key (key);
+ M_Demo_Key (key, ascii);
return;
case m_singleplayer:
- M_SinglePlayer_Key (key);
+ M_SinglePlayer_Key (key, ascii);
return;
case m_load:
- M_Load_Key (key);
+ M_Load_Key (key, ascii);
return;
case m_save:
- M_Save_Key (key);
+ M_Save_Key (key, ascii);
return;
case m_multiplayer:
- M_MultiPlayer_Key (key);
+ M_MultiPlayer_Key (key, ascii);
return;
case m_setup:
- M_Setup_Key (key);
+ M_Setup_Key (key, ascii);
return;
case m_options:
- M_Options_Key (key);
+ M_Options_Key (key, ascii);
return;
case m_options_effects:
- M_Options_Effects_Key (key);
+ M_Options_Effects_Key (key, ascii);
return;
case m_options_colorcontrol:
- M_Options_ColorControl_Key (key);
+ M_Options_ColorControl_Key (key, ascii);
return;
case m_keys:
- M_Keys_Key (key);
+ M_Keys_Key (key, ascii);
return;
case m_video:
- M_Video_Key (key);
+ M_Video_Key (key, ascii);
return;
case m_help:
- M_Help_Key (key);
+ M_Help_Key (key, ascii);
return;
case m_quit:
- M_Quit_Key (key);
+ M_Quit_Key (key, ascii);
return;
case m_lanconfig:
- M_LanConfig_Key (key);
+ M_LanConfig_Key (key, ascii);
return;
case m_gameoptions:
- M_GameOptions_Key (key);
+ M_GameOptions_Key (key, ascii);
return;
case m_slist:
- M_ServerList_Key (key);
+ M_ServerList_Key (key, ascii);
return;
}
}
void M_Shutdown(void)
+{
+ // reset key_dest
+ key_dest = key_game;
+}
+
+void M_Restart(void)
{
}
static func_t m_draw,m_keydown;
+void MR_SetRouting (qboolean forceold);
+
void MP_Error(void)
{
// fall back to the normal menu
// say it
- Con_Printf("Falling back to normal menu.\n Error :");
-
+ Con_Printf("Falling back to normal menu\n");
+
+ key_dest = key_game;
+
+ //PRVM_ResetProg();
+
// init the normal menu now -> this will also correct the menu router pointers
- M_Init();
+ MR_SetRouting (TRUE);
}
-void MP_Keydown (int key)
+void MP_Keydown (int key, char ascii)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ // set time
+ *prog->time = realtime;
+
// pass key
prog->globals[OFS_PARM0] = (float) key;
- PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key) required\n");
+ prog->globals[OFS_PARM1] = (float) ascii;
+ PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
PRVM_End;
}
+
void MP_Draw (void)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
-
+
+ // set time
+ *prog->time = realtime;
+
PRVM_ExecuteProgram(m_draw,"");
PRVM_End;
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ // set time
+ *prog->time = realtime;
+
PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
PRVM_End;
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ // set time
+ *prog->time = realtime;
+
PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),"");
// reset key_dest
key_dest = key_game;
// AK not using this cause Im not sure whether this is useful at all instead :
-/* // free mempools
- Mem_FreePool(prog->edicts_mempool);
- Mem_FreePool(prog->edictstring_mempool);
- Mem_FreePool(prog->progs_mempool);*/
PRVM_ResetProg();
PRVM_End;
void MP_Init (void)
{
- MR_Keydown = MP_Keydown;
- MR_Draw = MP_Draw;
- MR_ToggleMenu_f = MP_ToggleMenu_f;
- MR_Shutdown = MP_Shutdown;
-
PRVM_Begin;
PRVM_InitProg(PRVM_MENUPROG);
-
+
prog->crc = M_PROGHEADER_CRC;
prog->edictprivate_size = 0; // no private struct used
prog->name = M_NAME;
prog->init_cmd = VM_M_Cmd_Init;
prog->reset_cmd = VM_M_Cmd_Reset;
prog->error_cmd = MP_Error;
-
+
// allocate the mempools
prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool");
prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool");
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME);
-
+
PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
// set m_draw and m_keydown
m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
-
+
+ // set time
+ *prog->time = realtime;
+
// call the prog init
PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
-
+
PRVM_End;
}
+void MP_Restart(void)
+{
+
+ MP_Init();
+}
+
//============================================================================
// Menu router
static cvar_t forceqmenu = { 0, "forceqmenu", "0" };
-void MR_ChooseInit(void)
+void MR_SetRouting(qboolean forceold)
{
- if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer)
- M_Init();
+ static qboolean m_init = FALSE, mp_init = FALSE;
+
+ // if the menu prog isnt available or forceqmenu ist set, use the old menu
+ if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold)
+ {
+ // set menu router function pointers
+ MR_Keydown = M_Keydown;
+ MR_Draw = M_Draw;
+ MR_ToggleMenu_f = M_ToggleMenu_f;
+ MR_Shutdown = M_Shutdown;
+
+ // init
+ if(!m_init)
+ {
+ M_Init();
+ m_init = TRUE;
+ }
+ else
+ M_Restart();
+ }
else
- MP_Init();
+ {
+ // set menu router function pointers
+ MR_Keydown = MP_Keydown;
+ MR_Draw = MP_Draw;
+ MR_ToggleMenu_f = MP_ToggleMenu_f;
+ MR_Shutdown = MP_Shutdown;
+
+ if(!mp_init)
+ {
+ MP_Init();
+ mp_init = TRUE;
+ }
+ else
+ MP_Restart();
+ }
}
-void MR_Restart_f(void)
+void MR_Restart(void)
{
MR_Shutdown ();
- MR_ChooseInit ();
+ MR_SetRouting (FALSE);
}
void MR_Init()
{
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
- Cmd_AddCommand ("menu_restart",MR_Restart_f);
-
- MR_ChooseInit ();
+ Cmd_AddCommand ("menu_restart",MR_Restart);
+
+ // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
+ if(COM_CheckParm("-forceqmenu"))
+ Cvar_SetValueQuick(&forceqmenu,1);
+ // use -useqmenu for debugging proposes, cause it starts
+ // the normal quake menu only the first time
+ else if(COM_CheckParm("-useqmenu"))
+ MR_SetRouting (TRUE);
+ else
+ MR_SetRouting (FALSE);
}
projects / xonotic / darkplaces.git / blobdiff