[nexuiz-commits] r7719 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Sep 10 20:50:09 EDT 2009
Author: tzork
Date: 2009-09-10 20:50:08 -0400 (Thu, 10 Sep 2009)
New Revision: 7719
Modified:
trunk/data/qcsrc/server/cl_weaponsystem.qc
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/ent_cs.qc
trunk/data/qcsrc/server/func_breakable.qc
trunk/data/qcsrc/server/g_casings.qc
trunk/data/qcsrc/server/g_hook.qc
trunk/data/qcsrc/server/g_tetris.qc
trunk/data/qcsrc/server/keyhunt.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/mode_onslaught.qc
trunk/data/qcsrc/server/portals.qc
Log:
Always use setorigin
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -511,7 +511,7 @@
self.weaponentity = world;
}
- self.origin = '0 0 0';
+ setorigin(self,'0 0 0');
self.angles = '0 0 0';
self.frame = 0;
self.viewmodelforclient = world;
@@ -848,7 +848,7 @@
self.weaponentity.solid = SOLID_NOT;
self.weaponentity.owner = self;
setmodel(self.weaponentity, ""); // precision set when changed
- self.weaponentity.origin = '0 0 0';
+ setorigin(self.weaponentity, '0 0 0');
self.weaponentity.angles = '0 0 0';
self.weaponentity.viewmodelforclient = self;
self.weaponentity.flags = 0;
@@ -861,7 +861,7 @@
self.exteriorweaponentity.solid = SOLID_NOT;
self.exteriorweaponentity.exteriorweaponentity = self.exteriorweaponentity;
self.exteriorweaponentity.owner = self;
- self.exteriorweaponentity.origin = '0 0 0';
+ setorigin(self.exteriorweaponentity, '0 0 0');
self.exteriorweaponentity.angles = '0 0 0';
self.exteriorweaponentity.think = CL_ExteriorWeaponentity_Think;
self.exteriorweaponentity.nextthink = time;
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/clientcommands.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -404,7 +404,7 @@
self.model = strzone(argv(1));
self.mdl = "rocket_explode";
self.health = 1000;
- self.origin = trace_endpos;
+ setorigin(self, trace_endpos);
self.effects = EF_NOMODELFLAGS;
if(f == 1)
{
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/domination.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -79,12 +79,12 @@
//self.nextthink = time + cvar("g_domination_point_rate");
//self.think = dompointthink;
-
+
if(cvar("g_domination_point_rate"))
self.delay = time + cvar("g_domination_point_rate");
else
self.delay = time + self.wait;
-
+
// do trigger work
old_delay = self.delay;
old_team = self.team;
@@ -179,7 +179,7 @@
return;
if (other.health < 1)
return;
-
+
if(time < self.captime + 0.3)
return;
@@ -569,7 +569,7 @@
self.classname = "dom_controlpoint";
self.think = spawnfunc_dom_controlpoint;
self.nextthink = time;
- self.origin = org;
+ setorigin(self, org);
spawnfunc_dom_controlpoint();
self = oldself;
};
Modified: trunk/data/qcsrc/server/ent_cs.qc
===================================================================
--- trunk/data/qcsrc/server/ent_cs.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/ent_cs.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -59,7 +59,7 @@
if(o.origin != self.origin || o.angles != self.angles)
{
- self.origin = o.origin;
+ setorigin(self, o.origin);
self.angles = o.angles;
self.SendFlags |= 1;
}
Modified: trunk/data/qcsrc/server/func_breakable.qc
===================================================================
--- trunk/data/qcsrc/server/func_breakable.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/func_breakable.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -86,18 +86,18 @@
void func_breakable_look_destroyed()
{
local float floor_z;
-
+
if(self.mdl_dead == "")
self.model = "";
else {
setmodel(self, self.mdl_dead);
if (self.origin == '0 0 0') { // probably no origin brush, so don't spawn in the middle of the map..
floor_z = self.absmin_z;
- self.origin = ((self.absmax+self.absmin)*.5);
+ setorigin(self,((self.absmax+self.absmin)*.5));
self.origin_z = floor_z;
}
}
-
+
self.solid = SOLID_NOT;
}
Modified: trunk/data/qcsrc/server/g_casings.qc
===================================================================
--- trunk/data/qcsrc/server/g_casings.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/g_casings.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -24,7 +24,7 @@
e = spawn();
e.state = casingtype;
- e.origin = org;
+ setorigin(e, org);
e.velocity = vel;
e.angles = ang;
e.oldorigin_x = compressShortVector(e.velocity);
Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/g_hook.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -149,7 +149,7 @@
UnsetMovetypeFollow(self);
// 2. cut it off
- self.origin = trace_endpos;
+ setorigin(self, trace_endpos);
// 3. reattach the hook
if(trace_ent)
Modified: trunk/data/qcsrc/server/g_tetris.qc
===================================================================
--- trunk/data/qcsrc/server/g_tetris.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/g_tetris.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -54,9 +54,9 @@
float SVC_CENTERPRINTa = 26;
float Tetris_Level()
-{
- return ((floor((self.tet_lines / 10)) + 1));
-};
+{
+ return ((floor((self.tet_lines / 10)) + 1));
+};
void tetsnd(string snd)
{
@@ -958,8 +958,8 @@
self.tetris_on = 1; // start VS game
self.tet_drawtime = 0;
}
-
- self.origin = self.tet_org;
+
+ setorigin(self, self.tet_org);
self.movetype = MOVETYPE_NONE;
if(self.tetris_on == 1)
@@ -975,7 +975,7 @@
if(TetrisKeyRepeat(tetkey_right, self.movement_y > 0))
keysa |= TETKEY_RIGHT;
-
+
if(TetrisKeyRepeat(tetkey_rotleft, self.BUTTON_CROUCH))
keysa |= TETKEY_ROTLEFT;
Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/keyhunt.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -319,12 +319,12 @@
WaypointSprite_Ping(player.waypointsprite_attachedforcarrier);
}
}
-
+
// moved that here, also update if there's no player
kh_show_temp();
if(key.owner)
key.owner.kh_state = (key.owner.kh_state | 255) - 255 + test[key.owner.playerid];
-
+
key.pusher = world;
ownerteam = kh_Key_AllOwnedByWhichTeam();
@@ -562,7 +562,7 @@
if(cvar_string("_angles") != "")
{
self.angles = stov(cvar_string("_angles"));
- self.origin = stov(cvar_string("_origin"));
+ setorigin(self, stov(cvar_string("_origin")));
}
}
#endif
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -43,7 +43,7 @@
{
// hit something
// adjust origin in the other direction...
- e.origin = e.origin - by * (1 - trace_fraction);
+ setorigin(e,e.origin - by * (1 - trace_fraction));
}
}
@@ -195,7 +195,7 @@
}
else
{
- self.origin = o;
+ setorigin(self, o);
self.mins = self.maxs = '0 0 0';
objerror("player spawn point in solid, mapper sucks!\n");
return;
@@ -2341,7 +2341,7 @@
e.angles = fixedvectoangles2(v_forward, v_up);
if (substring(e.model, 0, 1) == "*") // bmodels have their own rules
e.angles_x = -e.angles_x;
- e.origin = org;
+ setorigin(e, org);
setattachment(e, world, "");
setorigin(e, e.origin);
}
@@ -2490,7 +2490,7 @@
f |= 2;
if(self.avelocity != '0 0 0')
f |= 4;
-
+
WriteByte(MSG_ENTITY, f);
WriteShort(MSG_ENTITY, self.modelindex);
WriteByte(MSG_ENTITY, self.skin);
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -1096,7 +1096,7 @@
self.cp_bob_dmg_z = self.cp_bob_dmg_z - 0.1;
else
self.cp_bob_dmg_z = 0;
- self.origin = self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg;
+ setorigin(self,self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg);
// damaged fx
if(random() < 0.6 - self.health / self.max_health)
Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc 2009-09-10 15:30:26 UTC (rev 7718)
+++ trunk/data/qcsrc/server/portals.qc 2009-09-11 00:50:08 UTC (rev 7719)
@@ -42,7 +42,7 @@
to = to + AnglesTransform_Apply(teleporter.portal_transform, player.origin - from);
newvel = AnglesTransform_Apply(transform, player.velocity);
// this now is INSIDE the plane... can't use that
-
+
// shift it out
fixedmakevectors(teleporter.enemy.angles);
@@ -55,7 +55,7 @@
else
*/
to += v_forward * planeshift;
-
+
s = (to - teleporter.enemy.origin) * v_right;
t = (to - teleporter.enemy.origin) * v_up;
s = bound(-48, s, 48);
@@ -239,10 +239,10 @@
if(other.classname == "item_flag_team")
return; // never portal these
-
+
if(other.classname == "grapplinghook")
return; // handled by think
-
+
if(!self.enemy)
error("Portal_Touch called for a broken portal\n");
@@ -598,7 +598,7 @@
portal = spawn();
portal.classname = "portal";
portal.aiment = own;
- portal.origin = org;
+ setorigin(portal, org);
portal.angles = ang;
portal.think = Portal_Think;
portal.nextthink = 0;
More information about the nexuiz-commits
mailing list