Merge pull request #29 from ScatterBox/main

This commit is contained in:
Ian 2023-01-23 19:30:52 -05:00 committed by GitHub
commit f2404ef58b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 108 deletions

View file

@ -52,9 +52,9 @@ void() PutClientInServer; // call after setting the parm1... parms
void() ClientDisconnect;
void() SetNewParms; // called when a client first connects to
void() SetChangeParms; // call to set parms for self so they can
//void() ParseClientCommand; // special command calls
//string CMD_STRING;
//void() Soft_Restart;
void() ParseClientCommand; // special command calls
string CMD_STRING;
void() Soft_Restart;
void end_sys_globals; // flag for structure dumping
.float modelindex; // *** model index in the precached list
@ -489,5 +489,3 @@ string(float num)
#define FILE_READ 0
#define FILE_APPEND 1
#define FILE_WRITE 2
string CMD_STRING;

View file

@ -28,113 +28,10 @@
// Dummys that should be here
void print(string s) = {};
void(vector o, vector d, float color, float count) particle = {};
#define MOVE_HITMODEL 0
void() LoadWaypointData = {};
void() Soft_Restart = {
/*
entity who, oldself, doors, box, revive, endgame;
self = find(world,classname,"player");
oldself = self;
//remove all zombies
who = find(world,classname,"ai_zombie");
while(who != world)
{
if(who.health)
{
self = who;
self.th_die();
remove(self); //so dead bodies don't remain
self = oldself;
}
who = find(who,classname,"ai_zombie");
}
//repair all windows
for(float i = 0; i < wincnt; i++) {
if (windows[i].health != -10) {
windows[i].health = 6;
windows[i].frame = 0;
}
}
//close doors
doors = findfloat(world, isopen, 1);
while (doors) {
if (doors.isopen)
reclose_door(doors);
doors = findfloat(world, isopen, 1);
}
//revert mystery box
box = find(world, classname, "mystery");
if (box) {
box.boxstatus = 0;
box.frame = 0;
box.goaldummy.frame = 0;
boxCount = 0;
box.origin = boxOrigin;
//self = box;
if (box.boxweapon)
remove(box.boxweapon);
//mystery_box();
//self = oldself;
}
//reset quick revive
revive = find(world, classname, "perk_revive");
if (revive) {
setmodel(revive, "models/machines/quick_revive.mdl");
oldself.revivesoda = 0;
}
//reset buyable ending
endgame = find(world, classname, "func_ending");
if (endgame) {
endgame.activated = false;
}
//reset teleporters
local entity tp;
tp = find(world, classname, "func_teleporter_entrance");
if (tp) {
tp.activated = false;
tp.isLinked = false;
tp.cooldown = false;
tp.waitLink = false;
tp.think = SUB_Null;
}
local entity power;
power = find(world, classname, "power_switch");
if(power) {
isPowerOn = false;
power.frame = 0;
}
self = oldself;
self.downed = 0;
game_over = false;
rounds = 0;
self.score = 0;
self.points = 0;
self.secondaryweapon = 0;
InitRounds();
self.isspec = false;
PutClientInServer();
*/
}
void () CL_SendWeaponFire =
{
float return_time;