From 47fc62ccd142d0f2cbb9acd05d96b209811fad82 Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 1 Sep 2004 07:02:44 +0000 Subject: [PATCH] GAME_NETHERWORLD patch: a bunch of cvars and some menu changes git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4414 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ menu.c | 32 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/cl_main.c b/cl_main.c index 21b125cb..b1d9342e 100644 --- a/cl_main.c +++ b/cl_main.c @@ -1234,6 +1234,32 @@ static void CL_Fog_f (void) CL_Init ================= */ +//VorteX: cvars for GAME_NETHERWORLD +cvar_t cl_playermodel = {CVAR_SAVE, "cl_playermodel", "ranger"}; +cvar_t cl_footsteps = {CVAR_SAVE, "cl_footsteps", "1"}; +cvar_t cl_weapon_ofs = {CVAR_SAVE, "cl_weapon_ofs", "0 0 0"}; +cvar_t cl_weapon_bstep = {CVAR_SAVE, "cl_weapon_bstep", "100 0 0"}; +cvar_t cl_weapon_bborder = {CVAR_SAVE, "cl_weapon_bborder", "2 0 0"}; +cvar_t cl_weapon_bphase = {CVAR_SAVE, "cl_weapon_bphase", "0 0 0"}; +cvar_t cl_weapon_bphasescale = {CVAR_SAVE, "cl_weapon_bphasescale", "1 1 1"}; +cvar_t cl_weapon_bphasescissor = {CVAR_SAVE, "cl_weapon_bphasescissor", "-1 -1 -1 1 1 1"}; +cvar_t cl_deathcam = {CVAR_SAVE, "cl_deathcam", "0"}; +cvar_t cl_askonresave = {CVAR_SAVE, "cl_askonresave", "1"}; //Asking on saving to full saveslot in savegame menu +cvar_t sv_corpses_solid = {CVAR_SAVE, "sv_corpses_solid", "1"}; +cvar_t sv_corpses_removetime = {CVAR_SAVE, "sv_corpses_removetime", "0"}; +cvar_t sv_monsters_healthscale = {CVAR_SAVE, "sv_monsters_healthscale", "1"}; +cvar_t sv_monsters_damagescale = {CVAR_SAVE, "sv_monsters_damagescale", "1"}; +cvar_t sv_monsters_multiply = {CVAR_SAVE, "sv_monsters_multiply", "1"}; +cvar_t sv_monsters_randomize = {CVAR_SAVE, "sv_monsters_randomize", "0"}; +cvar_t sv_monsters_multiply_radius = {CVAR_SAVE, "sv_monsters_multiply_radius", "5"}; +cvar_t sv_monsters_ai_skillmod = {CVAR_SAVE, "sv_monsters_ai_skillmod", "1"}; +cvar_t sv_monsters_ai_agrmod = {CVAR_SAVE, "sv_monsters_ai_agrmod", "1"}; +cvar_t sv_monsters_ai_dexmod = {CVAR_SAVE, "sv_monsters_ai_dexmod", "1"}; +cvar_t sv_monsters_deathmatch = {CVAR_SAVE, "sv_monsters_deathmatch", "0"}; +cvar_t sv_monsters_deathmatch_maxnum = {CVAR_SAVE, "sv_monsters_deathmatch_maxnum", "20"}; +cvar_t sv_monsters_deathmatch_spawntime = {CVAR_SAVE, "sv_monsters_deathmatch_spawntime", "5"}; +cvar_t sv_monsters_deathmatch_fragpermonster = {CVAR_SAVE, "sv_monsters_deathmatch_fragpermonster", "0"}; + void CL_Init (void) { cl_entities_mempool = Mem_AllocPool("client entities", 0, NULL); @@ -1303,6 +1329,34 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_beams_lightatend); Cvar_RegisterVariable(&cl_noplayershadow); + if (gamemode == GAME_NETHERWORLD) + { + Cvar_RegisterVariable (&cl_playermodel); + Cvar_RegisterVariable (&cl_footsteps); + Cvar_RegisterVariable (&cl_weapon_ofs); + Cvar_RegisterVariable (&cl_weapon_bstep); + Cvar_RegisterVariable (&cl_weapon_bborder); + Cvar_RegisterVariable (&cl_weapon_bphase); + Cvar_RegisterVariable (&cl_weapon_bphasescale); + Cvar_RegisterVariable (&cl_weapon_bphasescissor); + Cvar_RegisterVariable (&cl_deathcam); //Hack for q3-style death + Cvar_RegisterVariable (&cl_askonresave); //Every time ask if saving to "full" saveslot + //This must be server-side cvars, after complete finishing of subsystems whitch uses this, they must be moved to server-side + Cvar_RegisterVariable (&sv_monsters_healthscale); + Cvar_RegisterVariable (&sv_monsters_damagescale); + Cvar_RegisterVariable (&sv_monsters_randomize); + Cvar_RegisterVariable (&sv_monsters_multiply); + Cvar_RegisterVariable (&sv_monsters_multiply_radius); + Cvar_RegisterVariable (&sv_monsters_ai_skillmod); + Cvar_RegisterVariable (&sv_monsters_ai_agrmod); + Cvar_RegisterVariable (&sv_monsters_ai_dexmod); + Cvar_RegisterVariable (&sv_monsters_deathmatch); //Keeping RPG mod + Cvar_RegisterVariable (&sv_monsters_deathmatch_maxnum); + Cvar_RegisterVariable (&sv_monsters_deathmatch_spawntime); + Cvar_RegisterVariable (&sv_monsters_deathmatch_fragpermonster); + Cvar_RegisterVariable (&sv_corpses_solid); + } + CL_Parse_Init(); CL_Particles_Init(); CL_Screen_Init(); @@ -1311,3 +1365,5 @@ void CL_Init (void) CL_Video_Init(); } + + diff --git a/menu.c b/menu.c index e2d322a8..be01dc1d 100644 --- a/menu.c +++ b/menu.c @@ -362,6 +362,8 @@ void M_Menu_Main_f (void) else MAIN_ITEMS = 6; } + else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item + MAIN_ITEMS = 6; else MAIN_ITEMS = 5; @@ -521,6 +523,34 @@ void M_Main_Key (int key, char ascii) break; } } + else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item + { + switch (m_main_cursor) + { + case 0: + M_Menu_SinglePlayer_f (); + break; + + case 1: + M_Menu_MultiPlayer_f (); + break; + + case 2: + M_Menu_Options_f (); + break; + + case 3: + M_Menu_Help_f (); + break; + + case 4: + M_Menu_Quit_f (); + break; + case 5: + MR_Restart(); + break; + } + } else { switch (m_main_cursor) @@ -4223,6 +4253,8 @@ void MR_Init() { // set router console commands Cvar_RegisterVariable (&forceqmenu); + if (gamemode == GAME_NETHERWORLD) + Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu Cmd_AddCommand ("menu_restart",MR_Restart); Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f); -- 2.39.2