converted portal building over to use polygon functions instead of winding

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 8ab9bf730417ba593fea2b66cbf8085fdfdaee2c..75e5d57c5493dbf3547d341365794de7a42a8373 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -46,7 +46,6 @@ cvar_t freelook = {CVAR_SAVE, "freelook", "1"};
 
 cvar_t r_draweffects = {0, "r_draweffects", "1"};
 
-cvar_t cl_explosions = {CVAR_SAVE, "cl_explosions", "1"};
 cvar_t cl_explosions_alpha_start = {CVAR_SAVE, "cl_explosions_alpha_start", "1.5"};
 cvar_t cl_explosions_alpha_end = {CVAR_SAVE, "cl_explosions_alpha_end", "0"};
 cvar_t cl_explosions_size_start = {CVAR_SAVE, "cl_explosions_size_start", "16"};
@@ -109,6 +108,8 @@ void CL_ClearState(void)
 
 // wipe the entire cl structure
        memset (&cl, 0, sizeof(cl));
+       // reset the view zoom interpolation
+       cl.viewzoomold = cl.viewzoomnew = 1;
 
        SZ_Clear (&cls.message);
 
@@ -1234,10 +1235,36 @@ 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");
-       cl_refdef_mempool = Mem_AllocPool("refdef");
+       cl_entities_mempool = Mem_AllocPool("client entities", 0, NULL);
+       cl_refdef_mempool = Mem_AllocPool("refdef", 0, NULL);
 
        memset(&r_refdef, 0, sizeof(r_refdef));
        // max entities sent to renderer per frame
@@ -1291,7 +1318,6 @@ void CL_Init (void)
        Cmd_AddCommand ("pausedemo", CL_PauseDemo_f);
 
        Cvar_RegisterVariable(&r_draweffects);
-       Cvar_RegisterVariable(&cl_explosions);
        Cvar_RegisterVariable(&cl_explosions_alpha_start);
        Cvar_RegisterVariable(&cl_explosions_alpha_end);
        Cvar_RegisterVariable(&cl_explosions_size_start);
@@ -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();
 }
 
+
+