WITHSELF(this, PutClientInServer());
}
-void PutObserverInServer();
+void PutObserverInServer(entity this);
void ClientDisconnect();
STATIC_METHOD(Client, Remove, void(Client this))
{
precache_model(modelname);
_setmodel(e, modelname);
- player_setupanimsformodel();
+ player_setupanimsformodel(e);
if(!autocvar_g_debug_globalsounds)
UpdatePlayerSounds(e);
}
void FixPlayermodel(entity player);
/** putting a client as observer in the server */
-void PutObserverInServer()
+void PutObserverInServer(entity this)
{
- SELFPARAM();
bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this);
PlayerState_detach(this);
this.alivetime = 0;
}
- if (this.vehicle) vehicles_exit(VHEF_RELEASE);
+ if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
WaypointSprite_PlayerDead(this);
defaultskin = autocvar_sv_defaultplayerskin;
}
- MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin);
+ MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin, player);
defaultmodel = M_ARGV(0, string);
defaultskin = M_ARGV(1, int);
/** Called when a client spawns in the server */
void PutClientInServer()
{
- SELFPARAM();
+ SELFPARAM(); // needed for engine functions
if (IS_BOT_CLIENT(this)) {
TRANSMUTE(Player, this);
} else if (IS_REAL_CLIENT(this)) {
MUTATOR_CALLHOOK(PutClientInServer, this);
if (IS_OBSERVER(this)) {
- PutObserverInServer();
+ PutObserverInServer(this);
} else if (IS_PLAYER(this)) {
PlayerState_attach(this);
accuracy_resend(this);
=============
*/
void SetChangeParms ()
-{SELFPARAM();
+{SELFPARAM(); // needed for engine functions
// save parms for level change
parm1 = this.parm_idlesince - time;
{
if(blockSpectators)
Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);
- WITHSELF(this, PutObserverInServer());
+ PutObserverInServer(this);
}
else
WITHSELF(this, SV_ChangeTeam(this.killindicator_teamchange - 1));
this.killindicator_teamchange = 0;
}
-void ClientKill_Now()
-{SELFPARAM();
+void ClientKill_Now(entity this)
+{
if(this.vehicle)
{
- vehicles_exit(VHEF_RELEASE);
+ vehicles_exit(this.vehicle, VHEF_RELEASE);
if(!this.killindicator_teamchange)
{
this.vehicle_health = -1;
if(this.cnt <= 0)
{
- WITHSELF(this.owner, ClientKill_Now());
+ ClientKill_Now(this.owner);
return;
}
else if(g_cts && this.health == 1) // health == 1 means that it's silent
}
float clientkilltime;
-void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 = spec
-{SELFPARAM();
+void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change, -1 = auto, -2 = spec
+{
float killtime;
float starttime;
entity e;
if(killtime <= 0 || !IS_PLAYER(this) || IS_DEAD(this))
{
- ClientKill_Now();
+ ClientKill_Now(this);
}
else
{
}
void ClientKill ()
-{SELFPARAM();
+{SELFPARAM(); // needed for engine functions
if(gameover) return;
if(this.player_blocked) return;
if(STAT(FROZEN, this)) return;
- ClientKill_TeamChange(0);
+ ClientKill_TeamChange(this, 0);
}
void FixClientCvars(entity e)
=============
*/
void ClientPreConnect ()
-{SELFPARAM();
+{SELFPARAM(); // needed for engine functions
if(autocvar_sv_eventlog)
{
GameLogEcho(sprintf(":connect:%d:%d:%s",
*/
void ClientConnect()
{
- SELFPARAM();
+ SELFPARAM(); // needed for engine functions
if (Ban_MaybeEnforceBanOnce(this)) return;
assert(!IS_CLIENT(this), return);
this.flags |= FL_CLIENT;
void ReadyCount();
void ClientDisconnect()
{
- SELFPARAM();
+ SELFPARAM(); // needed for engine functions
assert(IS_CLIENT(this), return);
PlayerStats_GameReport_FinalizePlayer(this);
- if (this.vehicle) vehicles_exit(VHEF_RELEASE);
+ if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
if (this.active_minigame) part_minigame(this);
if (IS_PLAYER(this)) Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1);
if (this.chatbubbleentity) remove(this.chatbubbleentity);
if (this.killindicator) remove(this.killindicator);
- WaypointSprite_PlayerGone();
+ WaypointSprite_PlayerGone(this);
bot_relinkplayerlist();
}
-void UpdateChatBubble()
-{SELFPARAM();
+void UpdateChatBubble(entity this)
+{
if (this.alpha < 0)
return;
// spawn a chatbubble entity if needed
else this.colormod = '1 1 1';
}*/
-void respawn()
-{SELFPARAM();
+void respawn(entity this)
+{
if(this.alpha >= 0 && autocvar_g_respawn_ghosts)
{
this.solid = SOLID_NOT;
CopyBody(this, 1);
this.effects |= EF_NODRAW; // prevent another CopyBody
- PutClientInServer();
+ WITHSELF(this, PutClientInServer());
}
-void play_countdown(float finished, Sound samp)
-{SELFPARAM();
+void play_countdown(entity this, float finished, Sound samp)
+{
TC(Sound, samp);
if(IS_REAL_CLIENT(this))
if(floor(finished - time - frametime) != floor(finished - time))
sound (this, CH_INFO, samp, VOL_BASE, ATTEN_NORM);
}
-void player_powerups ()
-{SELFPARAM();
+void player_powerups(entity this)
+{
// add a way to see what the items were BEFORE all of these checks for the mutator hook
int items_prev = this.items;
{
if (this.items & ITEM_Strength.m_itemid)
{
- play_countdown(this.strength_finished, SND_POWEROFF);
+ play_countdown(this, this.strength_finished, SND_POWEROFF);
this.effects = this.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > this.strength_finished)
{
}
if (this.items & ITEM_Shield.m_itemid)
{
- play_countdown(this.invincible_finished, SND_POWEROFF);
+ play_countdown(this, this.invincible_finished, SND_POWEROFF);
this.effects = this.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > this.invincible_finished)
{
}
else
{
- play_countdown(this.superweapons_finished, SND_POWEROFF);
+ play_countdown(this, this.superweapons_finished, SND_POWEROFF);
if (time > this.superweapons_finished)
{
this.items = this.items - (this.items & IT_SUPERWEAPON);
return current;
}
-void player_regen ()
-{SELFPARAM();
+void player_regen(entity this)
+{
float max_mod, regen_mod, rot_mod, limit_mod;
max_mod = regen_mod = rot_mod = limit_mod = 1;
- regen_mod_max = max_mod;
- regen_mod_regen = regen_mod;
- regen_mod_rot = rot_mod;
- regen_mod_limit = limit_mod;
-
- regen_health = autocvar_g_balance_health_regen;
- regen_health_linear = autocvar_g_balance_health_regenlinear;
- regen_health_rot = autocvar_g_balance_health_rot;
- regen_health_rotlinear = autocvar_g_balance_health_rotlinear;
- regen_health_stable = autocvar_g_balance_health_regenstable;
- regen_health_rotstable = autocvar_g_balance_health_rotstable;
- if(!MUTATOR_CALLHOOK(PlayerRegen))
+
+ float regen_health = autocvar_g_balance_health_regen;
+ float regen_health_linear = autocvar_g_balance_health_regenlinear;
+ float regen_health_rot = autocvar_g_balance_health_rot;
+ float regen_health_rotlinear = autocvar_g_balance_health_rotlinear;
+ float regen_health_stable = autocvar_g_balance_health_regenstable;
+ float regen_health_rotstable = autocvar_g_balance_health_rotstable;
+ bool mutator_returnvalue = MUTATOR_CALLHOOK(PlayerRegen, this, max_mod, regen_mod, rot_mod, limit_mod, regen_health, regen_health_linear, regen_health_rot,
+ regen_health_rotlinear, regen_health_stable, regen_health_rotstable);
+ max_mod = M_ARGV(1, float);
+ regen_mod = M_ARGV(2, float);
+ rot_mod = M_ARGV(3, float);
+ limit_mod = M_ARGV(4, float);
+ regen_health = M_ARGV(5, float);
+ regen_health_linear = M_ARGV(6, float);
+ regen_health_rot = M_ARGV(7, float);
+ regen_health_rotlinear = M_ARGV(8, float);
+ regen_health_stable = M_ARGV(9, float);
+ regen_health_rotstable = M_ARGV(10, float);
+
+
+ if(!mutator_returnvalue)
if(!STAT(FROZEN, this))
{
float mina, maxa, limith, limita;
limith = autocvar_g_balance_health_limit;
limita = autocvar_g_balance_armor_limit;
- max_mod = regen_mod_max;
- regen_mod = regen_mod_regen;
- rot_mod = regen_mod_rot;
- limit_mod = regen_mod_limit;
-
regen_health_rotstable = regen_health_rotstable * max_mod;
regen_health_stable = regen_health_stable * max_mod;
limith = limith * limit_mod;
if(this.health < 1)
{
if(this.vehicle)
- vehicles_exit(VHEF_RELEASE);
+ vehicles_exit(this.vehicle, VHEF_RELEASE);
if(this.event_damage)
this.event_damage(this, this, this, 1, DEATH_ROT.m_id, this.origin, '0 0 0');
}
}
bool zoomstate_set;
-void SetZoomState(float z)
-{SELFPARAM();
+void SetZoomState(entity this, float z)
+{
if(z != this.zoomstate)
{
this.zoomstate = z;
zoomstate_set = true;
}
-void GetPressedKeys()
+void GetPressedKeys(entity this)
{
- SELFPARAM();
- MUTATOR_CALLHOOK(GetPressedKeys);
+ MUTATOR_CALLHOOK(GetPressedKeys, this);
int keys = this.pressedkeys;
keys = BITSET(keys, KEY_FORWARD, this.movement.x > 0);
keys = BITSET(keys, KEY_BACKWARD, this.movement.x < 0);
this.fixangle = true;
setorigin(this, spectatee.origin);
setsize(this, spectatee.mins, spectatee.maxs);
- SetZoomState(spectatee.zoomstate);
+ SetZoomState(this, spectatee.zoomstate);
anticheat_spectatecopy(this, spectatee);
this.hud = spectatee.hud;
}
}
-bool SpectateUpdate()
-{SELFPARAM();
+bool SpectateUpdate(entity this)
+{
if(!this.enemy)
return false;
return true;
}
-bool SpectateSet()
-{SELFPARAM();
+bool SpectateSet(entity this)
+{
if(!IS_PLAYER(this.enemy))
return false;
this.movetype = MOVETYPE_NONE;
accuracy_resend(this);
- if(!SpectateUpdate())
- PutObserverInServer();
+ if(!SpectateUpdate(this))
+ PutObserverInServer(this);
return true;
}
-void SetSpectatee(entity player, entity spectatee)
+void SetSpectatee(entity this, entity spectatee)
{
- entity old_spectatee = player.enemy;
+ entity old_spectatee = this.enemy;
- player.enemy = spectatee;
+ this.enemy = spectatee;
// WEAPONTODO
// these are required to fix the spectator bug with arc
if(old_spectatee && old_spectatee.arc_beam) { old_spectatee.arc_beam.SendFlags |= ARC_SF_SETTINGS; }
- if(player.enemy && player.enemy.arc_beam) { player.enemy.arc_beam.SendFlags |= ARC_SF_SETTINGS; }
+ if(this.enemy && this.enemy.arc_beam) { this.enemy.arc_beam.SendFlags |= ARC_SF_SETTINGS; }
}
-bool Spectate(entity pl)
-{SELFPARAM();
+bool Spectate(entity this, entity pl)
+{
if(MUTATOR_CALLHOOK(SpectateSet, this, pl))
return false;
pl = M_ARGV(1, entity);
SetSpectatee(this, pl);
- return SpectateSet();
+ return SpectateSet(this);
}
-bool SpectateNext()
-{SELFPARAM();
+bool SpectateNext(entity this)
+{
other = find(this.enemy, classname, STR_PLAYER);
if (MUTATOR_CALLHOOK(SpectateNext, this, other))
if(other) { SetSpectatee(this, other); }
- return SpectateSet();
+ return SpectateSet(this);
}
-bool SpectatePrev()
-{SELFPARAM();
+bool SpectatePrev(entity this)
+{
// NOTE: chain order is from the highest to the lower entnum (unlike find)
other = findchain(classname, STR_PLAYER);
if (!other) // no player
}
SetSpectatee(this, other);
- return SpectateSet();
+ return SpectateSet(this);
}
/*
Update a respawn countdown display.
=============
*/
-void ShowRespawnCountdown()
-{SELFPARAM();
+void ShowRespawnCountdown(entity this)
+{
float number;
if(!IS_DEAD(this)) // just respawned?
return;
}
}
-void LeaveSpectatorMode()
-{SELFPARAM();
+void LeaveSpectatorMode(entity this)
+{
if(this.caplayer)
return;
if(nJoinAllowed(this, this))
Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_PREVENT_JOIN);
- PutClientInServer();
+ WITHSELF(this, PutClientInServer());
if(IS_PLAYER(this)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), this.netname); }
}
* Checks whether the client is an observer or spectator, if so, he will get kicked after
* g_maxplayers_spectator_blocktime seconds
*/
-void checkSpectatorBlock()
-{SELFPARAM();
+void checkSpectatorBlock(entity this)
+{
if(IS_SPEC(this) || IS_OBSERVER(this))
if(!this.caplayer)
if(IS_REAL_CLIENT(this))
}
}
-void ObserverThink()
-{SELFPARAM();
+void ObserverThink(entity this)
+{
if ( this.impulse )
{
MinigameImpulse(this, this.impulse);
this.flags |= FL_SPAWNING;
} else if(PHYS_INPUT_BUTTON_ATCK(this) && !this.version_mismatch) {
this.flags &= ~FL_JUMPRELEASED;
- if(SpectateNext()) {
+ if(SpectateNext(this)) {
TRANSMUTE(Spectator, this);
}
} else {
if(this.flags & FL_SPAWNING)
{
this.flags &= ~FL_SPAWNING;
- LeaveSpectatorMode();
+ LeaveSpectatorMode(this);
return;
}
}
}
}
-void SpectatorThink()
-{SELFPARAM();
+void SpectatorThink(entity this)
+{
if ( this.impulse )
{
if(MinigameImpulse(this, this.impulse))
this.flags |= FL_SPAWNING;
} else if(PHYS_INPUT_BUTTON_ATCK(this) || this.impulse == 10 || this.impulse == 15 || this.impulse == 18 || (this.impulse >= 200 && this.impulse <= 209)) {
this.flags &= ~FL_JUMPRELEASED;
- if(SpectateNext()) {
+ if(SpectateNext(this)) {
TRANSMUTE(Spectator, this);
} else {
TRANSMUTE(Observer, this);
- PutClientInServer();
+ WITHSELF(this, PutClientInServer());
}
this.impulse = 0;
} else if(this.impulse == 12 || this.impulse == 16 || this.impulse == 19 || (this.impulse >= 220 && this.impulse <= 229)) {
this.flags &= ~FL_JUMPRELEASED;
- if(SpectatePrev()) {
+ if(SpectatePrev(this)) {
TRANSMUTE(Spectator, this);
} else {
TRANSMUTE(Observer, this);
- PutClientInServer();
+ WITHSELF(this, PutClientInServer());
}
this.impulse = 0;
} else if (PHYS_INPUT_BUTTON_ATCK2(this)) {
this.flags &= ~FL_JUMPRELEASED;
TRANSMUTE(Observer, this);
- PutClientInServer();
+ WITHSELF(this, PutClientInServer());
} else {
- if(!SpectateUpdate())
- PutObserverInServer();
+ if(!SpectateUpdate(this))
+ PutObserverInServer(this);
}
} else {
if (!(PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_ATCK2(this))) {
if(this.flags & FL_SPAWNING)
{
this.flags &= ~FL_SPAWNING;
- LeaveSpectatorMode();
+ LeaveSpectatorMode(this);
return;
}
}
- if(!SpectateUpdate())
- PutObserverInServer();
+ if(!SpectateUpdate(this))
+ PutObserverInServer(this);
}
this.flags |= FL_CLIENT | FL_NOTARGET;
}
void vehicles_enter (entity pl, entity veh);
-void PlayerUseKey()
-{SELFPARAM();
+void PlayerUseKey(entity this)
+{
if (!IS_PLAYER(this))
return;
{
if(!gameover)
{
- vehicles_exit(VHEF_NORMAL);
+ vehicles_exit(this.vehicle, VHEF_NORMAL);
return;
}
}
}
// a use key was pressed; call handlers
- MUTATOR_CALLHOOK(PlayerUseKey);
+ MUTATOR_CALLHOOK(PlayerUseKey, this);
}
.int items_added;
void PlayerPreThink ()
{
- SELFPARAM();
+ SELFPARAM(); // needed for engine functions
WarpZone_PlayerPhysics_FixVAngle(this);
STAT(GAMESTARTTIME, this) = game_starttime;
if (blockSpectators && frametime) {
// WORKAROUND: only use dropclient in server frames (frametime set).
// Never use it in cl_movement frames (frametime zero).
- checkSpectatorBlock();
+ checkSpectatorBlock(this);
}
zoomstate_set = false;
if (this.health < 1)
{
if (this.vehicle)
- vehicles_exit(VHEF_RELEASE);
- this.event_damage(this, this, this.frozen_by, 1, DEATH_NADE_ICE_FREEZE.m_id, this.origin, '0 0 0');
+ vehicles_exit(this.vehicle, VHEF_RELEASE);
+ if(this.event_damage)
+ this.event_damage(this, this, this.frozen_by, 1, DEATH_NADE_ICE_FREEZE.m_id, this.origin, '0 0 0');
}
else if (this.revive_progress <= 0)
Unfreeze(this);
}
- MUTATOR_CALLHOOK(PlayerPreThink);
+ MUTATOR_CALLHOOK(PlayerPreThink, this);
if(autocvar_g_vehicles_enter)
if(time > this.last_vehiclecheck)
if(!this.cvar_cl_newusekeysupported) // FIXME remove this - it was a stupid idea to begin with, we can JUST use the button
{
if(PHYS_INPUT_BUTTON_USE(this) && !this.usekeypressed)
- PlayerUseKey();
+ PlayerUseKey(this);
this.usekeypressed = PHYS_INPUT_BUTTON_USE(this);
}
PrintWelcomeMessage(this);
if (IS_PLAYER(this)) {
- CheckRules_Player();
+ CheckRules_Player(this);
if (intermission_running) {
- IntermissionThink();
+ IntermissionThink(this);
return;
}
this.fixangle = true;
}
- if (frametime) player_powerups();
+ if (frametime) player_powerups(this);
if (IS_DEAD(this)) {
if (this.personal && g_race_qualifying) {
if (time > this.respawn_time) {
STAT(RESPAWN_TIME, this) = this.respawn_time = time + 1; // only retry once a second
- respawn();
+ respawn(this);
this.impulse = CHIMPULSE_SPEEDRUN.impulse;
}
} else {
- if (frametime) player_anim();
+ if (frametime) player_anim(this);
bool button_pressed = (PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this) || PHYS_INPUT_BUTTON_ATCK2(this) || PHYS_INPUT_BUTTON_HOOK(this) || PHYS_INPUT_BUTTON_USE(this));
if (this.deadflag == DEAD_DYING) {
if (time > this.respawn_time) {
this.respawn_time = time + 1; // only retry once a second
this.respawn_time_max = this.respawn_time;
- respawn();
+ respawn(this);
}
}
- ShowRespawnCountdown();
+ ShowRespawnCountdown(this);
if (this.respawn_flags & RESPAWN_SILENT)
STAT(RESPAWN_TIME, this) = 0;
this.items |= this.items_added;
}
- player_regen();
+ player_regen(this);
// WEAPONTODO: Add a weapon request for this
// rot vortex charge to the charge limit
if (WEP_CVAR(vortex, charge_rot_rate) && this.vortex_charge > WEP_CVAR(vortex, charge_limit) && this.vortex_charge_rottime < time)
this.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);
- if (frametime) player_anim();
+ if (frametime) player_anim(this);
// secret status
secrets_setstatus(this);
this.dmg_team = max(0, this.dmg_team - autocvar_g_teamdamage_resetspeed * frametime);
}
else if (gameover) {
- if (intermission_running) IntermissionThink();
+ if (intermission_running) IntermissionThink(this);
return;
}
else if (IS_OBSERVER(this)) {
- ObserverThink();
+ ObserverThink(this);
}
else if (IS_SPEC(this)) {
- SpectatorThink();
+ SpectatorThink(this);
}
// WEAPONTODO: Add weapon request for this
if (!zoomstate_set) {
- SetZoomState(
+ SetZoomState(this,
PHYS_INPUT_BUTTON_ZOOM(this) || PHYS_INPUT_BUTTON_ZOOMSCRIPT(this)
|| (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_VORTEX)
|| (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0)
.float idlekick_lasttimeleft;
void PlayerPostThink ()
{
- SELFPARAM();
+ SELFPARAM(); // needed for engine functions
if (sv_maxidle > 0)
if (frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).
if (IS_REAL_CLIENT(this))
}
}
- CheatFrame();
+ CheatFrame(this);
//CheckPlayerJump();
if (IS_PLAYER(this)) {
DrownPlayer(this);
- CheckRules_Player();
- UpdateChatBubble();
+ CheckRules_Player(this);
+ UpdateChatBubble(this);
if (this.impulse) ImpulseCommands(this);
if (intermission_running) return; // intermission or finale
- GetPressedKeys();
+ GetPressedKeys(this);
}
if (this.waypointsprite_attachedforcarrier) {
projects / xonotic / xonotic-data.pk3dir.git / blobdiff