r5632 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 22 07:34:12 EST 2009
Author: div0
Date: 2009-01-22 07:34:10 -0500 (Thu, 22 Jan 2009)
New Revision: 5632
Removed:
trunk/data/qcsrc/server/g_decors.qc
Modified:
trunk/data/qcsrc/server/arena.qc
trunk/data/qcsrc/server/g_casings.qc
trunk/data/qcsrc/server/progs.src
Log:
death to g_decors.qc (it no longer does anything anyway)
Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc 2009-01-22 12:32:02 UTC (rev 5631)
+++ trunk/data/qcsrc/server/arena.qc 2009-01-22 12:34:10 UTC (rev 5632)
@@ -13,7 +13,6 @@
void PutObserverInServer();
void PutClientInServer();
void(entity e) ReturnFlag;
-void(entity e) removedecor;
void dom_controlpoint_setup();
void onslaught_generator_reset();
void onslaught_controlpoint_reset();
@@ -99,10 +98,6 @@
stopsound(self, CHAN_PROJECTILE);
remove(self);
}
- else if(self.isdecor)
- {
- removedecor(self);
- }
else if(self.classname == "onslaught_generator")
{
onslaught_generator_reset();
Modified: trunk/data/qcsrc/server/g_casings.qc
===================================================================
--- trunk/data/qcsrc/server/g_casings.qc 2009-01-22 12:32:02 UTC (rev 5631)
+++ trunk/data/qcsrc/server/g_casings.qc 2009-01-22 12:34:10 UTC (rev 5632)
@@ -1,113 +1,3 @@
-#if 0
-void casingtouch()
-{
- PROJECTILE_TOUCH;
-
- if (other.solid == SOLID_BSP)
- if (vlen(self.velocity) >= 50)
- if (time >= self.attack_finished_single)
- {
- string s;
- float f;
-
- f = floor(random() * 3) + 1;
- if(self.state == 1)
- s = strcat("weapons/casings", ftos(f), ".wav");
- else if(self.state == 2)
- s = strcat("weapons/steel", ftos(f), ".wav");
- else
- s = strcat("weapons/brass", ftos(f), ".wav");
- sound (self, CHAN_PROJECTILE, s, VOL_BASE, ATTN_NORM);
- }
- self.attack_finished_single = time + 0.2;
- //self.touch = SUB_Null; // one tink is enough
- //self.dest = self.origin - self.groundentity.origin;
-};
-
-void casingthink()
-{
- local float p;
- self.nextthink = time + 0.1;
- if (self.flags & FL_ONGROUND)
- {
- // just keep the yaw angle
- self.angles_x = 0;
- self.angles_z = 0;
- self.flags = self.flags - FL_ONGROUND;
- self.nextthink = time + 0.5;
- }
- p = pointcontents(self.origin);
- if (p == CONTENT_SOLID || p == CONTENT_LAVA || p == CONTENT_SKY)
- {
- removedecor(self);
- return;
- }
- if (time > self.cnt)
- {
- self.nextthink = time;
- self.alpha = self.alpha - frametime;
- if (self.alpha < 0.0625)
- removedecor(self);
- }
-};
-
-// knock loose the casing when disturbed
-void casingknockedloosefunc()
-{
- self.movetype = MOVETYPE_BOUNCE;
- self.flags = self.flags - (self.flags & FL_ONGROUND);
- self.avelocity = randomvec() * 300;
- self.nextthink = time + 0.1;
- self.touch = casingtouch;
-};
-
-void SpawnCasing(vector org, vector vel, float randomvel, vector ang, vector avel, float randomavel, float casingtype)
-{
- local entity e;
- if (cvar("temp1") & 2048)
- return;
-
- e = newdecor();
- e.isdecor = TRUE;
- e.alpha = 1;
- e.state = casingtype;
- //e.forcescale = 15;
- e.movetype = MOVETYPE_BOUNCE;
- e.solid = SOLID_TRIGGER;
- e.velocity = vel + randomvec() * randomvel;
- e.angles = ang;
- e.avelocity = avel + randomvec() * randomavel;
- e.nextthink = time;
- e.think = casingthink;
- e.touch = casingtouch;
- //e.knockedloosefunc = casingknockedloosefunc;
- e.effects = EF_LOWPRECISION;
- e.createdtime = time;
- if (casingtype == 1)
- {
- setmodel (e, "models/casing_shell.mdl"); // precision set above
- e.cnt = time + 30;
- // bias to make these be considered more important than other things
- e.createdtime = time + 1;
- }
- else if (casingtype == 2)
- {
- // FIXME: this is not used and not precached, uncomment if you need it
- //setmodel (e, "models/casing_steel.mdl"); // precision set above
- e.cnt = time + 10;
- }
- else
- {
- setmodel (e, "models/casing_bronze.mdl"); // precision set above
- e.cnt = time + 10;
- }
- if (maxclients == 1)
- e.cnt = time + 3000;
- setsize (e, '0 0 -1', '0 0 -1');
- setorigin (e, org);
-};
-#endif
-
float Casing_SendEntity(entity to, float sf)
{
WriteByte(MSG_ENTITY, ENT_CLIENT_CASING);
Deleted: trunk/data/qcsrc/server/g_decors.qc
===================================================================
--- trunk/data/qcsrc/server/g_decors.qc 2009-01-22 12:32:02 UTC (rev 5631)
+++ trunk/data/qcsrc/server/g_decors.qc 2009-01-22 12:34:10 UTC (rev 5632)
@@ -1,215 +0,0 @@
-
-float maxclients; // set by spawnfunc_worldspawn code
-float numdecors;
-float maxdecors;
-.float createdtime;
-
-//void(vector org, entity en, vector dir, float splattype, float importance) newbloodsplat;
-//void(vector org, float bodydamage, float armordamage, vector vel, float damgtype) genericbleedfunc;
-
-// removes the oldest decors each frame to maintain a certain maximum decors
-void decorframe()
-{
- local entity estart, e, b1, b2, b3, b4, b5, b6, b7, b8, b9, b10;
- local float bt1, bt2, bt3, bt4, bt5, bt6, bt7, bt8, bt9, bt10, iterations;
-
- // numdecors is allowed to be bogus as long as it is >= the real number of decors
- // (but perfection is clearly preferable)
- if (numdecors <= maxdecors)
- return;
-
- // recount all the decors
- numdecors = 0;
- estart = e = findchain(classname, "decor");
- while(e)
- {
- numdecors = numdecors + 1;
- e = e.chain;
- }
- if (numdecors <= maxdecors)
- return; // nothing to do
-
- // limit it to considering 10000 entities per frame,
- // otherwise it can cause a runaway loop error
- iterations = 0;
- while (numdecors > maxdecors && iterations < 10000)
- {
- iterations = iterations + 1;
- // find and remove the oldest decors (upto 10 at once)
- b1 = b2 = b3 = b4 = b5 = b6 = b7 = b8 = b9 = b10 = world;
- bt1 = bt2 = bt3 = bt4 = bt5 = bt6 = bt7 = bt8 = bt9 = bt10 = time + 10000;
- if (iterations > 0)
- estart = findchain(classname, "decor");
- e = estart;
- while(e)
- {
- iterations = iterations + 1;
- if (e.createdtime < bt10)
- {
- if (e.createdtime < bt9)
- {
- if (e.createdtime < bt8)
- {
- if (e.createdtime < bt7)
- {
- if (e.createdtime < bt6)
- {
- if (e.createdtime < bt5)
- {
- if (e.createdtime < bt4)
- {
- if (e.createdtime < bt3)
- {
- if (e.createdtime < bt2)
- {
- if (e.createdtime < bt1)
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=b5;bt6=bt5;
- b5=b4;bt5=bt4;
- b4=b3;bt4=bt3;
- b3=b2;bt3=bt2;
- b2=b1;bt2=bt1;
- b1=e;bt1=e.createdtime;
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=b5;bt6=bt5;
- b5=b4;bt5=bt4;
- b4=b3;bt4=bt3;
- b3=b2;bt3=bt2;
- b2=e;bt2=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=b5;bt6=bt5;
- b5=b4;bt5=bt4;
- b4=b3;bt4=bt3;
- b3=e;bt3=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=b5;bt6=bt5;
- b5=b4;bt5=bt4;
- b4=e;bt4=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=b5;bt6=bt5;
- b5=e;bt5=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=b6;bt7=bt6;
- b6=e;bt6=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=b7;bt8=bt7;
- b7=e;bt7=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=b8;bt9=bt8;
- b8=e;bt8=e.createdtime;
- }
- }
- else
- {
- b10=b9;bt10=bt9;
- b9=e;bt9=e.createdtime;
- }
- }
- else
- {
- b10=e;bt10=e.createdtime;
- }
- }
- // failed all 10 slots
- e = e.chain;
- }
- // remove the oldest decors
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b1);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b2);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b3);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b4);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b5);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b6);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b7);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b8);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b9);}
- if (numdecors > maxdecors) {numdecors = numdecors - 1;remove(b10);}
- }
-};
-
-entity newdecor()
-{
- local entity e;
- ++numdecors;
- e = spawn();
- e.classname = "decor";
- return e;
-};
-
-void removedecor(entity e)
-{
- --numdecors;
- remove(e);
-};
-
-
-// used for various little bouncing debris to avoid getting stuck in the air
-void DecorThink()
-{
- self.nextthink = time;
- self.flags = self.flags - (self.flags & FL_ONGROUND);
- if (pointcontents(self.origin) == CONTENT_SOLID)
- removedecor(self);
-};
-
-.float createdtime;
-
-void InitDecors()
-{
- // different number of decors in multi-player (to avoid lag on modems)
- if (maxclients > 1)
- maxdecors = 32;
- else
- maxdecors = 100;
- // overridable by saved2 cvar on server console
- if (cvar("decors"))
- maxdecors = cvar("decors");
- if (maxdecors < 1)
- maxdecors = 1;
-};
Modified: trunk/data/qcsrc/server/progs.src
===================================================================
--- trunk/data/qcsrc/server/progs.src 2009-01-22 12:32:02 UTC (rev 5631)
+++ trunk/data/qcsrc/server/progs.src 2009-01-22 12:34:10 UTC (rev 5632)
@@ -71,7 +71,6 @@
//animation.qc
g_world.qc
-g_decors.qc
g_casings.qc
t_jumppads.qc
More information about the nexuiz-commits
mailing list