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

SERVER: Fix Soft_Restart not cleaning up barricades

Browse source
This commit is contained in:
Steam Deck User 2023-03-06 18:09:43 -05:00
parent 3df23f64c1
commit 7d7c287292
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/server/utilities/game_restart.qc
View file

@ -77,7 +77,7 @@ void() GameRestart_CleanWallSummons =
entity tempe;
tempe = find(world, classname, "weapon_wall");
while(tempe != world) {
while (tempe != world) {
// We store the world model with .enemy for.. some reason..
if (tempe.enemy)
remove(tempe.enemy);
@ -86,6 +86,25 @@ void() GameRestart_CleanWallSummons =
}
}
//
// GameRestart_RepairBarricades()
// Resets the barricade health state.
//
void() GameRestart_RepairBarricades =
{
entity tempe;
tempe = find(world, classname, "window");
while (tempe != world) {
if (tempe.health != -10) {
tempe.health = 6;
tempe.frame = 0;
}
tempe = find(tempe, classname, "window");
}
}
//moto -- put this here because it keeps soft_restart somewhat clean..
void(entity door) reclose_door = {
entity oldself;
@ -104,7 +123,7 @@ void(entity door) reclose_door = {
}
void() Soft_Restart = {
entity who, oldself, doors, box, revive, endgame, barricades;
entity who, oldself, doors, box, revive, endgame;
self = find(world,classname,"player");
oldself = self;
@ -134,17 +153,7 @@ void() Soft_Restart = {
GameRestart_CleanPowerUps();
GameRestart_CleanWallSummons();
//repair all windows
barricades = find(world, classname, "item_barricade");
while(barricades != world) {
if (barricades.health != -10) {
barricades.health = 6;
barricades.frame = 0;
}
barricades = find(barricades, classname, "item_barricade");
}
GameRestart_RepairBarricades();
//close doors
doors = findfloat(world, isopen, 1);