Get rid of obsolete routines, move the code handling buy/rescue/bomb zone triggers into the new RunClientCommand() player method.
This commit is contained in:
parent
8ce747c212
commit
2f9791b39e
|
@ -7,7 +7,7 @@ BASEGAME cstrike
|
||||||
|
|
||||||
// you don't really want to change these
|
// you don't really want to change these
|
||||||
RTCBROKER master.frag-net.com:27950
|
RTCBROKER master.frag-net.com:27950
|
||||||
PROTOCOLNAME "FreeHL"
|
PROTOCOLNAME "Nuclide"
|
||||||
MAINCONFIG game.cfg
|
MAINCONFIG game.cfg
|
||||||
DOWNLOADSURL "http://www.frag-net.com/dl/packages"
|
DOWNLOADSURL "http://www.frag-net.com/dl/packages"
|
||||||
|
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2016-2020 Marco Cawthorne <marco@icculus.org>
|
|
||||||
*
|
|
||||||
* Permission to use, copy, modify, and distribute this software for any
|
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
|
||||||
* copyright notice and this permission notice appear in all copies.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
||||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
Game_RunClientCommand(void)
|
|
||||||
{
|
|
||||||
player pl = (player)self;
|
|
||||||
|
|
||||||
pl.gflags &= ~GF_BUYZONE;
|
|
||||||
pl.gflags &= ~GF_RESCUEZONE;
|
|
||||||
pl.gflags &= ~GF_BOMBZONE;
|
|
||||||
|
|
||||||
pl.Physics_Run();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
SV_SendChat(entity sender, string msg, entity eEnt, float fType)
|
|
||||||
{
|
|
||||||
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
|
|
||||||
WriteByte(MSG_MULTICAST, fType == 0 ? EV_CHAT:EV_CHAT_TEAM);
|
|
||||||
WriteByte(MSG_MULTICAST, num_for_edict(sender) - 1);
|
|
||||||
WriteByte(MSG_MULTICAST, sender.team);
|
|
||||||
WriteString(MSG_MULTICAST, msg);
|
|
||||||
if (eEnt) {
|
|
||||||
msg_entity = eEnt;
|
|
||||||
multicast([0,0,0], MULTICAST_ONE);
|
|
||||||
} else {
|
|
||||||
multicast([0,0,0], MULTICAST_ALL);
|
|
||||||
}
|
|
||||||
|
|
||||||
localcmd(sprintf("echo [SERVER] %s: %s\n", sender.netname, msg));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Game_ParseClientCommand(string cmd)
|
|
||||||
{
|
|
||||||
tokenize(cmd);
|
|
||||||
|
|
||||||
if (argv(1) == "timeleft") {
|
|
||||||
string msg;
|
|
||||||
string timestring;
|
|
||||||
float timeleft;
|
|
||||||
timeleft = cvar("mp_timelimit") - (time / 60);
|
|
||||||
timestring = Util_TimeToString(timeleft);
|
|
||||||
msg = sprintf("we have %s minutes remaining", timestring);
|
|
||||||
bprint(PRINT_CHAT, msg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (argv(0) == "say") {
|
|
||||||
SV_SendChat(self, argv(1), world, 0);
|
|
||||||
return;
|
|
||||||
} else if (argv(0) == "say_team") {
|
|
||||||
entity a;
|
|
||||||
for (a = world; (a = find(a, ::classname, "player"));) {
|
|
||||||
if (a.team == self.team) {
|
|
||||||
SV_SendChat(self, argv(1), a, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clientcommand(self, cmd);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Game_SetNewParms(void)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
|
@ -22,7 +22,6 @@ defs.h
|
||||||
../shared/include.src
|
../shared/include.src
|
||||||
|
|
||||||
player.qc
|
player.qc
|
||||||
../../../valve/src/server/spectator.qc
|
|
||||||
|
|
||||||
hostage_entity.qc
|
hostage_entity.qc
|
||||||
armoury_entity.qc
|
armoury_entity.qc
|
||||||
|
@ -46,7 +45,6 @@ gamerules_singleplayer.qc
|
||||||
gamerules_multiplayer.qc
|
gamerules_multiplayer.qc
|
||||||
|
|
||||||
radio.qc
|
radio.qc
|
||||||
client.qc
|
|
||||||
ammo.qc
|
ammo.qc
|
||||||
buy.qc
|
buy.qc
|
||||||
server.qc
|
server.qc
|
||||||
|
|
|
@ -177,16 +177,14 @@ class player:NSClientPlayer
|
||||||
int cs_cross_deltadist;
|
int cs_cross_deltadist;
|
||||||
float cs_crosshairdistance;
|
float cs_crosshairdistance;
|
||||||
|
|
||||||
//virtual void(void) draw;
|
|
||||||
//virtual float() predraw;
|
|
||||||
//virtual void(void) postdraw;
|
|
||||||
virtual void UpdatePlayerAttachments(bool);
|
virtual void UpdatePlayerAttachments(bool);
|
||||||
virtual void(float, float) ReceiveEntity;
|
virtual void ReceiveEntity(float, float);
|
||||||
virtual void(void) PredictPreFrame;
|
virtual void PredictPreFrame(void);
|
||||||
virtual void(void) PredictPostFrame;
|
virtual void PredictPostFrame(void);
|
||||||
#else
|
#else
|
||||||
virtual void(void) EvaluateEntity;
|
virtual void RunClientCommand(void);
|
||||||
virtual float(entity, float) SendEntity;
|
virtual void EvaluateEntity(void);
|
||||||
|
virtual float SendEntity(entity, float);
|
||||||
|
|
||||||
int charmodel;
|
int charmodel;
|
||||||
int money;
|
int money;
|
||||||
|
@ -493,6 +491,14 @@ player::PredictPostFrame(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
void
|
||||||
|
player::RunClientCommand(void)
|
||||||
|
{
|
||||||
|
gflags &= ~GF_BUYZONE;
|
||||||
|
gflags &= ~GF_RESCUEZONE;
|
||||||
|
gflags &= ~GF_BOMBZONE;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
player::EvaluateEntity(void)
|
player::EvaluateEntity(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue