Added sv_maxairspeed cvar (default 30). This was already mirrored by cl_movement_max...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5638 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/server.h b/server.h
index c6ec424e14f83f91376b5f9d6c971aca8926180d..3cf0fcf293150abc97754cee1487e0807d3cdb13 100644 (file)
--- a/server.h
+++ b/server.h
@@ -254,6 +254,7 @@ extern cvar_t sv_friction;
 extern cvar_t sv_edgefriction;
 extern cvar_t sv_stopspeed;
 extern cvar_t sv_maxspeed;
 extern cvar_t sv_edgefriction;
 extern cvar_t sv_stopspeed;
 extern cvar_t sv_maxspeed;

+extern cvar_t sv_maxairspeed;

 extern cvar_t sv_accelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
 extern cvar_t sv_accelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;

diff --git a/sv_main.c b/sv_main.c
index 0f798ad88f3ebf45539420fb21aea1bd713ab257..8266a28e94709c173ee46b7ea97913abb4b5f72c 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -72,6 +72,7 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_edgefriction);
        Cvar_RegisterVariable (&sv_stopspeed);
        Cvar_RegisterVariable (&sv_maxspeed);
        Cvar_RegisterVariable (&sv_edgefriction);
        Cvar_RegisterVariable (&sv_stopspeed);
        Cvar_RegisterVariable (&sv_maxspeed);

+       Cvar_RegisterVariable (&sv_maxairspeed);

        Cvar_RegisterVariable (&sv_accelerate);
        Cvar_RegisterVariable (&sv_idealpitchscale);
        Cvar_RegisterVariable (&sv_aim);
        Cvar_RegisterVariable (&sv_accelerate);
        Cvar_RegisterVariable (&sv_idealpitchscale);
        Cvar_RegisterVariable (&sv_aim);

diff --git a/sv_user.c b/sv_user.c
index f251a8bc0c4db2c7ac019596679eccb98a69fb92..8f85c2f543fb18ef576a6052ea9f5f3e6cbe7f9f 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -25,6 +25,7 @@ cvar_t sv_edgefriction = {0, "edgefriction", "2"};
 cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"};
 cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"};
 cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"};
 cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"};
 cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"};
 cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"};

+cvar_t sv_maxairspeed = {0, "sv_maxairspeed", "30"};

 cvar_t sv_accelerate = {0, "sv_accelerate", "10"};
 
 static usercmd_t cmd;
 cvar_t sv_accelerate = {0, "sv_accelerate", "10"};
 
 static usercmd_t cmd;


@@ -176,8 +177,8 @@ void SV_AirAccelerate (vec3_t wishveloc)
        float addspeed, wishspd, accelspeed, currentspeed;
 
        wishspd = VectorNormalizeLength (wishveloc);
        float addspeed, wishspd, accelspeed, currentspeed;
 
        wishspd = VectorNormalizeLength (wishveloc);

-       if (wishspd > 30)
-               wishspd = 30;
+       if (wishspd > sv_maxairspeed.value)
+               wishspd = sv_maxairspeed.value;

        currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishveloc);
        addspeed = wishspd - currentspeed;
        if (addspeed <= 0)
        currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishveloc);
        addspeed = wishspd - currentspeed;
        if (addspeed <= 0)

diff --git a/todo b/todo
index a28dbebcbf63a0d5520da2aa7583c4a2f329a1d2..5c3348e2140f2bd26ca499866f9967bbb7996c00 100644 (file)
--- a/todo
+++ b/todo
@@ -11,6 +11,7 @@ d feature darkplaces client: v_deathtilt cvar (Sajt, MauveBib)
 -d (Spike) bug darkplaces console: inserting characters in the commandline is not adding a nul terminator to the commandline, resulting in lots of trash from older commandlines suddenly showing up (Spike)
 -d (Spike) feature darkplaces server: add filename/line number reporting to progs stack and opcode printouts (Spike)
 -d (Toddd) bug darkplaces client: fix gl_flashblend, it's still drawing rtdlights even when gl_flashblend is on (Toddd)
 -d (Spike) bug darkplaces console: inserting characters in the commandline is not adding a nul terminator to the commandline, resulting in lots of trash from older commandlines suddenly showing up (Spike)
 -d (Spike) feature darkplaces server: add filename/line number reporting to progs stack and opcode printouts (Spike)
 -d (Toddd) bug darkplaces client: fix gl_flashblend, it's still drawing rtdlights even when gl_flashblend is on (Toddd)

