From 49a2681b6d93d83ee989f6fef3d59583e47f5008 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 4 Apr 2007 08:21:45 +0000 Subject: [PATCH] reverting Q1BSP compatibility change (breaks cl_movement due to not networked player size) but keeping waterlevel bugfix git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2290 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/builtins.qh | 2 +- data/qcsrc/server/cl_client.qc | 18 +++++------ data/qcsrc/server/constants.qh | 4 --- data/qcsrc/server/defs.qh | 2 -- data/qcsrc/server/g_world.qc | 23 ------------- data/qcsrc/server/miscfunctions.qc | 52 ------------------------------ 6 files changed, 9 insertions(+), 92 deletions(-) diff --git a/data/qcsrc/server/builtins.qh b/data/qcsrc/server/builtins.qh index a4781b47c..984994ec1 100644 --- a/data/qcsrc/server/builtins.qh +++ b/data/qcsrc/server/builtins.qh @@ -2,7 +2,7 @@ void makevectors (vector ang) = #1; void setorigin (entity e, vector o) = #2; void setmodel (entity e, string m) = #3; -void setsize_builtin (entity e, vector min, vector max) = #4; +void setsize (entity e, vector min, vector max) = #4; void crash (void) = #6; float random (void) = #7; diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index cefd680fb..a5062c652 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -426,9 +426,7 @@ void PutClientInServer (void) self.dead_frame = 0; self.die_frame = 0; self.alpha = 0; - self.scale = 1; - if(maptype == MAPTYPE_Q1BSP) - self.scale = 0.85; + self.scale = 0; self.fade_time = 0; self.pain_frame = 0; self.pain_finished = 0; @@ -477,8 +475,8 @@ void PutClientInServer (void) } self.crouch = FALSE; - self.view_ofs = PL_VIEW_OFS * self.scale; - setsize (self, PL_MIN * self.scale, PL_MAX * self.scale); + self.view_ofs = PL_VIEW_OFS; + setsize (self, PL_MIN, PL_MAX); self.spawnorigin = spot.origin; setorigin (self, spot.origin + '0 0 1' * (1 - self.mins_z - 24)); // don't reset back to last position, even if new position is stuck in solid @@ -1380,20 +1378,20 @@ void PlayerPreThink (void) if (!self.crouch) { self.crouch = TRUE; - self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale; - setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale); + self.view_ofs = PL_CROUCH_VIEW_OFS; + setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); } } else { if (self.crouch) { - tracebox(self.origin, PL_MIN * self.scale, PL_MAX * self.scale, self.origin, FALSE, self); + tracebox(self.origin, PL_MIN, PL_MAX, self.origin, FALSE, self); if (!trace_startsolid) { self.crouch = FALSE; - self.view_ofs = PL_VIEW_OFS * self.scale; - setsize (self, PL_MIN * self.scale, PL_MAX * self.scale); + self.view_ofs = PL_VIEW_OFS; + setsize (self, PL_MIN, PL_MAX); } } } diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 03d1e6d2c..da2e305a0 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -224,7 +224,3 @@ float COLOR_TEAM3 = 10; // pink float COLOR_TEAM4 = 13; // yellow float NUM_PLAYERSKINS_TEAMPLAY = 3; - -float MAPTYPE_Q1BSP = 100; -float MAPTYPE_HLBSP = 150; -float MAPTYPE_Q3BSP = 300; diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 43705353e..2c354fd89 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -1,7 +1,5 @@ // Globals -float maptype; - entity activator; string string_null; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index c7d4986cb..ea3151b07 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -71,32 +71,9 @@ void GotoFirstMap() float world_already_spawned; void worldspawn (void) { - string str; - if(world_already_spawned) error("world already spawned - you may have EXACTLY ONE worldspawn!"); world_already_spawned = TRUE; - - // first detect the map type - if(cvar("halflifebsp")) - { - maptype = MAPTYPE_HLBSP; - } - else - { - str = getsurfacetexture(world, 0); - dprint("maptype test texture string = ", str, "\n"); - if(strstr(str, "/", 0) >= 0) - maptype = MAPTYPE_Q3BSP; - else if(str == "NULL") // GtkRadiant-ism - maptype = MAPTYPE_Q3BSP; - else if(str == "notexture") // q3map2-ism - maptype = MAPTYPE_Q3BSP; - else - maptype = MAPTYPE_Q1BSP; - } - dprint("Detected map type: ", ftos(maptype), "\n"); - // Precache all player models // Workaround for "invisible players" precache_model("models/player/carni.zym"); diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 0b8f1a0fb..6286cd303 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1,5 +1,3 @@ -void setsize(entity e, vector boxmin, vector boxmax); - #define FOR_EACH_CLIENT(v) for(v = world; (v = findflags(v, flags, FL_CLIENT)) != world; ) #define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if(clienttype(v) == CLIENTTYPE_REAL) string STR_PLAYER = "player"; @@ -554,53 +552,3 @@ string playername(entity p) else return p.netname; } - -void setsize(entity e, vector boxmin, vector boxmax) -{ - float needhull; - vector boxsize; - vector boxdiff, hullsize; - - needhull = FALSE; - boxsize = boxmax - boxmin; - - if(maptype == MAPTYPE_Q1BSP) - { - needhull = TRUE; - if(boxsize_x < 3) - hullsize = '0 0 0'; - else if(boxsize_x < 32.1) - hullsize = '32 32 56'; - else - hullsize = '64 64 88'; - } - else if(maptype == MAPTYPE_HLBSP) - { - needhull = TRUE; - if(boxsize_x < 3) - hullsize = '0 0 0'; - else if(boxsize_x < 32.1) - { - if(boxsize_z < 54) - hullsize = '32 32 36'; - else - hullsize = '32 32 72'; - } - else - hullsize = '64 64 64'; - } - - if(needhull) - { - boxdiff = hullsize - boxsize; - //dprint("Adjusted size from "); - //dprint(vtos(boxmin), "-"); - //dprint(vtos(boxmax), " to "); - boxmin = '0.5 0 0' * (boxmin_x + boxmax_x - hullsize_x) + '0 0.5 0' * (boxmin_y + boxmax_y - hullsize_y) + '0 0 1' * boxmin_z; - boxmax = boxmin + hullsize; - //dprint(vtos(boxmin), "-"); - //dprint(vtos(boxmax), "\n"); - } - - setsize_builtin(e, boxmin, boxmax); -} -- 2.39.2