r2290 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Apr 4 04:21:45 EDT 2007
Author: div0
Date: 2007-04-04 04:21:45 -0400 (Wed, 04 Apr 2007)
New Revision: 2290
Modified:
trunk/data/qcsrc/server/builtins.qh
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/miscfunctions.qc
Log:
reverting Q1BSP compatibility change (breaks cl_movement due to not networked player size)
but keeping waterlevel bugfix
Modified: trunk/data/qcsrc/server/builtins.qh
===================================================================
--- trunk/data/qcsrc/server/builtins.qh 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/builtins.qh 2007-04-04 08:21:45 UTC (rev 2290)
@@ -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;
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/cl_client.qc 2007-04-04 08:21:45 UTC (rev 2290)
@@ -426,9 +426,7 @@
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 @@
}
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 @@
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);
}
}
}
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/constants.qh 2007-04-04 08:21:45 UTC (rev 2290)
@@ -224,7 +224,3 @@
float COLOR_TEAM4 = 13; // yellow
float NUM_PLAYERSKINS_TEAMPLAY = 3;
-
-float MAPTYPE_Q1BSP = 100;
-float MAPTYPE_HLBSP = 150;
-float MAPTYPE_Q3BSP = 300;
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/defs.qh 2007-04-04 08:21:45 UTC (rev 2290)
@@ -1,7 +1,5 @@
// Globals
-float maptype;
-
entity activator;
string string_null;
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/g_world.qc 2007-04-04 08:21:45 UTC (rev 2290)
@@ -71,32 +71,9 @@
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");
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2007-04-04 08:01:43 UTC (rev 2289)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2007-04-04 08:21:45 UTC (rev 2290)
@@ -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 @@
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);
-}
More information about the nexuiz-commits
mailing list