From aa6a7bde0c9e4502e97b3acd2c7a3edd0b30bec5 Mon Sep 17 00:00:00 2001 From: tzork Date: Fri, 11 Sep 2009 00:50:08 +0000 Subject: [PATCH] Always use setorigin git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7719 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 6 +++--- data/qcsrc/server/clientcommands.qc | 2 +- data/qcsrc/server/domination.qc | 8 ++++---- data/qcsrc/server/ent_cs.qc | 2 +- data/qcsrc/server/func_breakable.qc | 6 +++--- data/qcsrc/server/g_casings.qc | 2 +- data/qcsrc/server/g_hook.qc | 2 +- data/qcsrc/server/g_tetris.qc | 12 ++++++------ data/qcsrc/server/keyhunt.qc | 6 +++--- data/qcsrc/server/miscfunctions.qc | 8 ++++---- data/qcsrc/server/mode_onslaught.qc | 2 +- data/qcsrc/server/portals.qc | 10 +++++----- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 9b4a3c602..a55702e8c 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -511,7 +511,7 @@ void CL_Weaponentity_Think() 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 @@ void CL_SpawnWeaponentity() 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 @@ void CL_SpawnWeaponentity() 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; diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index 2e19741fb..7b9a6c1e3 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -404,7 +404,7 @@ void SV_ParseClientCommand(string s) { 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) { diff --git a/data/qcsrc/server/domination.qc b/data/qcsrc/server/domination.qc index ab3fd6838..d87d8419b 100644 --- a/data/qcsrc/server/domination.qc +++ b/data/qcsrc/server/domination.qc @@ -79,12 +79,12 @@ void dompoint_captured () //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 @@ void dompointtouch() return; if (other.health < 1) return; - + if(time < self.captime + 0.3) return; @@ -569,7 +569,7 @@ void dom_spawnpoint(vector org) self.classname = "dom_controlpoint"; self.think = spawnfunc_dom_controlpoint; self.nextthink = time; - self.origin = org; + setorigin(self, org); spawnfunc_dom_controlpoint(); self = oldself; }; diff --git a/data/qcsrc/server/ent_cs.qc b/data/qcsrc/server/ent_cs.qc index 4fff0c238..3e7f490af 100644 --- a/data/qcsrc/server/ent_cs.qc +++ b/data/qcsrc/server/ent_cs.qc @@ -59,7 +59,7 @@ void entcs_think() if(o.origin != self.origin || o.angles != self.angles) { - self.origin = o.origin; + setorigin(self, o.origin); self.angles = o.angles; self.SendFlags |= 1; } diff --git a/data/qcsrc/server/func_breakable.qc b/data/qcsrc/server/func_breakable.qc index 6b580ffb1..eb4c8b4de 100644 --- a/data/qcsrc/server/func_breakable.qc +++ b/data/qcsrc/server/func_breakable.qc @@ -86,18 +86,18 @@ void func_breakable_colormod() 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; } diff --git a/data/qcsrc/server/g_casings.qc b/data/qcsrc/server/g_casings.qc index e49719848..e2c1c2938 100644 --- a/data/qcsrc/server/g_casings.qc +++ b/data/qcsrc/server/g_casings.qc @@ -24,7 +24,7 @@ void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float ran e = spawn(); e.state = casingtype; - e.origin = org; + setorigin(e, org); e.velocity = vel; e.angles = ang; e.oldorigin_x = compressShortVector(e.velocity); diff --git a/data/qcsrc/server/g_hook.qc b/data/qcsrc/server/g_hook.qc index 60f5fb81e..636428ddf 100644 --- a/data/qcsrc/server/g_hook.qc +++ b/data/qcsrc/server/g_hook.qc @@ -149,7 +149,7 @@ void GrapplingHookThink() UnsetMovetypeFollow(self); // 2. cut it off - self.origin = trace_endpos; + setorigin(self, trace_endpos); // 3. reattach the hook if(trace_ent) diff --git a/data/qcsrc/server/g_tetris.qc b/data/qcsrc/server/g_tetris.qc index 52bce064f..5c65847ea 100644 --- a/data/qcsrc/server/g_tetris.qc +++ b/data/qcsrc/server/g_tetris.qc @@ -54,9 +54,9 @@ line16, line17, line18, line19, line20; 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 @@ float TetrisPostFrame() 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 @@ float TetrisPostFrame() if(TetrisKeyRepeat(tetkey_right, self.movement_y > 0)) keysa |= TETKEY_RIGHT; - + if(TetrisKeyRepeat(tetkey_rotleft, self.BUTTON_CROUCH)) keysa |= TETKEY_ROTLEFT; diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index afc6e1562..26f92f5b3 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -319,12 +319,12 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic 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 @@ void kh_Key_Think() // runs all the time if(cvar_string("_angles") != "") { self.angles = stov(cvar_string("_angles")); - self.origin = stov(cvar_string("_origin")); + setorigin(self, stov(cvar_string("_origin"))); } } #endif diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 887c4a9e9..f3807b1a0 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -43,7 +43,7 @@ void move_out_of_solid_expand(entity e, vector by) { // 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 @@ void relocate_spawnpoint() } 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 @@ void detach_sameorigin(entity e) 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 @@ float modeleffect_SendEntity(entity to, float sf) f |= 2; if(self.avelocity != '0 0 0') f |= 4; - + WriteByte(MSG_ENTITY, f); WriteShort(MSG_ENTITY, self.modelindex); WriteByte(MSG_ENTITY, self.skin); diff --git a/data/qcsrc/server/mode_onslaught.qc b/data/qcsrc/server/mode_onslaught.qc index bab13d5dc..bd4ccef72 100644 --- a/data/qcsrc/server/mode_onslaught.qc +++ b/data/qcsrc/server/mode_onslaught.qc @@ -1096,7 +1096,7 @@ void onslaught_controlpoint_icon_think() 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) diff --git a/data/qcsrc/server/portals.qc b/data/qcsrc/server/portals.qc index c800c0f01..229d213e1 100644 --- a/data/qcsrc/server/portals.qc +++ b/data/qcsrc/server/portals.qc @@ -42,7 +42,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player) 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 @@ float Portal_TeleportPlayer(entity teleporter, entity player) 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 @@ void Portal_Touch() 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 @@ entity Portal_Spawn(entity own, vector org, vector ang) portal = spawn(); portal.classname = "portal"; portal.aiment = own; - portal.origin = org; + setorigin(portal, org); portal.angles = ang; portal.think = Portal_Think; portal.nextthink = 0; -- 2.39.2