nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-22 11:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Server: Restore Box Glow for FTE, fix Power-Up timeout

Browse source
This commit is contained in:
moto 2022-05-09 15:47:40 -04:00
parent 0ccb6357f0
commit 4d5363b08f
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/server/entities/machines.qc
View file

@ -1383,7 +1383,6 @@ void() findboxspot =
newspot.angles_y += 90; newspot.angles_y += 90;
// Spawn the Box Glow if permitted // Spawn the Box Glow if permitted
#ifndef PC
if (!(self.owner.spawnflags & 2)) if (!(self.owner.spawnflags & 2))
{ {
local entity g; local entity g;
@ -1393,7 +1392,6 @@ void() findboxspot =
setorigin(g,newspot.origin); setorigin(g,newspot.origin);
g.angles = newspot.angles; g.angles = newspot.angles;
} }
#endif
// Remove teddy // Remove teddy
remove(self); remove(self);
@ -1732,7 +1730,6 @@ void() mystery_box =
setmodel (self, "models/machines/mystery.mdl"); setmodel (self, "models/machines/mystery.mdl");
setsize (self, VEC_HULL2_MIN, VEC_HULL2_MAX); setsize (self, VEC_HULL2_MIN, VEC_HULL2_MAX);
#ifndef PC
if (!(self.spawnflags & 2)) if (!(self.spawnflags & 2))
{ {
local entity g; local entity g;
@ -1742,7 +1739,6 @@ void() mystery_box =
setorigin(g,self.origin); setorigin(g,self.origin);
g.angles = self.angles; g.angles = self.angles;
} }
#endif
self.touch = mystery_touch; self.touch = mystery_touch;
boxOrigin = self.origin; boxOrigin = self.origin;

14
source/server/entities/powerups.qc
View file

@ -243,7 +243,6 @@ void(vector org) PU_NukeExplode =
setorigin(explosion, org); setorigin(explosion, org);
explosion.think = PU_NukeExplosionThink; explosion.think = PU_NukeExplosionThink;
explosion.nextthink = time + 0.10; explosion.nextthink = time + 0.10;
explosion.ltime = time + 3;
} }
// //
@ -457,10 +456,6 @@ void() PU_Flash =
{ {
// Toggle the Power-Up model on and off // Toggle the Power-Up model on and off
if (self.hitcount % 2) { if (self.hitcount % 2) {
// Store model
if (!self.oldmodel)
self.oldmodel = self.model;
// Disappear // Disappear
setmodel(self, ""); setmodel(self, "");
} }
@ -584,9 +579,7 @@ void(vector where, float type) Spawn_Powerup =
sparkle.origin = where; sparkle.origin = where;
setorigin(sparkle, sparkle.origin); setorigin(sparkle, sparkle.origin);
#ifndef PC
setmodel(sparkle,"models/sprites/sprkle.spr"); setmodel(sparkle,"models/sprites/sprkle.spr");
#endif
sparkle.think = PU_SparkleThink; sparkle.think = PU_SparkleThink;
sparkle.nextthink = time + 0.1; sparkle.nextthink = time + 0.1;
@ -605,9 +598,14 @@ void(vector where, float type) Spawn_Powerup =
} }
// Assign the Power-Up model and sound // Assign the Power-Up model and sound
setmodel(powerup, PU_ModelPath(powerup.walktype)); powerup.model = powerup.oldmodel = PU_ModelPath(powerup.walktype);
setmodel(powerup, powerup.model);
powerup.powerup_vo = PU_VoiceoverPath(powerup.walktype); powerup.powerup_vo = PU_VoiceoverPath(powerup.walktype);
// Time out
powerup.think = PU_Flash;
powerup.nextthink = time + 15;
// Finally assign collision function // Finally assign collision function
powerup.touch = PU_Touch; powerup.touch = PU_Touch;