[nexuiz-commits] r6241 - in trunk/data/qcsrc: common server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Mar 20 23:33:41 EDT 2009
Author: mand1nga
Date: 2009-03-20 23:33:41 -0400 (Fri, 20 Mar 2009)
New Revision: 6241
Modified:
trunk/data/qcsrc/common/constants.qh
trunk/data/qcsrc/server/cl_physics.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/havocbot.qc
trunk/data/qcsrc/server/sv_main.qc
Log:
Replaced water levels with meaningful constants
Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh 2009-03-20 17:23:05 UTC (rev 6240)
+++ trunk/data/qcsrc/common/constants.qh 2009-03-21 03:33:41 UTC (rev 6241)
@@ -417,3 +417,9 @@
//misc. stuff
#define NEWLINES "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+
+// water levels
+float WATERLEVEL_NONE = 0;
+float WATERLEVEL_WETFEET = 1;
+float WATERLEVEL_SWIMMING = 2;
+float WATERLEVEL_SUBMERGED = 3;
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2009-03-20 17:23:05 UTC (rev 6240)
+++ trunk/data/qcsrc/server/cl_physics.qc 2009-03-21 03:33:41 UTC (rev 6241)
@@ -33,7 +33,7 @@
float mjumpheight;
mjumpheight = cvar("sv_jumpvelocity");
- if (self.waterlevel >= 2)
+ if (self.waterlevel >= WATERLEVEL_SWIMMING)
{
if (self.watertype == CONTENT_WATER)
self.velocity_z = 200;
@@ -490,7 +490,7 @@
{
self.wasFlying = 0;
- if(self.waterlevel < 2)
+ if(self.waterlevel < WATERLEVEL_SWIMMING)
if(time >= self.ladder_time)
if not(self.hook)
{
@@ -525,7 +525,7 @@
else
self.flags |= FL_JUMPRELEASED;
- if (self.waterlevel == 2)
+ if (self.waterlevel == WATERLEVEL_SWIMMING)
CheckWaterJump ();
}
@@ -533,7 +533,7 @@
{
self.velocity_x = self.movedir_x;
self.velocity_y = self.movedir_y;
- if (time > self.teleport_time || self.waterlevel == 0)
+ if (time > self.teleport_time || self.waterlevel == WATERLEVEL_NONE)
{
self.flags &~= FL_WATERJUMP;
self.teleport_time = 0;
@@ -564,7 +564,7 @@
self.velocity = self.velocity + wishdir * min(f, sv_accelerate*maxspd_mod * frametime * wishspeed);
}
}
- else if (self.waterlevel >= 2)
+ else if (self.waterlevel >= WATERLEVEL_SWIMMING)
{
// swimming
self.flags &~= FL_ONGROUND;
@@ -611,14 +611,14 @@
self.watertype = self.ladder_entity.skin;
f = self.ladder_entity.origin_z + self.ladder_entity.maxs_z;
if ((self.origin_z + self.view_ofs_z) < f)
- self.waterlevel = 3;
+ self.waterlevel = WATERLEVEL_SUBMERGED;
else if ((self.origin_z + (self.mins_z + self.maxs_z) * 0.5) < f)
- self.waterlevel = 2;
+ self.waterlevel = WATERLEVEL_SWIMMING;
else if ((self.origin_z + self.mins_z + 1) < f)
- self.waterlevel = 1;
+ self.waterlevel = WATERLEVEL_WETFEET;
else
{
- self.waterlevel = 0;
+ self.waterlevel = WATERLEVEL_NONE;
self.watertype = CONTENT_EMPTY;
}
}
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2009-03-20 17:23:05 UTC (rev 6240)
+++ trunk/data/qcsrc/server/g_damage.qc 2009-03-21 03:33:41 UTC (rev 6241)
@@ -75,7 +75,7 @@
{
if(a.flags & FL_ONGROUND)
return 0;
- if(a.waterlevel >= 2)
+ if(a.waterlevel >= WATERLEVEL_SWIMMING)
return 0;
traceline(a.origin, a.origin - '0 0 48', MOVE_NORMAL, a);
if(trace_fraction < 1)
Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc 2009-03-20 17:23:05 UTC (rev 6240)
+++ trunk/data/qcsrc/server/havocbot.qc 2009-03-21 03:33:41 UTC (rev 6241)
@@ -153,7 +153,7 @@
return;
}
- if(self.waterlevel > 1)
+ if(self.waterlevel > WATERLEVEL_WETFEET)
{
self.aistatus &~= AI_STATUS_RUNNING;
return;
@@ -357,9 +357,9 @@
if(self.goalcurrent==world)
{
dir = '0 0 0';
- if(self.waterlevel>2)
+ if(self.waterlevel>WATERLEVEL_SWIMMING)
dir_z = 1;
- else if(self.velocity_z >= 0 && !(self.waterlevel == 1 && self.watertype == CONTENT_WATER))
+ else if(self.velocity_z >= 0 && !(self.waterlevel == WATERLEVEL_WETFEET && self.watertype == CONTENT_WATER))
self.BUTTON_JUMP = TRUE;
else
self.BUTTON_JUMP = FALSE;
@@ -421,7 +421,7 @@
if (self.waterlevel)
{
- if(self.waterlevel>2)
+ if(self.waterlevel>WATERLEVEL_SWIMMING)
{
// flatdir_z = 1;
self.aistatus |= AI_STATUS_OUT_WATER;
@@ -429,7 +429,7 @@
else
{
if(self.velocity_z >= 0 && !(self.watertype == CONTENT_WATER && self.goalcurrent.origin_z < self.origin_z) &&
- ( !(self.waterlevel == 1 && self.watertype == CONTENT_WATER) || self.aistatus & AI_STATUS_OUT_WATER))
+ ( !(self.waterlevel == WATERLEVEL_WETFEET && self.watertype == CONTENT_WATER) || self.aistatus & AI_STATUS_OUT_WATER))
self.BUTTON_JUMP = TRUE;
else
self.BUTTON_JUMP = FALSE;
@@ -899,7 +899,7 @@
// TODO: tracewalk() should take care of this job (better path finding under water)
// if we don't have a goal and we're under water look for a waypoint near the "shore" and push it
if(self.goalcurrent==world)
- if(self.waterlevel==2 || self.aistatus & AI_STATUS_OUT_WATER)
+ if(self.waterlevel==WATERLEVEL_SWIMMING || self.aistatus & AI_STATUS_OUT_WATER)
{
// Look for the closest waypoint out of water
local entity newgoal, head;
@@ -987,7 +987,7 @@
//dprint(etos(self), " ");
//dprint(vtos(now), ":", vtos(next), "=", vtos(v), " (blend ", ftos(blend), ")\n");
//v = now * (distanceblend) + next * (1-distanceblend);
- if (self.waterlevel < 2)
+ if (self.waterlevel < WATERLEVEL_SWIMMING)
v_z = 0;
//dprint("walk at:", vtos(v), "\n");
//te_lightning2(world, self.origin, self.goalcurrent.origin);
Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc 2009-03-20 17:23:05 UTC (rev 6240)
+++ trunk/data/qcsrc/server/sv_main.qc 2009-03-21 03:33:41 UTC (rev 6241)
@@ -16,7 +16,7 @@
self.flags |= FL_INWATER;
self.dmgtime = 0;
}
- if (self.waterlevel != 3)
+ if (self.waterlevel != WATERLEVEL_SUBMERGED)
{
if(self.air_finished < time + 9)
PlayerSound(playersound_gasp, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);
More information about the nexuiz-commits
mailing list