+-d (Vermeulen) feature darkplaces playerphysics: add sv_maxairspeed cvar and use it in sv_user.c, default 30 to match quake player physics (Vermeulen)

 -d (Vermeulen, suminigashi, Willis) bug darkplaces server: local server is not being killed when you join another server (Vermeulen, suminigashi, Willis)
 -d (VorteX) feature darkplaces protocol: allow sending of additional precaches during game, this needs to send a reliable message to all connected clients stating the new filename to load, and also to be sent to new connections (VorteX, Vermeulen)
 -d (flum) bug darkplaces client: corona on your own muzzleflash is annoying when looking down because it can be seen, disable corona on all muzzleflashes (flum)
 -d (Vermeulen, suminigashi, Willis) bug darkplaces server: local server is not being killed when you join another server (Vermeulen, suminigashi, Willis)
 -d (VorteX) feature darkplaces protocol: allow sending of additional precaches during game, this needs to send a reliable message to all connected clients stating the new filename to load, and also to be sent to new connections (VorteX, Vermeulen)
 -d (flum) bug darkplaces client: corona on your own muzzleflash is annoying when looking down because it can be seen, disable corona on all muzzleflashes (flum)


@@ -135,7 +136,6 @@ d feature darkplaces client: v_deathtilt cvar (Sajt, MauveBib)
 0 feature darkplaces model: add model_exportobj console command to allow exporting a specified model as .obj (Randy)
 0 feature darkplaces networking: add "packet serverip:port command" command to send out of band packets, and hexdump the replies (Spike)
 0 feature darkplaces particles: add a vertical splash effect to raindrop splashes, not just the ring (Stribbs)
 0 feature darkplaces model: add model_exportobj console command to allow exporting a specified model as .obj (Randy)
 0 feature darkplaces networking: add "packet serverip:port command" command to send out of band packets, and hexdump the replies (Spike)
 0 feature darkplaces particles: add a vertical splash effect to raindrop splashes, not just the ring (Stribbs)

-0 feature darkplaces playerphysics: add sv_maxairspeed cvar and use it in sv_user.c, default 30 to match quake player physics (Vermeulen)

 0 feature darkplaces protocol: add DP_GFX_QUAKE3MODELTAGS_ATTACHMENTTYPE extension to allow attachments to affect only origin or only orientation, and enable/disable client camera turning while attached (Urre)
 0 feature darkplaces protocol: add DP_SENSITIVITYSCALE extension which scales sensitivity on client like viewzoom does, but without affecting fov, note if this is non-zero it overrides viewzoom sensitivity entirely, it does not scale it (Urre)
 0 feature darkplaces protocol: add DP_TE_BUBBLES to make a burst of bubbles underwater (Supa, shadowalker)
 0 feature darkplaces protocol: add DP_GFX_QUAKE3MODELTAGS_ATTACHMENTTYPE extension to allow attachments to affect only origin or only orientation, and enable/disable client camera turning while attached (Urre)
 0 feature darkplaces protocol: add DP_SENSITIVITYSCALE extension which scales sensitivity on client like viewzoom does, but without affecting fov, note if this is non-zero it overrides viewzoom sensitivity entirely, it does not scale it (Urre)
 0 feature darkplaces protocol: add DP_TE_BUBBLES to make a burst of bubbles underwater (Supa, shadowalker)