From: Mario Date: Tue, 21 Apr 2015 06:17:25 +0000 (+1000) Subject: Hardcode some more references to the player hitbox X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51d963ece51be8b46d698f6e2b162ad8075aba42;p=xonotic%2Fxonotic-data.pk3dir.git Hardcode some more references to the player hitbox --- diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 535724b91..fd4427050 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -850,7 +850,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint if(is_new) { self.origin = spn_origin; - setsize(self, PL_MIN, PL_MAX); + setsize(self, '-16 -16 -24', '16 16 45'); droptofloor(); /*if(autocvar_cl_spawn_point_model) // needs a model first diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index bf9a532eb..fce8c37e3 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -68,13 +68,13 @@ void relocate_spawnpoint() // nudge off the floor setorigin(self, self.origin + '0 0 1'); - tracebox(self.origin, PL_MIN, PL_MAX, self.origin, true, self); + tracebox(self.origin, '-16 -16 -24', '16 16 45', self.origin, true, self); if (trace_startsolid) { vector o; o = self.origin; - self.mins = PL_MIN; - self.maxs = PL_MAX; + self.mins = '-16 -16 -24'; + self.maxs = '16 16 45'; if (!move_out_of_solid(self)) objerror("could not get out of solid at all!"); print("^1NOTE: this map needs FIXING. Spawnpoint at ", vtos(o - '0 0 1'));