r5708 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jan 31 10:04:49 EST 2009
Author: div0
Date: 2009-01-31 10:04:34 -0500 (Sat, 31 Jan 2009)
New Revision: 5708
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_physics.qc
trunk/data/qcsrc/server/cl_player.qc
trunk/data/qcsrc/server/cl_weapons.qc
trunk/data/qcsrc/server/cl_weaponsystem.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/g_hook.qc
trunk/data/qcsrc/server/sv_main.qc
trunk/data/qcsrc/server/t_jumppads.qc
trunk/data/qcsrc/server/t_teleporters.qc
Log:
fix some uses of the flags field; should fix turret aiming bug
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -1191,7 +1191,7 @@
self.classname = "player_joining";
- self.flags = self.flags | FL_CLIENT;
+ self.flags = FL_CLIENT;
self.version_nagtime = time + 10 + random() * 10;
if(player_count<0)
@@ -1969,19 +1969,19 @@
if (self.flags & FL_JUMPRELEASED) {
if (self.BUTTON_JUMP && !self.version_mismatch) {
self.welcomemessage_time = 0;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_JUMPRELEASED;
LeaveSpectatorMode();
return;
} else if(self.BUTTON_ATCK && !self.version_mismatch) {
self.welcomemessage_time = 0;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_JUMPRELEASED;
if(SpectateNext() == 1) {
self.classname = "spectator";
}
}
} else {
if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) {
- self.flags = self.flags | FL_JUMPRELEASED;
+ self.flags |= FL_JUMPRELEASED;
}
}
if(self.BUTTON_ZOOM)
@@ -1995,12 +1995,12 @@
if (self.flags & FL_JUMPRELEASED) {
if (self.BUTTON_JUMP && !self.version_mismatch) {
self.welcomemessage_time = 0;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_JUMPRELEASED;
LeaveSpectatorMode();
return;
} else if(self.BUTTON_ATCK) {
self.welcomemessage_time = 0;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_JUMPRELEASED;
if(SpectateNext() == 1) {
self.classname = "spectator";
} else {
@@ -2009,7 +2009,7 @@
}
} else if (self.BUTTON_ATCK2) {
self.welcomemessage_time = 0;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_JUMPRELEASED;
self.classname = "observer";
PutClientInServer();
} else {
@@ -2018,14 +2018,14 @@
}
} else {
if (!(self.BUTTON_ATCK || self.BUTTON_ATCK2)) {
- self.flags = self.flags | FL_JUMPRELEASED;
+ self.flags |= FL_JUMPRELEASED;
}
}
if(self.BUTTON_ZOOM)
self.wantswelcomemessage = 0;
if(self.wantswelcomemessage)
PrintWelcomeMessage(self);
- self.flags = self.flags | FL_CLIENT | FL_NOTARGET;
+ self.flags |= FL_CLIENT | FL_NOTARGET;
}
.float touchexplode_time;
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/cl_physics.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -79,8 +79,8 @@
self.velocity_z = self.velocity_z + mjumpheight;
self.oldvelocity_z = self.velocity_z;
- self.flags = self.flags - FL_ONGROUND;
- self.flags = self.flags - FL_JUMPRELEASED;
+ self.flags &~= FL_ONGROUND;
+ self.flags &~= FL_JUMPRELEASED;
if (self.crouch)
player_setanim(self.anim_duckjump, FALSE, TRUE, TRUE);
@@ -111,9 +111,9 @@
traceline (start, end, TRUE, self);
if (trace_fraction == 1)
{ // open at eye level
- self.flags = self.flags | FL_WATERJUMP;
+ self.flags |= FL_WATERJUMP;
self.velocity_z = 225;
- self.flags = self.flags - (self.flags & FL_JUMPRELEASED);
+ self.flags &~= FL_JUMPRELEASED;
self.teleport_time = time + 2; // safety net
return;
}
@@ -514,16 +514,16 @@
{
if(sv_doublejump)
{
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 2', MOVE_NORMAL, self);
if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
- self.flags = self.flags | FL_ONGROUND;
+ self.flags |= FL_ONGROUND;
}
if (self.BUTTON_JUMP)
PlayerJump ();
else
- self.flags = self.flags | FL_JUMPRELEASED;
+ self.flags |= FL_JUMPRELEASED;
if (self.waterlevel == 2)
CheckWaterJump ();
@@ -535,7 +535,7 @@
self.velocity_y = self.movedir_y;
if (time > self.teleport_time || self.waterlevel == 0)
{
- self.flags = self.flags - (self.flags & FL_WATERJUMP);
+ self.flags &~= FL_WATERJUMP;
self.teleport_time = 0;
}
}
@@ -546,7 +546,7 @@
else if (self.movetype == MOVETYPE_NOCLIP || self.movetype == MOVETYPE_FLY)
{
// noclipping or flying
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
self.velocity = self.velocity * (1 - frametime * sv_friction);
makevectors(self.v_angle);
@@ -567,7 +567,7 @@
else if (self.waterlevel >= 2)
{
// swimming
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
makevectors(self.v_angle);
//wishvel = v_forward * self.movement_x + v_right * self.movement_y + v_up * self.movement_z;
@@ -592,7 +592,7 @@
else if (time < self.ladder_time)
{
// on a spawnfunc_func_ladder or swimming in spawnfunc_func_water
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
self.velocity = self.velocity * (1 - frametime * sv_friction);
makevectors(self.v_angle);
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/cl_player.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -480,7 +480,7 @@
// shootable corpse
self.solid = SOLID_CORPSE;
// don't stick to the floor
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
// dying animation
self.deadflag = DEAD_DYING;
// when to allow respawn
Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/cl_weapons.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -187,7 +187,7 @@
wep.velocity = velo;
wep.owner = wep.enemy = own;
wep.classname = "droppedweapon";
- wep.flags = wep.flags | FL_TOSSED;
+ wep.flags |= FL_TOSSED;
wep.colormap = own.colormap;
wa = W_AmmoItemCode(wpn);
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -277,7 +277,7 @@
self.effects = self.owner.effects | EF_LOWPRECISION;
self.effects = self.effects - (self.effects & (EF_FULLBRIGHT)); // can mask team color, so get rid of it
- if (self.flags & FL_FLY)
+ if (self.owner.teleport_time)
// owner is currently being teleported, so don't apply EF_NODRAW otherwise the viewmodel would "blink"
self.effects &~= EF_NODRAW;
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/g_damage.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -823,7 +823,7 @@
if (vlen(force))
{
self.velocity = self.velocity + self.damageforcescale * force;
- self.flags = self.flags - (self.flags & FL_ONGROUND);
+ self.flags &~= FL_ONGROUND;
UpdateCSQCProjectile(self);
}
// apply damage
Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/g_hook.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -227,7 +227,7 @@
{
self.owner.velocity = self.owner.velocity - dv * 0.5;
self.aiment.velocity = self.aiment.velocity - dv * 0.5;
- self.aiment.flags = self.aiment.flags - (self.aiment.flags & FL_ONGROUND);
+ self.aiment.flags &~= FL_ONGROUND;
self.aiment.pusher = self.owner;
self.aiment.pushltime = time + cvar("g_maxpushtime");
}
Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/sv_main.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -13,7 +13,7 @@
{
if (!(self.flags & FL_INWATER))
{
- self.flags = self.flags + FL_INWATER;
+ self.flags |= FL_INWATER;
self.dmgtime = 0;
}
if (self.waterlevel != 3)
@@ -60,7 +60,7 @@
if (self.flags & FL_INWATER)
{
// play leave water sound
- self.flags = self.flags - FL_INWATER;
+ self.flags &~= FL_INWATER;
self.dmgtime = 0;
}
self.air_finished = time + 12;
Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/t_jumppads.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -121,7 +121,7 @@
if(self.target)
self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
- other.flags = other.flags - (other.flags & FL_ONGROUND);
+ other.flags &~= FL_ONGROUND;
// reset tracking of oldvelocity for impact damage (sudden velocity changes)
other.oldvelocity = other.velocity = self.movedir;
Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc 2009-01-31 14:41:56 UTC (rev 5707)
+++ trunk/data/qcsrc/server/t_teleporters.qc 2009-01-31 15:04:34 UTC (rev 5708)
@@ -74,12 +74,10 @@
// hide myself a tic
player.effects = player.effects | EF_NODRAW;
- if (player.weaponentity) // misuse FL_FLY to avoid EF_NODRAW on viewmodel
- player.weaponentity.flags = player.weaponentity.flags | FL_FLY;
player.teleport_time = time + cvar("sys_ticrate");
// player no longer is on ground
- player.flags = player.flags - (player.flags & FL_ONGROUND);
+ player.flags &~= FL_ONGROUND;
// reset tracking of oldvelocity for impact damage (sudden velocity changes)
player.oldvelocity = player.velocity;
More information about the nexuiz-commits
mailing list