X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=a604055b8d8ce1a11dd66f3c2246f434fde7aa93;hp=bd9c46a9b09de09f634d092f47fe4f6c3f91279f;hb=7223a5e197781dd6d780c2623ec9483dd407dcc0;hpb=a95e5467c6e1e20a886b19bd6464ec2b005ff53f diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index bd9c46a9b..5d739ac7b 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -3,7 +3,6 @@ #include "anticheat.qh" #include "cl_impulse.qh" #include "cl_player.qh" -#include "ent_cs.qh" #include "ipban.qh" #include "miscfunctions.qh" #include "portals.qh" @@ -23,13 +22,20 @@ #include "bot/bot.qh" #include "bot/navigation.qh" +#include "../common/ent_cs.qh" +#include + +#include + +#include "../common/triggers/teleporters.qh" + #include "../common/vehicles/all.qh" #include "weapons/hitplot.qh" #include "weapons/weaponsystem.qh" #include "../common/net_notice.qh" -#include "../common/physics.qh" +#include "../common/physics/player.qh" #include "../common/items/all.qc" @@ -45,65 +51,69 @@ #include "../common/monsters/sv_monsters.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/server.qh" +STATIC_METHOD(Client, Add, void(Client this, int _team)) +{ + WITH(entity, self, this, ClientConnect()); + TRANSMUTE(Player, this); + this.frame = 12; // 7 + this.team = _team; + WITH(entity, self, this, PutClientInServer()); +} -void send_CSQC_teamnagger() { - WriteByte(MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte(MSG_BROADCAST, TE_CSQC_TEAMNAGGER); +void PutObserverInServer(); +void ClientDisconnect(); + +STATIC_METHOD(Client, Remove, void(Client this)) +{ + TRANSMUTE(Observer, this); + WITH(entity, self, this, PutClientInServer(); ClientDisconnect()); } -float ClientData_Send(entity to, int sf) -{SELFPARAM(); - if(to != self.owner) - { - error("wtf"); - return false; - } +void send_CSQC_teamnagger() { + WriteHeader(MSG_BROADCAST, TE_CSQC_TEAMNAGGER); +} - entity e; +bool ClientData_Send(entity this, entity to, int sf) +{ + assert(to == this.owner, return false); - e = to; - if(IS_SPEC(to)) - e = to.enemy; + entity e = to; + if (IS_SPEC(e)) e = e.enemy; sf = 0; + if (e.race_completed) sf |= 1; // forced scoreboard + if (to.spectatee_status) sf |= 2; // spectator ent number follows + if (e.zoomstate) sf |= 4; // zoomed + if (e.porto_v_angle_held) sf |= 8; // angles held - if(e.race_completed) - sf |= 1; // forced scoreboard - if(to.spectatee_status) - sf |= 2; // spectator ent number follows - if(e.zoomstate) - sf |= 4; // zoomed - if(e.porto_v_angle_held) - sf |= 8; // angles held - - WriteByte(MSG_ENTITY, ENT_CLIENT_CLIENTDATA); + WriteHeader(MSG_ENTITY, ENT_CLIENT_CLIENTDATA); WriteByte(MSG_ENTITY, sf); - if(sf & 2) + if (sf & 2) + { WriteByte(MSG_ENTITY, to.spectatee_status); - - if(sf & 8) + } + if (sf & 8) { WriteAngle(MSG_ENTITY, e.v_angle.x); WriteAngle(MSG_ENTITY, e.v_angle.y); } - return true; } -void ClientData_Attach() -{SELFPARAM(); - Net_LinkEntity(self.clientdata = spawn(), false, 0, ClientData_Send); - self.clientdata.drawonlytoclient = self; - self.clientdata.owner = self; +void ClientData_Attach(entity this) +{ + Net_LinkEntity(this.clientdata = new_pure(clientdata), false, 0, ClientData_Send); + this.clientdata.drawonlytoclient = this; + this.clientdata.owner = this; } -void ClientData_Detach() -{SELFPARAM(); - remove(self.clientdata); - self.clientdata = world; +void ClientData_Detach(entity this) +{ + remove(this.clientdata); + this.clientdata = NULL; } void ClientData_Touch(entity e) @@ -111,19 +121,12 @@ void ClientData_Touch(entity e) e.clientdata.SendFlags = 1; // make it spectatable - entity e2; - FOR_EACH_REALCLIENT(e2) - { - if(e2 != e) - if(IS_SPEC(e2)) - if(e2.enemy == e) - e2.clientdata.SendFlags = 1; - } + FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != e && IS_SPEC(it) && it.enemy == e, LAMBDA(it.clientdata.SendFlags = 1)); } .string netname_previous; -void SetSpectator(entity player, entity spectatee); +void SetSpectatee(entity player, entity spectatee); /* @@ -174,164 +177,170 @@ void setplayermodel(entity e, string modelname) precache_model(modelname); _setmodel(e, modelname); player_setupanimsformodel(); - UpdatePlayerSounds(); + if(!autocvar_g_debug_globalsounds) + UpdatePlayerSounds(e); } -/* -============= -PutObserverInServer - -putting a client as observer in the server -============= -*/ -void FixPlayermodel(); -void PutObserverInServer (void) -{SELFPARAM(); - entity spot; - self.hud = HUD_NORMAL; - - if(IS_PLAYER(self)) { Send_Effect(EFFECT_SPAWN_NEUTRAL, self.origin, '0 0 0', 1); } - - spot = SelectSpawnPoint (true); - if(!spot) - error("No spawnpoints for observers?!?\n"); - RemoveGrapplingHook(self); // Wazat's Grappling Hook - - if(IS_REAL_CLIENT(self)) - { - msg_entity = self; - WriteByte(MSG_ONE, SVC_SETVIEW); - WriteEntity(MSG_ONE, self); - } - - self.frags = FRAGS_SPECTATOR; +void FixPlayermodel(entity player); +/** putting a client as observer in the server */ +void PutObserverInServer() +{ + SELFPARAM(); + bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver); + PlayerState_detach(this); - MUTATOR_CALLHOOK(MakePlayerObserver); + if (IS_PLAYER(this) && this.health >= 1) { + // despawn effect + Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); + } - Portal_ClearAll(self); + { + entity spot = SelectSpawnPoint(true); + if (!spot) LOG_FATAL("No spawnpoints for observers?!?"); + this.angles = spot.angles; + this.angles_z = 0; + this.fixangle = true; + // offset it so that the spectator spawns higher off the ground, looks better this way + setorigin(this, spot.origin + STAT(PL_VIEW_OFS, NULL)); + this.prevorigin = this.origin; + if (IS_REAL_CLIENT(this)) + { + msg_entity = this; + WriteByte(MSG_ONE, SVC_SETVIEW); + WriteEntity(MSG_ONE, this); + } + // give the spectator some space between walls for MOVETYPE_FLY_WORLDONLY + // so that your view doesn't go into the ceiling with MOVETYPE_FLY_WORLDONLY, previously "PL_VIEW_OFS" + if(!autocvar_g_debug_globalsounds) + { + // needed for player sounds + this.model = ""; + FixPlayermodel(this); + } + setmodel(this, MDL_Null); + setsize(this, STAT(PL_CROUCH_MIN, NULL), STAT(PL_CROUCH_MAX, NULL)); + this.view_ofs = '0 0 0'; + } - Unfreeze(self); + RemoveGrapplingHook(this); + Portal_ClearAll(this); + Unfreeze(this); - if(self.alivetime) + if (this.alivetime) { - if(!warmup_stage) - PS_GR_P_ADDVAL(self, PLAYERSTATS_ALIVETIME, time - self.alivetime); - self.alivetime = 0; + if (!warmup_stage) + PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime); + this.alivetime = 0; } - if(self.vehicle) - vehicles_exit(VHEF_RELEASE); + if (this.vehicle) vehicles_exit(VHEF_RELEASE); - WaypointSprite_PlayerDead(); + WaypointSprite_PlayerDead(this); - if (!g_ca) // don't reset teams when moving a ca player to the spectators - self.team = -1; // move this as it is needed to log the player spectating in eventlog + if (mutator_returnvalue) { + // mutator prevents resetting teams+score + } else { + this.team = -1; // move this as it is needed to log the player spectating in eventlog + this.frags = FRAGS_SPECTATOR; + PlayerScore_Clear(this); // clear scores when needed + } - if(self.killcount != -666) + if (this.killcount != FRAGS_SPECTATOR) { - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_SPECTATE, self.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_SPECTATE, this.netname); if(!intermission_running) if(autocvar_g_chat_nospectators == 1 || (!(warmup_stage || gameover) && autocvar_g_chat_nospectators == 2)) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CHAT_NOSPECTATORS); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_CHAT_NOSPECTATORS); - if(self.just_joined == false) { - LogTeamchange(self.playerid, -1, 4); + if(this.just_joined == false) { + LogTeamchange(this.playerid, -1, 4); } else - self.just_joined = false; - } - - PlayerScore_Clear(self); // clear scores when needed - - accuracy_resend(self); + this.just_joined = false; + } + + accuracy_resend(this); + + this.spectatortime = time; + this.bot_attack = false; + this.hud = HUD_NORMAL; + TRANSMUTE(Observer, this); + this.iscreature = false; + this.teleportable = TELEPORT_SIMPLE; + this.damagedbycontents = false; + this.health = FRAGS_SPECTATOR; + this.takedamage = DAMAGE_NO; + this.solid = SOLID_NOT; + this.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink + this.flags = FL_CLIENT | FL_NOTARGET; + this.armorvalue = 666; + this.effects = 0; + this.armorvalue = autocvar_g_balance_armor_start; + this.pauserotarmor_finished = 0; + this.pauserothealth_finished = 0; + this.pauseregen_finished = 0; + this.damageforcescale = 0; + this.death_time = 0; + this.respawn_flags = 0; + this.respawn_time = 0; + this.stat_respawn_time = 0; + this.alpha = 0; + this.scale = 0; + this.fade_time = 0; + this.pain_frame = 0; + this.pain_finished = 0; + this.strength_finished = 0; + this.invincible_finished = 0; + this.superweapons_finished = 0; + this.pushltime = 0; + this.istypefrag = 0; + this.think = func_null; + this.nextthink = 0; + this.hook_time = 0; + this.deadflag = DEAD_NO; + this.crouch = false; + this.revival_time = 0; + + this.items = 0; + this.weapons = '0 0 0'; + this.drawonlytoclient = this; + + this.weaponname = ""; + this.weaponmodel = ""; + for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + this.weaponentities[slot] = NULL; + } + this.exteriorweaponentity = NULL; + this.killcount = FRAGS_SPECTATOR; + this.velocity = '0 0 0'; + this.avelocity = '0 0 0'; + this.punchangle = '0 0 0'; + this.punchvector = '0 0 0'; + this.oldvelocity = this.velocity; + this.fire_endtime = -1; + this.event_damage = func_null; +} - self.spectatortime = time; - - self.classname = "observer"; - self.iscreature = false; - self.teleportable = TELEPORT_SIMPLE; - self.damagedbycontents = false; - self.health = -666; - self.takedamage = DAMAGE_NO; - self.solid = SOLID_NOT; - self.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink - self.flags = FL_CLIENT | FL_NOTARGET; - self.armorvalue = 666; - self.effects = 0; - self.armorvalue = autocvar_g_balance_armor_start; - self.pauserotarmor_finished = 0; - self.pauserothealth_finished = 0; - self.pauseregen_finished = 0; - self.damageforcescale = 0; - self.death_time = 0; - self.respawn_flags = 0; - self.respawn_time = 0; - self.stat_respawn_time = 0; - self.alpha = 0; - self.scale = 0; - self.fade_time = 0; - self.pain_frame = 0; - self.pain_finished = 0; - self.strength_finished = 0; - self.invincible_finished = 0; - self.superweapons_finished = 0; - self.pushltime = 0; - self.istypefrag = 0; - self.think = func_null; - self.nextthink = 0; - self.hook_time = 0; - self.deadflag = DEAD_NO; - self.angles = spot.angles; - self.angles_z = 0; - self.fixangle = true; - self.crouch = false; - self.revival_time = 0; - - setorigin (self, (spot.origin + PL_VIEW_OFS)); // offset it so that the spectator spawns higher off the ground, looks better this way - self.prevorigin = self.origin; - self.items = 0; - self.weapons = '0 0 0'; - self.model = ""; - FixPlayermodel(); - setmodel(self, MDL_Null); - self.drawonlytoclient = self; - - setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); // give the spectator some space between walls for MOVETYPE_FLY_WORLDONLY - self.view_ofs = '0 0 0'; // so that your view doesn't go into the ceiling with MOVETYPE_FLY_WORLDONLY, previously "PL_VIEW_OFS" - - self.weapon = 0; - self.weaponname = ""; - self.switchingweapon = 0; - self.weaponmodel = ""; - self.weaponentity = world; - self.exteriorweaponentity = world; - self.killcount = -666; - self.velocity = '0 0 0'; - self.avelocity = '0 0 0'; - self.punchangle = '0 0 0'; - self.punchvector = '0 0 0'; - self.oldvelocity = self.velocity; - self.fire_endtime = -1; - self.event_damage = func_null; +int player_getspecies(entity this) +{ + get_model_parameters(this.model, this.skin); + int s = get_model_parameters_species; + get_model_parameters(string_null, 0); + if (s < 0) return SPECIES_HUMAN; + return s; } .float model_randomizer; -void FixPlayermodel() -{SELFPARAM(); - string defaultmodel; - float defaultskin, chmdl, oldskin, n, i; - vector m1, m2; - - defaultmodel = ""; - defaultskin = 0; - chmdl = false; - +void FixPlayermodel(entity player) +{ + string defaultmodel = ""; + int defaultskin = 0; if(autocvar_sv_defaultcharacter) { if(teamplay) { - string s; - s = Static_Team_ColorName_Lower(self.team); - if(s != "neutral") + string s = Static_Team_ColorName_Lower(player.team); + if (s != "neutral") { defaultmodel = cvar_string(strcat("sv_defaultplayermodel_", s)); defaultskin = cvar(strcat("sv_defaultplayerskin_", s)); @@ -344,66 +353,68 @@ void FixPlayermodel() defaultskin = autocvar_sv_defaultplayerskin; } - n = tokenize_console(defaultmodel); + int n = tokenize_console(defaultmodel); if(n > 0) { - defaultmodel = argv(floor(n * self.model_randomizer)); + defaultmodel = argv(floor(n * player.model_randomizer)); // However, do NOT randomize if the player-selected model is in the list. - for (i = 0; i < n; ++i) - if ((argv(i) == self.playermodel && defaultskin == stof(self.playerskin)) || argv(i) == strcat(self.playermodel, ":", self.playerskin)) + for (int i = 0; i < n; ++i) + if ((argv(i) == player.playermodel && defaultskin == stof(player.playerskin)) || argv(i) == strcat(player.playermodel, ":", player.playerskin)) defaultmodel = argv(i); } - i = strstrofs(defaultmodel, ":", 0); + int i = strstrofs(defaultmodel, ":", 0); if(i >= 0) { defaultskin = stof(substring(defaultmodel, i+1, -1)); defaultmodel = substring(defaultmodel, 0, i); } } - MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin); defaultmodel = ret_string; defaultskin = ret_int; + bool chmdl = false; + int oldskin; if(defaultmodel != "") { - if (defaultmodel != self.model) + if (defaultmodel != player.model) { - m1 = self.mins; - m2 = self.maxs; - setplayermodel (self, defaultmodel); - setsize (self, m1, m2); + vector m1 = player.mins; + vector m2 = player.maxs; + setplayermodel (player, defaultmodel); + setsize (player, m1, m2); chmdl = true; } - oldskin = self.skin; - self.skin = defaultskin; + oldskin = player.skin; + player.skin = defaultskin; } else { - if (self.playermodel != self.model || self.playermodel == "") + if (player.playermodel != player.model || player.playermodel == "") { - self.playermodel = CheckPlayerModel(self.playermodel); // this is never "", so no endless loop - m1 = self.mins; - m2 = self.maxs; - setplayermodel (self, self.playermodel); - setsize (self, m1, m2); + player.playermodel = CheckPlayerModel(player.playermodel); // this is never "", so no endless loop + vector m1 = player.mins; + vector m2 = player.maxs; + setplayermodel (player, player.playermodel); + setsize (player, m1, m2); chmdl = true; } - oldskin = self.skin; - self.skin = stof(self.playerskin); + oldskin = player.skin; + player.skin = stof(player.playerskin); } - if(chmdl || oldskin != self.skin) // model or skin has changed + if(chmdl || oldskin != player.skin) // model or skin has changed { - self.species = player_getspecies(); // update species - UpdatePlayerSounds(); // update skin sounds + player.species = player_getspecies(player); // update species + if(!autocvar_g_debug_globalsounds) + UpdatePlayerSounds(player); // update skin sounds } if(!teamplay) if(strlen(autocvar_sv_defaultplayercolors)) - if(self.clientcolors != stof(autocvar_sv_defaultplayercolors)) - setcolor(self, stof(autocvar_sv_defaultplayercolors)); + if(player.clientcolors != stof(autocvar_sv_defaultplayercolors)) + setcolor(player, stof(autocvar_sv_defaultplayercolors)); } @@ -411,291 +422,258 @@ void FixPlayermodel() void PutClientInServer() { SELFPARAM(); - if(IS_BOT_CLIENT(self)) - self.classname = "player"; - else if(IS_REAL_CLIENT(self)) - { - msg_entity = self; + if (IS_BOT_CLIENT(this)) { + TRANSMUTE(Player, this); + } else if (IS_REAL_CLIENT(this)) { + msg_entity = this; WriteByte(MSG_ONE, SVC_SETVIEW); - WriteEntity(MSG_ONE, self); + WriteEntity(MSG_ONE, this); + } + if (gameover) { + TRANSMUTE(Observer, this); } - SetSpectator(self, world); + SetSpectatee(this, NULL); // reset player keys - self.itemkeys = 0; - - MUTATOR_CALLHOOK(PutClientInServer, self); + this.itemkeys = 0; - if(gameover) - self.classname = "observer"; + MUTATOR_CALLHOOK(PutClientInServer, this); - if(IS_PLAYER(self)) - { - entity spot; - - accuracy_resend(self); + if (IS_OBSERVER(this)) { + PutObserverInServer(); + } else if (IS_PLAYER(this)) { + PlayerState_attach(this); + accuracy_resend(this); - if(self.team < 0) - JoinBestTeam(self, false, true); + if (this.team < 0) + JoinBestTeam(this, false, true); - spot = SelectSpawnPoint (false); - if(!spot) - { - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_NOSPAWNS); + entity spot = SelectSpawnPoint(false); + if (!spot) { + Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_NOSPAWNS); return; // spawn failed } - RemoveGrapplingHook(self); // Wazat's Grappling Hook - - self.classname = "player"; - self.wasplayer = true; - self.iscreature = true; - self.teleportable = TELEPORT_NORMAL; - self.damagedbycontents = true; - self.movetype = MOVETYPE_WALK; - self.solid = SOLID_SLIDEBOX; - self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID; - if(autocvar_g_playerclip_collisions) - self.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP; - if(IS_BOT_CLIENT(self) && autocvar_g_botclip_collisions) - self.dphitcontentsmask |= DPCONTENTS_BOTCLIP; - self.frags = FRAGS_PLAYER; - if(INDEPENDENT_PLAYERS) - MAKE_INDEPENDENT_PLAYER(self); - self.flags = FL_CLIENT | FL_PICKUPITEMS; - if(autocvar__notarget) - self.flags |= FL_NOTARGET; - self.takedamage = DAMAGE_AIM; - self.effects = 0; - self.effects |= EF_TELEPORT_BIT | EF_RESTARTANIM_BIT; - self.air_finished = time + 12; - self.dmg = 2; - if(WEP_CVAR(vortex, charge)) - { - if(WEP_CVAR_SEC(vortex, chargepool)) - self.vortex_chargepool_ammo = 1; - self.vortex_charge = WEP_CVAR(vortex, charge_start); - } - - if(warmup_stage) - { - self.ammo_shells = warmup_start_ammo_shells; - self.ammo_nails = warmup_start_ammo_nails; - self.ammo_rockets = warmup_start_ammo_rockets; - self.ammo_cells = warmup_start_ammo_cells; - self.ammo_plasma = warmup_start_ammo_plasma; - self.ammo_fuel = warmup_start_ammo_fuel; - self.health = warmup_start_health; - self.armorvalue = warmup_start_armorvalue; - self.weapons = WARMUP_START_WEAPONS; - } - else - { - self.ammo_shells = start_ammo_shells; - self.ammo_nails = start_ammo_nails; - self.ammo_rockets = start_ammo_rockets; - self.ammo_cells = start_ammo_cells; - self.ammo_plasma = start_ammo_plasma; - self.ammo_fuel = start_ammo_fuel; - self.health = start_health; - self.armorvalue = start_armorvalue; - self.weapons = start_weapons; - } - - if(self.weapons & WEPSET_SUPERWEAPONS) - self.superweapons_finished = time + autocvar_g_balance_superweapons_time; - else - self.superweapons_finished = 0; - - if(g_weaponarena_random) // WEAPONTODO: more stuff that should be in a mutator. also: rename those cvars - { - if(g_weaponarena_random_with_blaster) - self.weapons &= ~WEPSET_BLASTER; - W_RandomWeapons(self, g_weaponarena_random); - if(g_weaponarena_random_with_blaster) - self.weapons |= WEPSET_BLASTER; + TRANSMUTE(Player, this); + this.wasplayer = true; + this.iscreature = true; + this.teleportable = TELEPORT_NORMAL; + this.damagedbycontents = true; + this.movetype = MOVETYPE_WALK; + this.solid = SOLID_SLIDEBOX; + this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID; + if (autocvar_g_playerclip_collisions) + this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP; + if (IS_BOT_CLIENT(this) && autocvar_g_botclip_collisions) + this.dphitcontentsmask |= DPCONTENTS_BOTCLIP; + this.frags = FRAGS_PLAYER; + if (INDEPENDENT_PLAYERS) MAKE_INDEPENDENT_PLAYER(this); + this.flags = FL_CLIENT | FL_PICKUPITEMS; + if (autocvar__notarget) + this.flags |= FL_NOTARGET; + this.takedamage = DAMAGE_AIM; + this.effects = EF_TELEPORT_BIT | EF_RESTARTANIM_BIT; + this.dmg = 2; // WTF + + if (warmup_stage) { + this.ammo_shells = warmup_start_ammo_shells; + this.ammo_nails = warmup_start_ammo_nails; + this.ammo_rockets = warmup_start_ammo_rockets; + this.ammo_cells = warmup_start_ammo_cells; + this.ammo_plasma = warmup_start_ammo_plasma; + this.ammo_fuel = warmup_start_ammo_fuel; + this.health = warmup_start_health; + this.armorvalue = warmup_start_armorvalue; + this.weapons = WARMUP_START_WEAPONS; + } else { + this.ammo_shells = start_ammo_shells; + this.ammo_nails = start_ammo_nails; + this.ammo_rockets = start_ammo_rockets; + this.ammo_cells = start_ammo_cells; + this.ammo_plasma = start_ammo_plasma; + this.ammo_fuel = start_ammo_fuel; + this.health = start_health; + this.armorvalue = start_armorvalue; + this.weapons = start_weapons; } - self.items = start_items; - - self.spawnshieldtime = time + autocvar_g_spawnshieldtime; - self.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot_spawn; - self.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot_spawn; - self.pauserotfuel_finished = time + autocvar_g_balance_pause_fuel_rot_spawn; - self.pauseregen_finished = time + autocvar_g_balance_pause_health_regen_spawn; - //extend the pause of rotting if client was reset at the beginning of the countdown - if(!autocvar_sv_ready_restart_after_countdown && time < game_starttime) { // TODO why is this cvar NOTted? - self.spawnshieldtime += game_starttime - time; - self.pauserotarmor_finished += game_starttime - time; - self.pauserothealth_finished += game_starttime - time; - self.pauseregen_finished += game_starttime - time; + this.superweapons_finished = (this.weapons & WEPSET_SUPERWEAPONS) ? time + autocvar_g_balance_superweapons_time : 0; + + this.items = start_items; + + this.spawnshieldtime = time + autocvar_g_spawnshieldtime; + this.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot_spawn; + this.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot_spawn; + this.pauserotfuel_finished = time + autocvar_g_balance_pause_fuel_rot_spawn; + this.pauseregen_finished = time + autocvar_g_balance_pause_health_regen_spawn; + // extend the pause of rotting if client was reset at the beginning of the countdown + if (!autocvar_sv_ready_restart_after_countdown && time < game_starttime) { // TODO why is this cvar NOTted? + float f = game_starttime - time; + this.spawnshieldtime += f; + this.pauserotarmor_finished += f; + this.pauserothealth_finished += f; + this.pauseregen_finished += f; } - self.damageforcescale = 2; - self.death_time = 0; - self.respawn_flags = 0; - self.respawn_time = 0; - self.stat_respawn_time = 0; - self.scale = autocvar_sv_player_scale; - self.fade_time = 0; - self.pain_frame = 0; - self.pain_finished = 0; - self.strength_finished = 0; - self.invincible_finished = 0; - self.pushltime = 0; - // players have no think function - self.think = func_null; - self.nextthink = 0; - self.hook_time = 0; - self.dmg_team = 0; - self.ballistics_density = autocvar_g_ballistics_density_player; - - self.metertime = 0; - - self.deadflag = DEAD_NO; - - self.angles = spot.angles; - - self.angles_z = 0; // never spawn tilted even if the spot says to - if(IS_BOT_CLIENT(self)) - self.v_angle = self.angles; - self.fixangle = true; // turn this way immediately - self.velocity = '0 0 0'; - self.avelocity = '0 0 0'; - self.punchangle = '0 0 0'; - self.punchvector = '0 0 0'; - self.oldvelocity = self.velocity; - self.fire_endtime = -1; - self.revival_time = 0; - - entity spawnevent = spawn(); - spawnevent.owner = self; + this.damageforcescale = 2; + this.death_time = 0; + this.respawn_flags = 0; + this.respawn_time = 0; + this.stat_respawn_time = 0; + this.scale = autocvar_sv_player_scale; + this.fade_time = 0; + this.pain_frame = 0; + this.pain_finished = 0; + this.pushltime = 0; + this.think = func_null; // players have no think function + this.nextthink = 0; + this.dmg_team = 0; + this.ballistics_density = autocvar_g_ballistics_density_player; + + this.deadflag = DEAD_NO; + + this.angles = spot.angles; + this.angles_z = 0; // never spawn tilted even if the spot says to + if (IS_BOT_CLIENT(this)) + this.v_angle = this.angles; + this.fixangle = true; // turn this way immediately + this.oldvelocity = this.velocity = '0 0 0'; + this.avelocity = '0 0 0'; + this.punchangle = '0 0 0'; + this.punchvector = '0 0 0'; + + this.strength_finished = 0; + this.invincible_finished = 0; + this.fire_endtime = -1; + this.revival_time = 0; + this.air_finished = time + 12; + + entity spawnevent = new_pure(spawnevent); + spawnevent.owner = this; Net_LinkEntity(spawnevent, false, 0.5, SpawnEvent_Send); // Cut off any still running player sounds. - stopsound(self, CH_PLAYER_SINGLE); + stopsound(this, CH_PLAYER_SINGLE); - self.model = ""; - FixPlayermodel(); - self.drawonlytoclient = world; + this.model = ""; + FixPlayermodel(this); + this.drawonlytoclient = NULL; - self.crouch = false; - self.view_ofs = PL_VIEW_OFS; - setsize (self, PL_MIN, PL_MAX); - self.spawnorigin = spot.origin; - setorigin (self, spot.origin + '0 0 1' * (1 - self.mins.z - 24)); + this.crouch = false; + this.view_ofs = STAT(PL_VIEW_OFS, NULL); + setsize(this, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL)); + this.spawnorigin = spot.origin; + setorigin(this, spot.origin + '0 0 1' * (1 - this.mins.z - 24)); // don't reset back to last position, even if new position is stuck in solid - self.oldorigin = self.origin; - self.prevorigin = self.origin; - self.lastrocket = world; // stop rocket guiding, no revenge from the grave! - self.lastteleporttime = time; // prevent insane speeds due to changing origin - self.hud = HUD_NORMAL; - - self.event_damage = PlayerDamage; + this.oldorigin = this.origin; + this.prevorigin = this.origin; + this.lastteleporttime = time; // prevent insane speeds due to changing origin + this.hud = HUD_NORMAL; - self.bot_attack = true; - self.monster_attack = true; + this.event_damage = PlayerDamage; - self.spider_slowness = 0; + this.bot_attack = true; + this.monster_attack = true; - self.BUTTON_ATCK = self.BUTTON_JUMP = self.BUTTON_ATCK2 = 0; + PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false; - if(self.killcount == -666) { - PlayerScore_Clear(self); - self.killcount = 0; + if (this.killcount == FRAGS_SPECTATOR) { + PlayerScore_Clear(this); + this.killcount = 0; } - CL_SpawnWeaponentity(self); - self.alpha = default_player_alpha; - self.colormod = '1 1 1' * autocvar_g_player_brightness; - self.exteriorweaponentity.alpha = default_weapon_alpha; - - self.speedrunning = false; + for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + CL_SpawnWeaponentity(this, weaponentities[slot]); + } + this.alpha = default_player_alpha; + this.colormod = '1 1 1' * autocvar_g_player_brightness; + this.exteriorweaponentity.alpha = default_weapon_alpha; - //stuffcmd(self, "chase_active 0"); - //stuffcmd(self, "set viewsize $tmpviewsize \n"); + this.speedrunning = false; - target_voicescript_clear(self); + target_voicescript_clear(this); // reset fields the weapons may use - for (int j = WEP_FIRST; j <= WEP_LAST; ++j) - { - WEP_ACTION(j, WR_RESETPLAYER); + FOREACH(Weapons, true, LAMBDA( + it.wr_resetplayer(it); + // reload all reloadable weapons + if (it.spawnflags & WEP_FLAG_RELOADABLE) { + this.weapon_load[it.m_id] = it.reloading_ammo; + } + )); - // all weapons must be fully loaded when we spawn - entity e = get_weaponinfo(j); - if (e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars - self.(weapon_load[j]) = e.reloading_ammo; + { + string s = spot.target; + spot.target = string_null; + WITH(entity, activator, this, LAMBDA( + WITH(entity, self, spot, SUB_UseTargets()) + )); + spot.target = s; } - string s = spot.target; - spot.target = string_null; - activator = self; - WITH(entity, self, spot, SUB_UseTargets()); - activator = world; - spot.target = s; - - Unfreeze(self); + Unfreeze(this); MUTATOR_CALLHOOK(PlayerSpawn, spot); - if(autocvar_spawn_debug) + if (autocvar_spawn_debug) { - sprint(self, strcat("spawnpoint origin: ", vtos(spot.origin), "\n")); - remove(spot); // usefull for checking if there are spawnpoints, that let drop through the floor + sprint(this, strcat("spawnpoint origin: ", vtos(spot.origin), "\n")); + remove(spot); // usefull for checking if there are spawnpoints, that let drop through the floor } - self.switchweapon = w_getbestweapon(self); - self.cnt = -1; // W_LastWeapon will not complain - self.weapon = 0; - self.weaponname = ""; - self.switchingweapon = 0; + PS(this).m_switchweapon = w_getbestweapon(this); + this.cnt = -1; // W_LastWeapon will not complain + PS(this).m_weapon = WEP_Null; + this.weaponname = ""; + PS(this).m_switchingweapon = WEP_Null; - if(!warmup_stage) - if(!self.alivetime) - self.alivetime = time; + if (!warmup_stage && !this.alivetime) + this.alivetime = time; - antilag_clear(self); - } - else if(IS_OBSERVER(self)) - { - PutObserverInServer (); + antilag_clear(this, CS(this)); } } +void ClientInit_misc(); + .float ebouncefactor, ebouncestop; // electro's values // TODO do we need all these fields, or should we stop autodetecting runtime // changes and just have a console command to update this? -float ClientInit_SendEntity(entity to, int sf) -{SELFPARAM(); - WriteByte(MSG_ENTITY, ENT_CLIENT_INIT); - WriteByte(MSG_ENTITY, g_nexball_meter_period * 32); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[0])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[1])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[2])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[3])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(arc_shotorigin[0])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(arc_shotorigin[1])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(arc_shotorigin[2])); - WriteInt24_t(MSG_ENTITY, compressShotOrigin(arc_shotorigin[3])); +bool ClientInit_SendEntity(entity this, entity to, int sf) +{ + WriteHeader(MSG_ENTITY, _ENT_CLIENT_INIT); + return = true; + msg_entity = to; + // MSG_INIT replacement + // TODO: make easier to use + Registry_send_all(); + W_PROP_reload(MSG_ONE, to); + ClientInit_misc(); + MUTATOR_CALLHOOK(Ent_Init); +} +void ClientInit_misc() +{ + SELFPARAM(); + int channel = MSG_ONE; + WriteHeader(channel, ENT_CLIENT_INIT); + WriteByte(channel, g_nexball_meter_period * 32); + WriteInt24_t(channel, compressShotOrigin(hook_shotorigin[0])); + WriteInt24_t(channel, compressShotOrigin(hook_shotorigin[1])); + WriteInt24_t(channel, compressShotOrigin(hook_shotorigin[2])); + WriteInt24_t(channel, compressShotOrigin(hook_shotorigin[3])); + WriteInt24_t(channel, compressShotOrigin(arc_shotorigin[0])); + WriteInt24_t(channel, compressShotOrigin(arc_shotorigin[1])); + WriteInt24_t(channel, compressShotOrigin(arc_shotorigin[2])); + WriteInt24_t(channel, compressShotOrigin(arc_shotorigin[3])); if(sv_foginterval && world.fog != "") - WriteString(MSG_ENTITY, world.fog); + WriteString(channel, world.fog); else - WriteString(MSG_ENTITY, ""); - WriteByte(MSG_ENTITY, self.count * 255.0); // g_balance_armor_blockpercent - WriteCoord(MSG_ENTITY, self.bouncefactor); // g_balance_mortar_bouncefactor // WEAPONTODO - WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_mortar_bouncestop - WriteCoord(MSG_ENTITY, self.ebouncefactor); // g_balance_mortar_bouncefactor - WriteCoord(MSG_ENTITY, self.ebouncestop); // g_balance_mortar_bouncestop - WriteByte(MSG_ENTITY, WEP_CVAR(vortex, secondary)); // client has to know if it should zoom or not // WEAPONTODO - WriteByte(MSG_ENTITY, WEP_CVAR(rifle, secondary)); // client has to know if it should zoom or not // WEAPONTODO - WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not - WriteByte(MSG_ENTITY, WEP_CVAR(minelayer, limit)); // minelayer max mines // WEAPONTODO - WriteByte(MSG_ENTITY, WEP_CVAR_SEC(hagar, load_max)); // hagar max loadable rockets // WEAPONTODO - WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange); - WriteByte(MSG_ENTITY, WEP_CVAR(porto, secondary)); // WEAPONTODO - return true; + WriteString(channel, ""); + WriteByte(channel, self.count * 255.0); // g_balance_armor_blockpercent + WriteByte(channel, serverflags); // client has to know if it should zoom or not + WriteCoord(channel, autocvar_g_trueaim_minrange); } void ClientInit_CheckUpdate() @@ -706,32 +684,12 @@ void ClientInit_CheckUpdate() self.count = autocvar_g_balance_armor_blockpercent; self.SendFlags |= 1; } - if(self.bouncefactor != autocvar_g_balance_mortar_bouncefactor) // WEAPONTODO - { - self.bouncefactor = autocvar_g_balance_mortar_bouncefactor; - self.SendFlags |= 1; - } - if(self.bouncestop != autocvar_g_balance_mortar_bouncestop) - { - self.bouncestop = autocvar_g_balance_mortar_bouncestop; - self.SendFlags |= 1; - } - if(self.ebouncefactor != autocvar_g_balance_electro_secondary_bouncefactor) - { - self.ebouncefactor = autocvar_g_balance_electro_secondary_bouncefactor; - self.SendFlags |= 1; - } - if(self.ebouncestop != autocvar_g_balance_electro_secondary_bouncestop) - { - self.ebouncestop = autocvar_g_balance_electro_secondary_bouncestop; - self.SendFlags |= 1; - } } void ClientInit_Spawn() {SELFPARAM(); - entity e = spawn(); - e.classname = "clientinit"; + + entity e = new_pure(clientinit); e.think = ClientInit_CheckUpdate; Net_LinkEntity(e, false, 0, ClientInit_SendEntity); @@ -743,10 +701,12 @@ void ClientInit_Spawn() SetNewParms ============= */ -void SetNewParms (void) +void SetNewParms () { // initialize parms for a new player parm1 = -(86400 * 366); + + MUTATOR_CALLHOOK(SetNewParms); } /* @@ -754,10 +714,12 @@ void SetNewParms (void) SetChangeParms ============= */ -void SetChangeParms (void) +void SetChangeParms () {SELFPARAM(); // save parms for level change parm1 = self.parm_idlesince - time; + + MUTATOR_CALLHOOK(SetChangeParms); } /* @@ -765,15 +727,17 @@ void SetChangeParms (void) DecodeLevelParms ============= */ -void DecodeLevelParms (void) -{SELFPARAM(); +void DecodeLevelParms(entity this) +{ // load parms - self.parm_idlesince = parm1; - if(self.parm_idlesince == -(86400 * 366)) - self.parm_idlesince = time; + this.parm_idlesince = parm1; + if (this.parm_idlesince == -(86400 * 366)) + this.parm_idlesince = time; // whatever happens, allow 60 seconds of idling directly after connect for map loading - self.parm_idlesince = max(self.parm_idlesince, time - sv_maxidle + 60); + this.parm_idlesince = max(this.parm_idlesince, time - sv_maxidle + 60); + + MUTATOR_CALLHOOK(DecodeLevelParms); } /* @@ -785,21 +749,21 @@ Called when a client types 'kill' in the console */ .float clientkill_nexttime; -void ClientKill_Now_TeamChange() -{SELFPARAM(); - if(self.killindicator_teamchange == -1) +void ClientKill_Now_TeamChange(entity this) +{ + if(this.killindicator_teamchange == -1) { - JoinBestTeam( self, false, true ); + JoinBestTeam( this, false, true ); } - else if(self.killindicator_teamchange == -2) + else if(this.killindicator_teamchange == -2) { if(blockSpectators) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); - PutObserverInServer(); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); + WITH(entity, self, this, PutObserverInServer()); } else - SV_ChangeTeam(self.killindicator_teamchange - 1); - self.killindicator_teamchange = 0; + WITH(entity, self, this, SV_ChangeTeam(this.killindicator_teamchange - 1)); + this.killindicator_teamchange = 0; } void ClientKill_Now() @@ -810,7 +774,7 @@ void ClientKill_Now() if(!self.killindicator_teamchange) { self.vehicle_health = -1; - Damage(self, self, self, 1 , DEATH_KILL, self.origin, '0 0 0'); + Damage(self, self, self, 1 , DEATH_KILL.m_id, self.origin, '0 0 0'); } } @@ -820,10 +784,10 @@ void ClientKill_Now() self.killindicator = world; if(self.killindicator_teamchange) - ClientKill_Now_TeamChange(); + ClientKill_Now_TeamChange(self); if(IS_PLAYER(self)) - Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0'); + Damage(self, self, self, 100000, DEATH_KILL.m_id, self.origin, '0 0 0'); // now I am sure the player IS dead } @@ -882,26 +846,20 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 if(g_race_qualifying || g_cts) killtime = 0; - if(g_cts && self.killindicator && self.killindicator.health == 1) // self.killindicator.health == 1 means that the kill indicator was spawned by CTS_ClientKill - { - remove(self.killindicator); - self.killindicator = world; - - ClientKill_Now(); // allow instant kill in this case - return; - } + if(MUTATOR_CALLHOOK(ClientKill, self, killtime)) + return; self.killindicator_teamchange = targetteam; if(!self.killindicator) { - if(self.deadflag == DEAD_NO) + if(!IS_DEAD(self)) { killtime = max(killtime, self.clientkill_nexttime - time); self.clientkill_nexttime = time + killtime + autocvar_g_balance_kill_antispam; } - if(killtime <= 0 || !IS_PLAYER(self) || self.deadflag != DEAD_NO) + if(killtime <= 0 || !IS_PLAYER(self) || IS_DEAD(self)) { ClientKill_Now(); } @@ -966,42 +924,31 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 self.killindicator.colormod = Team_ColorRGB(targetteam); if(IS_REAL_CLIENT(self)) if(self.killindicator.cnt > 0) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, APP_TEAM_NUM_4(targetteam, CENTER_TEAMCHANGE_), self.killindicator.cnt); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, APP_TEAM_NUM(targetteam, CENTER_TEAMCHANGE), self.killindicator.cnt); } } } -void ClientKill (void) +void ClientKill () {SELFPARAM(); if(gameover) return; if(self.player_blocked) return; - if(self.frozen) return; + if(STAT(FROZEN, self)) return; ClientKill_TeamChange(0); } -void CTS_ClientKill (entity e) // silent version of ClientKill, used when player finishes a CTS run. Useful to prevent cheating by running back to the start line and starting out with more speed -{ - e.killindicator = spawn(); - e.killindicator.owner = e; - e.killindicator.think = KillIndicator_Think; - e.killindicator.nextthink = time + (e.lip) * 0.05; - e.killindicator.cnt = ceil(autocvar_g_cts_finish_kill_delay); - e.killindicator.health = 1; // this is used to indicate that it should be silent - e.lip = 0; -} - void FixClientCvars(entity e) { // send prediction settings to the client stuffcmd(e, "\nin_bindmap 0 0\n"); - if(g_race || g_cts) - stuffcmd(e, "cl_cmd settemp cl_movecliptokeyboard 2\n"); if(autocvar_g_antilag == 3) // client side hitscan stuffcmd(e, "cl_cmd settemp cl_prydoncursor_notrace 0\n"); if(autocvar_sv_gentle) stuffcmd(e, "cl_cmd settemp cl_gentle 1\n"); + + MUTATOR_CALLHOOK(FixClientCvars, e); } float PlayerInIDList(entity p, string idlist) @@ -1033,235 +980,173 @@ ClientPreConnect Called once (not at each match start) when a client begins a connection to the server ============= */ -void ClientPreConnect (void) +void ClientPreConnect () {SELFPARAM(); if(autocvar_sv_eventlog) { GameLogEcho(sprintf(":connect:%d:%d:%s", self.playerid, - num_for_edict(self), + etof(self), ((IS_REAL_CLIENT(self)) ? self.netaddress : "bot") )); } } #endif -/* +/** ============= ClientConnect Called when a client connects to the server ============= */ -void DecodeLevelParms (void); -void ClientConnect (void) -{SELFPARAM(); - float t; - - if(IS_CLIENT(self)) - { - LOG_INFO("Warning: ClientConnect, but already connected!\n"); - return; - } - - if(Ban_MaybeEnforceBanOnce(self)) - return; - - DecodeLevelParms(); +void ClientConnect() +{ + SELFPARAM(); + if (Ban_MaybeEnforceBanOnce(this)) return; + assert(!IS_CLIENT(this), return); + this.flags |= FL_CLIENT; + assert(player_count >= 0, player_count = 0); #ifdef WATERMARK - Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_WATERMARK, WATERMARK); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_WATERMARK, WATERMARK); #endif - - self.classname = "player_joining"; - - self.flags = FL_CLIENT; - self.version_nagtime = time + 10 + random() * 10; - - if(player_count<0) - { - LOG_TRACE("BUG player count is lower than zero, this cannot happen!\n"); - player_count = 0; - } - - if(IS_REAL_CLIENT(self)) { PlayerStats_PlayerBasic_CheckUpdate(self); } - - PlayerScore_Attach(self); - ClientData_Attach(); - accuracy_init(self); - Inventory_new(self); - - bot_clientconnect(); - - playerdemo_init(); - - anticheat_init(); + this.version_nagtime = time + 10 + random() * 10; + TRANSMUTE(Client, this); // identify the right forced team - if(autocvar_g_campaign) + if (autocvar_g_campaign) { - if(IS_REAL_CLIENT(self)) // only players, not bots + if (IS_REAL_CLIENT(this)) // only players, not bots { - switch(autocvar_g_campaign_forceteam) + switch (autocvar_g_campaign_forceteam) { - case 1: self.team_forced = NUM_TEAM_1; break; - case 2: self.team_forced = NUM_TEAM_2; break; - case 3: self.team_forced = NUM_TEAM_3; break; - case 4: self.team_forced = NUM_TEAM_4; break; - default: self.team_forced = 0; + case 1: this.team_forced = NUM_TEAM_1; break; + case 2: this.team_forced = NUM_TEAM_2; break; + case 3: this.team_forced = NUM_TEAM_3; break; + case 4: this.team_forced = NUM_TEAM_4; break; + default: this.team_forced = 0; } } } - else if(PlayerInIDList(self, autocvar_g_forced_team_red)) - self.team_forced = NUM_TEAM_1; - else if(PlayerInIDList(self, autocvar_g_forced_team_blue)) - self.team_forced = NUM_TEAM_2; - else if(PlayerInIDList(self, autocvar_g_forced_team_yellow)) - self.team_forced = NUM_TEAM_3; - else if(PlayerInIDList(self, autocvar_g_forced_team_pink)) - self.team_forced = NUM_TEAM_4; - else if(autocvar_g_forced_team_otherwise == "red") - self.team_forced = NUM_TEAM_1; - else if(autocvar_g_forced_team_otherwise == "blue") - self.team_forced = NUM_TEAM_2; - else if(autocvar_g_forced_team_otherwise == "yellow") - self.team_forced = NUM_TEAM_3; - else if(autocvar_g_forced_team_otherwise == "pink") - self.team_forced = NUM_TEAM_4; - else if(autocvar_g_forced_team_otherwise == "spectate") - self.team_forced = -1; - else if(autocvar_g_forced_team_otherwise == "spectator") - self.team_forced = -1; - else - self.team_forced = 0; - - if(!teamplay) - if(self.team_forced > 0) - self.team_forced = 0; + else if (PlayerInIDList(this, autocvar_g_forced_team_red)) this.team_forced = NUM_TEAM_1; + else if (PlayerInIDList(this, autocvar_g_forced_team_blue)) this.team_forced = NUM_TEAM_2; + else if (PlayerInIDList(this, autocvar_g_forced_team_yellow)) this.team_forced = NUM_TEAM_3; + else if (PlayerInIDList(this, autocvar_g_forced_team_pink)) this.team_forced = NUM_TEAM_4; + else switch (autocvar_g_forced_team_otherwise) + { + default: this.team_forced = 0; break; + case "red": this.team_forced = NUM_TEAM_1; break; + case "blue": this.team_forced = NUM_TEAM_2; break; + case "yellow": this.team_forced = NUM_TEAM_3; break; + case "pink": this.team_forced = NUM_TEAM_4; break; + case "spectate": + case "spectator": + this.team_forced = -1; + break; + } + if (!teamplay && this.team_forced > 0) this.team_forced = 0; - JoinBestTeam(self, false, false); // if the team number is valid, keep it + { + int id = this.playerid; + this.playerid = 0; // silent + JoinBestTeam(this, false, false); // if the team number is valid, keep it + this.playerid = id; + } - if((autocvar_sv_spectate == 1) || autocvar_g_campaign || self.team_forced < 0) { - self.classname = "observer"; + if (autocvar_sv_spectate || autocvar_g_campaign || this.team_forced < 0) { + TRANSMUTE(Observer, this); } else { - if(teamplay) - { - if(autocvar_g_balance_teams) - { - self.classname = "player"; - campaign_bots_may_start = 1; - } - else - { - self.classname = "observer"; // do it anyway - } - } - else - { - self.classname = "player"; - campaign_bots_may_start = 1; + if (!teamplay || autocvar_g_balance_teams) { + TRANSMUTE(Player, this); + campaign_bots_may_start = true; + } else { + TRANSMUTE(Observer, this); // do it anyway } } - self.playerid = (playerid_last = playerid_last + 1); - - PlayerStats_GameReport_AddEvent(sprintf("kills-%d", self.playerid)); + PlayerStats_GameReport_AddEvent(sprintf("kills-%d", this.playerid)); - if(IS_BOT_CLIENT(self)) - PlayerStats_GameReport_AddPlayer(self); + // always track bots, don't ask for cl_allow_uidtracking + if (IS_BOT_CLIENT(this)) PlayerStats_GameReport_AddPlayer(this); - if(autocvar_sv_eventlog) - GameLogEcho(strcat(":join:", ftos(self.playerid), ":", ftos(num_for_edict(self)), ":", ((IS_REAL_CLIENT(self)) ? self.netaddress : "bot"), ":", self.netname)); + if (autocvar_sv_eventlog) + GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? this.netaddress : "bot"), ":", this.netname)); - LogTeamchange(self.playerid, self.team, 1); + LogTeamchange(this.playerid, this.team, 1); - self.just_joined = true; // stop spamming the eventlog with additional lines when the client connects + this.just_joined = true; // stop spamming the eventlog with additional lines when the client connects - self.netname_previous = strzone(self.netname); + this.netname_previous = strzone(this.netname); - if(IS_PLAYER(self) && teamplay) - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(self, INFO_JOIN_CONNECT_TEAM_), self.netname); - else - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_CONNECT, self.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && IS_PLAYER(this)) ? APP_TEAM_ENT(this, INFO_JOIN_CONNECT_TEAM) : INFO_JOIN_CONNECT), this.netname); - stuffcmd(self, strcat(clientstuff, "\n")); - stuffcmd(self, "cl_particles_reloadeffects\n"); // TODO do we still need this? + stuffcmd(this, clientstuff, "\n"); + stuffcmd(this, "cl_particles_reloadeffects\n"); // TODO do we still need this? - FixClientCvars(self); - - // spawnfunc_waypoint sprites - WaypointSprite_InitClient(self); - - // Wazat's grappling hook - SetGrappleHookBindings(); - - // Jetpack binds - stuffcmd(self, "alias +jetpack +button10\n"); - stuffcmd(self, "alias -jetpack -button10\n"); + FixClientCvars(this); // get version info from player - stuffcmd(self, "cmd clientversion $gameversion\n"); - - // get other cvars from player - GetCvars(0); + stuffcmd(this, "cmd clientversion $gameversion\n"); // notify about available teams - if(teamplay) + if (teamplay) { - CheckAllowedTeams(self); - t = 0; if(c1 >= 0) t |= 1; if(c2 >= 0) t |= 2; if(c3 >= 0) t |= 4; if(c4 >= 0) t |= 8; - stuffcmd(self, strcat("set _teams_available ", ftos(t), "\n")); + CheckAllowedTeams(this); + int t = 0; + if (c1 >= 0) t |= BIT(0); + if (c2 >= 0) t |= BIT(1); + if (c3 >= 0) t |= BIT(2); + if (c4 >= 0) t |= BIT(3); + stuffcmd(this, sprintf("set _teams_available %d\n", t)); } else - stuffcmd(self, "set _teams_available 0\n"); - - attach_entcs(); + { + stuffcmd(this, "set _teams_available 0\n"); + } bot_relinkplayerlist(); - self.spectatortime = time; - if(blockSpectators) + this.spectatortime = time; + if (blockSpectators) { - Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); } - self.jointime = time; - self.allowed_timeouts = autocvar_sv_timeout_number; + this.jointime = time; + this.allowed_timeouts = autocvar_sv_timeout_number; - if(IS_REAL_CLIENT(self)) + if (IS_REAL_CLIENT(this)) { - if(!autocvar_g_campaign) + if (!autocvar_g_campaign) { - self.motd_actived_time = -1; - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); + this.motd_actived_time = -1; + Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); } - if(autocvar_g_bugrigs || (g_weaponarena_weapons == WEPSET_TUBA)) - stuffcmd(self, "cl_cmd settemp chase_active 1\n"); + if (g_weaponarena_weapons == WEPSET(TUBA)) + stuffcmd(this, "cl_cmd settemp chase_active 1\n"); } - if(!sv_foginterval && world.fog != "") - stuffcmd(self, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n")); + if (!sv_foginterval && world.fog != "") + stuffcmd(this, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n")); - W_HitPlotOpen(self); + if (autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1))) + if (!g_ca && !g_cts && !g_race) // teamnagger is currently bad for ca, race & cts + send_CSQC_teamnagger(); - if(autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)) && !g_ca && !g_cts && !g_race) // teamnagger is currently bad for ca, race & cts - send_CSQC_teamnagger(); + CSQCMODEL_AUTOINIT(this); - CheatInitClient(); + this.model_randomizer = random(); - CSQCMODEL_AUTOINIT(self); + if (IS_REAL_CLIENT(this)) + sv_notice_join(this); - self.model_randomizer = random(); + FOREACH_ENTITY_FLOAT(init_for_player_needed, true, { + WITH(entity, self, it, it.init_for_player(it)); + }); - if(IS_REAL_CLIENT(self)) - sv_notice_join(); - - for (entity e = world; (e = findfloat(e, init_for_player_needed, 1)); ) { - WITH(entity, self, e, e.init_for_player(this)); - } - - MUTATOR_CALLHOOK(ClientConnect, self); + MUTATOR_CALLHOOK(ClientConnect, this); } /* ============= @@ -1272,44 +1157,24 @@ Called when a client disconnects from the server */ .entity chatbubbleentity; void ReadyCount(); -void ClientDisconnect (void) -{SELFPARAM(); - if(self.vehicle) - vehicles_exit(VHEF_RELEASE); - - if (!IS_CLIENT(self)) - { - LOG_INFO("Warning: ClientDisconnect without ClientConnect\n"); - return; - } - - PlayerStats_GameReport_FinalizePlayer(self); - - if ( self.active_minigame ) - part_minigame(self); - - if(IS_PLAYER(self)) { Send_Effect(EFFECT_SPAWN_NEUTRAL, self.origin, '0 0 0', 1); } - - CheatShutdownClient(); - - W_HitPlotClose(self); - - anticheat_report(); - anticheat_shutdown(); - - playerdemo_shutdown(); +void ClientDisconnect() +{ + SELFPARAM(); + assert(IS_CLIENT(this), return); - bot_clientdisconnect(); + PlayerStats_GameReport_FinalizePlayer(this); + if (this.vehicle) vehicles_exit(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(self.entcs) - detach_entcs(); + if (autocvar_sv_eventlog) + GameLogEcho(strcat(":part:", ftos(this.playerid))); - if(autocvar_sv_eventlog) - GameLogEcho(strcat(":part:", ftos(self.playerid))); + Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname); - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname); + MUTATOR_CALLHOOK(ClientDisconnect); - MUTATOR_CALLHOOK(ClientDisconnect); + ClientState_detach(this); Portal_ClearAll(self); @@ -1321,41 +1186,23 @@ void ClientDisconnect (void) self.flags &= ~FL_CLIENT; - if (self.chatbubbleentity) - remove (self.chatbubbleentity); - - if (self.killindicator) - remove (self.killindicator); + if (this.chatbubbleentity) remove(this.chatbubbleentity); + if (this.killindicator) remove(this.killindicator); WaypointSprite_PlayerGone(); bot_relinkplayerlist(); - accuracy_free(self); - Inventory_delete(self); - ClientData_Detach(); - PlayerScore_Detach(self); - - if(self.netname_previous) - strunzone(self.netname_previous); - if(self.clientstatus) - strunzone(self.clientstatus); - if(self.weaponorder_byimpulse) - strunzone(self.weaponorder_byimpulse); - - ClearPlayerSounds(); - - if(self.personal) - remove(self.personal); + if (self.netname_previous) strunzone(self.netname_previous); + if (self.clientstatus) strunzone(self.clientstatus); + if (self.weaponorder_byimpulse) strunzone(self.weaponorder_byimpulse); + if (self.personal) remove(self.personal); - self.playerid = 0; + this.playerid = 0; ReadyCount(); - - // free cvars - GetCvars(-1); + if (vote_called && IS_REAL_CLIENT(this)) VoteCount(false); } -.float BUTTON_CHAT; void ChatBubbleThink() {SELFPARAM(); self.nextthink = time; @@ -1369,11 +1216,11 @@ void ChatBubbleThink() self.mdl = ""; - if ( !self.owner.deadflag && IS_PLAYER(self.owner) ) + if ( !IS_DEAD(self.owner) && IS_PLAYER(self.owner) ) { if ( self.owner.active_minigame ) self.mdl = "models/sprites/minigame_busy.iqm"; - else if ( self.owner.BUTTON_CHAT ) + else if (PHYS_INPUT_BUTTON_CHAT(self.owner)) self.mdl = "models/misc/chatbubble.spr"; } @@ -1389,7 +1236,7 @@ void UpdateChatBubble() // spawn a chatbubble entity if needed if (!self.chatbubbleentity) { - self.chatbubbleentity = spawn(); + self.chatbubbleentity = new(chatbubbleentity); self.chatbubbleentity.owner = self; self.chatbubbleentity.exteriormodeltoclient = self; self.chatbubbleentity.think = ChatBubbleThink; @@ -1421,7 +1268,7 @@ void UpdateChatBubble() else self.colormod = '1 1 1'; }*/ -void respawn(void) +void respawn() {SELFPARAM(); if(self.alpha >= 0 && autocvar_g_respawn_ghosts) { @@ -1436,33 +1283,34 @@ void respawn(void) SUB_SetFade (self, time + autocvar_g_respawn_ghosts_maxtime / 2 + random () * (autocvar_g_respawn_ghosts_maxtime - autocvar_g_respawn_ghosts_maxtime / 2), 1.5); } - CopyBody(1); + CopyBody(self, 1); self.effects |= EF_NODRAW; // prevent another CopyBody PutClientInServer(); } -void play_countdown(float finished, string samp) +void play_countdown(float finished, Sound samp) {SELFPARAM(); + TC(Sound, samp); if(IS_REAL_CLIENT(self)) if(floor(finished - time - frametime) != floor(finished - time)) if(finished - time < 6) sound (self, CH_INFO, samp, VOL_BASE, ATTEN_NORM); } -void player_powerups (void) +void player_powerups () {SELFPARAM(); // add a way to see what the items were BEFORE all of these checks for the mutator hook int items_prev = self.items; - if((self.items & IT_USING_JETPACK) && !self.deadflag && !gameover) + if((self.items & IT_USING_JETPACK) && !IS_DEAD(self) && !gameover) self.modelflags |= MF_ROCKET; else self.modelflags &= ~MF_ROCKET; self.effects &= ~(EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST); - if((self.alpha < 0 || self.deadflag) && !self.vehicle) // don't apply the flags if the player is gibbed + if((self.alpha < 0 || IS_DEAD(self)) && !self.vehicle) // don't apply the flags if the player is gibbed return; Fire_ApplyDamage(self); @@ -1472,7 +1320,7 @@ void player_powerups (void) { if (self.items & ITEM_Strength.m_itemid) { - play_countdown(self.strength_finished, "misc/poweroff.wav"); + play_countdown(self.strength_finished, SND_POWEROFF); self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT); if (time > self.strength_finished) { @@ -1492,7 +1340,7 @@ void player_powerups (void) } if (self.items & ITEM_Shield.m_itemid) { - play_countdown(self.invincible_finished, "misc/poweroff.wav"); + play_countdown(self.invincible_finished, SND_POWEROFF); self.effects = self.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT); if (time > self.invincible_finished) { @@ -1525,7 +1373,7 @@ void player_powerups (void) } else { - play_countdown(self.superweapons_finished, "misc/poweroff.wav"); + play_countdown(self.superweapons_finished, SND_POWEROFF); if (time > self.superweapons_finished) { self.items = self.items - (self.items & IT_SUPERWEAPON); @@ -1613,7 +1461,7 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re return current; } -void player_regen (void) +void player_regen () {SELFPARAM(); float max_mod, regen_mod, rot_mod, limit_mod; max_mod = regen_mod = rot_mod = limit_mod = 1; @@ -1629,7 +1477,7 @@ void player_regen (void) regen_health_stable = autocvar_g_balance_health_regenstable; regen_health_rotstable = autocvar_g_balance_health_rotstable; if(!MUTATOR_CALLHOOK(PlayerRegen)) - if(!self.frozen) + if(!STAT(FROZEN, self)) { float mina, maxa, limith, limita; maxa = autocvar_g_balance_armor_rotstable; @@ -1657,7 +1505,8 @@ void player_regen (void) { if(self.vehicle) vehicles_exit(VHEF_RELEASE); - self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0'); + if(self.event_damage) + self.event_damage(self, self, self, 1, DEATH_ROT.m_id, self.origin, '0 0 0'); } if (!(self.items & IT_UNLIMITED_WEAPON_AMMO)) @@ -1684,19 +1533,20 @@ void SetZoomState(float z) } void GetPressedKeys() -{SELFPARAM(); +{ + SELFPARAM(); MUTATOR_CALLHOOK(GetPressedKeys); - #define X(var,bit,flag) (flag ? var |= bit : var &= ~bit) - X(self.pressedkeys, KEY_FORWARD, self.movement_x > 0); - X(self.pressedkeys, KEY_BACKWARD, self.movement_x < 0); - X(self.pressedkeys, KEY_RIGHT, self.movement_y > 0); - X(self.pressedkeys, KEY_LEFT, self.movement_y < 0); - - X(self.pressedkeys, KEY_JUMP, PHYS_INPUT_BUTTON_JUMP(self)); - X(self.pressedkeys, KEY_CROUCH, PHYS_INPUT_BUTTON_CROUCH(self)); - X(self.pressedkeys, KEY_ATCK, PHYS_INPUT_BUTTON_ATCK(self)); - X(self.pressedkeys, KEY_ATCK2, PHYS_INPUT_BUTTON_ATCK2(self)); - #undef X + int keys = this.pressedkeys; + keys = BITSET(keys, KEY_FORWARD, this.movement.x > 0); + keys = BITSET(keys, KEY_BACKWARD, this.movement.x < 0); + keys = BITSET(keys, KEY_RIGHT, this.movement.y > 0); + keys = BITSET(keys, KEY_LEFT, this.movement.y < 0); + + keys = BITSET(keys, KEY_JUMP, PHYS_INPUT_BUTTON_JUMP(this)); + keys = BITSET(keys, KEY_CROUCH, PHYS_INPUT_BUTTON_CROUCH(this)); + keys = BITSET(keys, KEY_ATCK, PHYS_INPUT_BUTTON_ATCK(this)); + keys = BITSET(keys, KEY_ATCK2, PHYS_INPUT_BUTTON_ATCK2(this)); + this.pressedkeys = keys; } /* @@ -1705,69 +1555,68 @@ spectate mode routines ====================== */ -void SpectateCopy(entity spectatee) -{SELFPARAM(); - MUTATOR_CALLHOOK(SpectateCopy, spectatee, self); - self.armortype = spectatee.armortype; - self.armorvalue = spectatee.armorvalue; - self.ammo_cells = spectatee.ammo_cells; - self.ammo_plasma = spectatee.ammo_plasma; - self.ammo_shells = spectatee.ammo_shells; - self.ammo_nails = spectatee.ammo_nails; - self.ammo_rockets = spectatee.ammo_rockets; - self.ammo_fuel = spectatee.ammo_fuel; - self.clip_load = spectatee.clip_load; - self.clip_size = spectatee.clip_size; - self.effects = spectatee.effects & EFMASK_CHEAP; // eat performance - self.health = spectatee.health; - self.impulse = 0; - self.items = spectatee.items; - self.last_pickup = spectatee.last_pickup; - self.hit_time = spectatee.hit_time; - self.metertime = spectatee.metertime; - self.strength_finished = spectatee.strength_finished; - self.invincible_finished = spectatee.invincible_finished; - self.pressedkeys = spectatee.pressedkeys; - self.weapons = spectatee.weapons; - self.switchweapon = spectatee.switchweapon; - self.switchingweapon = spectatee.switchingweapon; - self.weapon = spectatee.weapon; - self.vortex_charge = spectatee.vortex_charge; - self.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo; - self.hagar_load = spectatee.hagar_load; - self.arc_heat_percent = spectatee.arc_heat_percent; - self.minelayer_mines = spectatee.minelayer_mines; - self.punchangle = spectatee.punchangle; - self.view_ofs = spectatee.view_ofs; - self.velocity = spectatee.velocity; - self.dmg_take = spectatee.dmg_take; - self.dmg_save = spectatee.dmg_save; - self.dmg_inflictor = spectatee.dmg_inflictor; - self.v_angle = spectatee.v_angle; - self.angles = spectatee.v_angle; - self.frozen = spectatee.frozen; - self.revive_progress = spectatee.revive_progress; - if(!self.BUTTON_USE) - self.fixangle = true; - setorigin(self, spectatee.origin); - setsize(self, spectatee.mins, spectatee.maxs); +void SpectateCopy(entity this, entity spectatee) +{ + TC(Client, this); TC(Client, spectatee); + + MUTATOR_CALLHOOK(SpectateCopy, spectatee, this); + PS(this) = PS(spectatee); + this.armortype = spectatee.armortype; + this.armorvalue = spectatee.armorvalue; + this.ammo_cells = spectatee.ammo_cells; + this.ammo_plasma = spectatee.ammo_plasma; + this.ammo_shells = spectatee.ammo_shells; + this.ammo_nails = spectatee.ammo_nails; + this.ammo_rockets = spectatee.ammo_rockets; + this.ammo_fuel = spectatee.ammo_fuel; + this.clip_load = spectatee.clip_load; + this.clip_size = spectatee.clip_size; + this.effects = spectatee.effects & EFMASK_CHEAP; // eat performance + this.health = spectatee.health; + this.impulse = 0; + this.items = spectatee.items; + this.last_pickup = spectatee.last_pickup; + this.hit_time = spectatee.hit_time; + this.strength_finished = spectatee.strength_finished; + this.invincible_finished = spectatee.invincible_finished; + this.pressedkeys = spectatee.pressedkeys; + this.weapons = spectatee.weapons; + this.vortex_charge = spectatee.vortex_charge; + this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo; + this.hagar_load = spectatee.hagar_load; + this.arc_heat_percent = spectatee.arc_heat_percent; + this.minelayer_mines = spectatee.minelayer_mines; + this.punchangle = spectatee.punchangle; + this.view_ofs = spectatee.view_ofs; + this.velocity = spectatee.velocity; + this.dmg_take = spectatee.dmg_take; + this.dmg_save = spectatee.dmg_save; + this.dmg_inflictor = spectatee.dmg_inflictor; + this.v_angle = spectatee.v_angle; + this.angles = spectatee.v_angle; + STAT(FROZEN, this) = STAT(FROZEN, spectatee); + this.revive_progress = spectatee.revive_progress; + if(!PHYS_INPUT_BUTTON_USE(this)) + this.fixangle = true; + setorigin(this, spectatee.origin); + setsize(this, spectatee.mins, spectatee.maxs); SetZoomState(spectatee.zoomstate); - anticheat_spectatecopy(spectatee); - self.hud = spectatee.hud; + anticheat_spectatecopy(this, spectatee); + this.hud = spectatee.hud; if(spectatee.vehicle) { - self.fixangle = false; - //self.velocity = spectatee.vehicle.velocity; - self.vehicle_health = spectatee.vehicle_health; - self.vehicle_shield = spectatee.vehicle_shield; - self.vehicle_energy = spectatee.vehicle_energy; - self.vehicle_ammo1 = spectatee.vehicle_ammo1; - self.vehicle_ammo2 = spectatee.vehicle_ammo2; - self.vehicle_reload1 = spectatee.vehicle_reload1; - self.vehicle_reload2 = spectatee.vehicle_reload2; - - msg_entity = self; + this.fixangle = false; + //this.velocity = spectatee.vehicle.velocity; + this.vehicle_health = spectatee.vehicle_health; + this.vehicle_shield = spectatee.vehicle_shield; + this.vehicle_energy = spectatee.vehicle_energy; + this.vehicle_ammo1 = spectatee.vehicle_ammo1; + this.vehicle_ammo2 = spectatee.vehicle_ammo2; + this.vehicle_reload1 = spectatee.vehicle_reload1; + this.vehicle_reload2 = spectatee.vehicle_reload2; + + msg_entity = this; WriteByte (MSG_ONE, SVC_SETVIEWANGLES); WriteAngle(MSG_ONE, spectatee.v_angle.x); @@ -1775,9 +1624,9 @@ void SpectateCopy(entity spectatee) WriteAngle(MSG_ONE, spectatee.v_angle.z); //WriteByte (MSG_ONE, SVC_SETVIEW); - // WriteEntity(MSG_ONE, self); + // WriteEntity(MSG_ONE, this); //makevectors(spectatee.v_angle); - //setorigin(self, spectatee.origin - v_forward * 400 + v_up * 300);*/ + //setorigin(this, spectatee.origin - v_forward * 400 + v_up * 300);*/ } } @@ -1788,11 +1637,11 @@ bool SpectateUpdate() if(!IS_PLAYER(self.enemy) || self == self.enemy) { - SetSpectator(self, world); + SetSpectatee(self, NULL); return false; } - SpectateCopy(self.enemy); + SpectateCopy(this, this.enemy); return true; } @@ -1814,7 +1663,7 @@ bool SpectateSet() return true; } -void SetSpectator(entity player, entity spectatee) +void SetSpectatee(entity player, entity spectatee) { entity old_spectatee = player.enemy; @@ -1828,51 +1677,24 @@ void SetSpectator(entity player, entity spectatee) bool Spectate(entity pl) {SELFPARAM(); - if(g_ca && !autocvar_g_ca_spectate_enemies && self.caplayer) - if(DIFF_TEAM(pl, self)) + if(MUTATOR_CALLHOOK(SpectateSet, self, pl)) return false; + pl = spec_player; - SetSpectator(self, pl); + SetSpectatee(self, pl); return SpectateSet(); } -// Returns next available player to spectate if g_ca_spectate_enemies == 0 -entity CA_SpectateNext(entity start) -{SELFPARAM(); - if(SAME_TEAM(start, self)) - return start; - - other = start; - // continue from current player - while(other && DIFF_TEAM(other, self)) - other = find(other, classname, "player"); - - if (!other) - { - // restart from begining - other = find(other, classname, "player"); - while(other && DIFF_TEAM(other, self)) - other = find(other, classname, "player"); - } - - return other; -} - bool SpectateNext() {SELFPARAM(); - other = find(self.enemy, classname, "player"); + other = find(self.enemy, classname, STR_PLAYER); - if (g_ca && !autocvar_g_ca_spectate_enemies && self.caplayer) - // CA and ca players when spectating enemies is forbidden - other = CA_SpectateNext(other); - else - { - // other modes and ca spectators or spectating enemies is allowed - if (!other) - other = find(other, classname, "player"); - } + if (MUTATOR_CALLHOOK(SpectateNext, self, other)) + other = spec_player; + else if (!other) + other = find(other, classname, STR_PLAYER); - if(other) { SetSpectator(self, other); } + if(other) { SetSpectatee(self, other); } return SpectateSet(); } @@ -1880,7 +1702,7 @@ bool SpectateNext() bool SpectatePrev() {SELFPARAM(); // NOTE: chain order is from the highest to the lower entnum (unlike find) - other = findchain(classname, "player"); + other = findchain(classname, STR_PLAYER); if (!other) // no player return false; @@ -1890,28 +1712,26 @@ bool SpectatePrev() while(other && other != self.enemy) other = other.chain; - if (g_ca && !autocvar_g_ca_spectate_enemies && self.caplayer) + switch (MUTATOR_CALLHOOK(SpectatePrev, self, other, first)) { - do { other = other.chain; } - while(other && DIFF_TEAM(other, self)); - - if (!other) + case MUT_SPECPREV_FOUND: + other = spec_player; + break; + case MUT_SPECPREV_RETURN: + other = spec_player; + return true; + case MUT_SPECPREV_CONTINUE: + default: { - other = first; - while(other && DIFF_TEAM(other, self)) + if(other.chain) other = other.chain; - if(other == self.enemy) - return true; + else + other = first; + break; } } - else - { - if(other.chain) - other = other.chain; - else - other = first; - } - SetSpectator(self, other); + + SetSpectatee(self, other); return SpectateSet(); } @@ -1925,7 +1745,7 @@ Update a respawn countdown display. void ShowRespawnCountdown() {SELFPARAM(); float number; - if(self.deadflag == DEAD_NO) // just respawned? + if(!IS_DEAD(self)) // just respawned? return; else { @@ -1945,24 +1765,23 @@ void LeaveSpectatorMode() {SELFPARAM(); if(self.caplayer) return; - if(nJoinAllowed(self)) + if(nJoinAllowed(self, self)) { if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || (self.wasplayer && autocvar_g_changeteam_banned) || self.team_forced > 0) { - self.classname = "player"; - nades_RemoveBonus(self); + TRANSMUTE(Player, self); if(autocvar_g_campaign || autocvar_g_balance_teams) { JoinBestTeam(self, false, true); } if(autocvar_g_campaign) - { campaign_bots_may_start = 1; } + { campaign_bots_may_start = true; } - Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CPID_PREVENT_JOIN); PutClientInServer(); - if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname); } + if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), self.netname); } } else stuffcmd(self, "menu_showteamselect\n"); @@ -1980,40 +1799,39 @@ void LeaveSpectatorMode() * it checks whether the number of currently playing players exceeds g_maxplayers. * @return int number of free slots for players, 0 if none */ -float nJoinAllowed(entity ignore) -{SELFPARAM(); +bool nJoinAllowed(entity this, entity ignore) +{ if(!ignore) // this is called that way when checking if anyone may be able to join (to build qcstatus) // so report 0 free slots if restricted { if(autocvar_g_forced_team_otherwise == "spectate") - return 0; + return false; if(autocvar_g_forced_team_otherwise == "spectator") - return 0; + return false; } - if(self.team_forced < 0) - return 0; // forced spectators can never join + if(this.team_forced < 0) + return false; // forced spectators can never join // TODO simplify this - entity e; - float totalClients = 0; - FOR_EACH_CLIENT(e) - if(e != ignore) - totalClients += 1; + int totalClients = 0; + int currentlyPlaying = 0; + FOREACH_CLIENT(true, LAMBDA( + if(it != ignore) + ++totalClients; + if(IS_REAL_CLIENT(it)) + if(IS_PLAYER(it) || it.caplayer) + ++currentlyPlaying; + )); if (!autocvar_g_maxplayers) return maxclients - totalClients; - float currentlyPlaying = 0; - FOR_EACH_REALCLIENT(e) - if(IS_PLAYER(e) || e.caplayer) - currentlyPlaying += 1; - if(currentlyPlaying < autocvar_g_maxplayers) return min(maxclients - totalClients, autocvar_g_maxplayers - currentlyPlaying); - return 0; + return false; } /** @@ -2038,12 +1856,12 @@ void PrintWelcomeMessage() if(self.motd_actived_time == 0) { if (autocvar_g_campaign) { - if ((IS_PLAYER(self) && self.BUTTON_INFO) || (!IS_PLAYER(self))) { + if ((IS_PLAYER(self) && PHYS_INPUT_BUTTON_INFO(self)) || (!IS_PLAYER(self))) { self.motd_actived_time = time; Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD, campaign_message); } } else { - if (self.BUTTON_INFO) { + if (PHYS_INPUT_BUTTON_INFO(self)) { self.motd_actived_time = time; Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); } @@ -2052,30 +1870,30 @@ void PrintWelcomeMessage() else if(self.motd_actived_time > 0) // showing MOTD or campaign message { if (autocvar_g_campaign) { - if (self.BUTTON_INFO) + if (PHYS_INPUT_BUTTON_INFO(self)) self.motd_actived_time = time; else if ((time - self.motd_actived_time > 2) && IS_PLAYER(self)) { // hide it some seconds after BUTTON_INFO has been released self.motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CPID_MOTD); } } else { - if (self.BUTTON_INFO) + if (PHYS_INPUT_BUTTON_INFO(self)) self.motd_actived_time = time; else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released self.motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CPID_MOTD); } } } else //if(self.motd_actived_time < 0) // just connected, motd is active { - if(self.BUTTON_INFO) // BUTTON_INFO hides initial MOTD + if(PHYS_INPUT_BUTTON_INFO(self)) // BUTTON_INFO hides initial MOTD self.motd_actived_time = -2; // wait until BUTTON_INFO gets released - else if(self.motd_actived_time == -2 || IS_PLAYER(self)) + else if(self.motd_actived_time == -2 || IS_PLAYER(self) || IS_SPEC(self)) { // instanctly hide MOTD self.motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CPID_MOTD); } } } @@ -2084,26 +1902,26 @@ void ObserverThink() {SELFPARAM(); if ( self.impulse ) { - MinigameImpulse(self.impulse); + MinigameImpulse(self, self.impulse); self.impulse = 0; } float prefered_movetype; if (self.flags & FL_JUMPRELEASED) { - if (self.BUTTON_JUMP && !self.version_mismatch) { + if (PHYS_INPUT_BUTTON_JUMP(self) && !self.version_mismatch) { self.flags &= ~FL_JUMPRELEASED; self.flags |= FL_SPAWNING; - } else if(self.BUTTON_ATCK && !self.version_mismatch) { + } else if(PHYS_INPUT_BUTTON_ATCK(self) && !self.version_mismatch) { self.flags &= ~FL_JUMPRELEASED; if(SpectateNext()) { - self.classname = "spectator"; + TRANSMUTE(Spectator, self); } } else { - prefered_movetype = ((!self.BUTTON_USE ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP); + prefered_movetype = ((!PHYS_INPUT_BUTTON_USE(self) ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP); if (self.movetype != prefered_movetype) self.movetype = prefered_movetype; } } else { - if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) { + if (!(PHYS_INPUT_BUTTON_ATCK(self) || PHYS_INPUT_BUTTON_JUMP(self))) { self.flags |= FL_JUMPRELEASED; if(self.flags & FL_SPAWNING) { @@ -2119,41 +1937,41 @@ void SpectatorThink() {SELFPARAM(); if ( self.impulse ) { - if(MinigameImpulse(self.impulse)) + if(MinigameImpulse(self, self.impulse)) self.impulse = 0; } if (self.flags & FL_JUMPRELEASED) { - if (self.BUTTON_JUMP && !self.version_mismatch) { + if (PHYS_INPUT_BUTTON_JUMP(self) && !self.version_mismatch) { self.flags &= ~FL_JUMPRELEASED; self.flags |= FL_SPAWNING; - } else if(self.BUTTON_ATCK || self.impulse == 10 || self.impulse == 15 || self.impulse == 18 || (self.impulse >= 200 && self.impulse <= 209)) { + } else if(PHYS_INPUT_BUTTON_ATCK(self) || self.impulse == 10 || self.impulse == 15 || self.impulse == 18 || (self.impulse >= 200 && self.impulse <= 209)) { self.flags &= ~FL_JUMPRELEASED; if(SpectateNext()) { - self.classname = "spectator"; + TRANSMUTE(Spectator, self); } else { - self.classname = "observer"; + TRANSMUTE(Observer, self); PutClientInServer(); } self.impulse = 0; } else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19 || (self.impulse >= 220 && self.impulse <= 229)) { self.flags &= ~FL_JUMPRELEASED; if(SpectatePrev()) { - self.classname = "spectator"; + TRANSMUTE(Spectator, self); } else { - self.classname = "observer"; + TRANSMUTE(Observer, self); PutClientInServer(); } self.impulse = 0; - } else if (self.BUTTON_ATCK2) { + } else if (PHYS_INPUT_BUTTON_ATCK2(self)) { self.flags &= ~FL_JUMPRELEASED; - self.classname = "observer"; + TRANSMUTE(Observer, self); PutClientInServer(); } else { if(!SpectateUpdate()) PutObserverInServer(); } } else { - if (!(self.BUTTON_ATCK || self.BUTTON_ATCK2)) { + if (!(PHYS_INPUT_BUTTON_ATCK(self) || PHYS_INPUT_BUTTON_ATCK2(self))) { self.flags |= FL_JUMPRELEASED; if(self.flags & FL_SPAWNING) { @@ -2185,17 +2003,17 @@ void PlayerUseKey() } else if(autocvar_g_vehicles_enter) { - if(!self.frozen) - if(self.deadflag == DEAD_NO) + if(!STAT(FROZEN, self)) + if(!IS_DEAD(self)) if(!gameover) { entity head, closest_target = world; - head = WarpZone_FindRadius(self.origin, autocvar_g_vehicles_enter_radius, TRUE); + head = WarpZone_FindRadius(self.origin, autocvar_g_vehicles_enter_radius, true); while(head) // find the closest acceptable target to enter { if(head.vehicle_flags & VHF_ISVEHICLE) - if(head.deadflag == DEAD_NO) + if(!IS_DEAD(head)) if(!head.owner || ((head.vehicle_flags & VHF_MULTISLOT) && SAME_TEAM(head.owner, self))) if(head.takedamage != DAMAGE_NO) { @@ -2218,32 +2036,6 @@ void PlayerUseKey() MUTATOR_CALLHOOK(PlayerUseKey); } -float isInvisibleString(string s) -{ - float i, n, c; - s = strdecolorize(s); - for((i = 0), (n = strlen(s)); i < n; ++i) - { - c = str2chr(s, i); - switch(c) - { - case 0: - case 32: // space - break; - case 192: // charmap space - if (!autocvar_utf8_enable) - break; - return false; - case 160: // space in unicode fonts - case 0xE000 + 192: // utf8 charmap space - if (autocvar_utf8_enable) - break; - default: - return false; - } - } - return true; -} /* ============= @@ -2256,9 +2048,9 @@ Called every frame for each client before the physics are run void() nexball_setstatus; .float last_vehiclecheck; .int items_added; -void PlayerPreThink (void) +void PlayerPreThink () {SELFPARAM(); - WarpZone_PlayerPhysics_FixVAngle(); + WarpZone_PlayerPhysics_FixVAngle(self); self.stat_game_starttime = game_starttime; self.stat_round_starttime = round_starttime; @@ -2270,7 +2062,7 @@ void PlayerPreThink (void) if(frametime) { // physics frames: update anticheat stuff - anticheat_prethink(); + anticheat_prethink(self); } if(blockSpectators && frametime) @@ -2303,9 +2095,9 @@ void PlayerPreThink (void) if(time > self.version_nagtime) { // don't notify git users - if(strstr(self.cvar_g_xonoticversion, "git", 0) < 0 && strstr(self.cvar_g_xonoticversion, "autobuild", 0) < 0) + if(strstrofs(self.cvar_g_xonoticversion, "git", 0) < 0 && strstrofs(self.cvar_g_xonoticversion, "autobuild", 0) < 0) { - if(strstr(autocvar_g_xonoticversion, "git", 0) >= 0 || strstr(autocvar_g_xonoticversion, "autobuild", 0) >= 0) + if(strstrofs(autocvar_g_xonoticversion, "git", 0) >= 0 || strstrofs(autocvar_g_xonoticversion, "autobuild", 0) >= 0) { // notify release users if connecting to git LOG_TRACE("^1NOTE^7 to ", self.netname, "^7 - the server is running ^3Xonotic ", autocvar_g_xonoticversion, " (beta)^7, you have ^3Xonotic ", self.cvar_g_xonoticversion, "^1\n"); @@ -2339,7 +2131,7 @@ void PlayerPreThink (void) self.max_armorvalue = 0; } - if(self.frozen == 2) + if(STAT(FROZEN, self) == 2) { self.revive_progress = bound(0, self.revive_progress + frametime * self.revive_speed, 1); self.health = max(1, self.revive_progress * start_health); @@ -2348,7 +2140,7 @@ void PlayerPreThink (void) if(self.revive_progress >= 1) Unfreeze(self); } - else if(self.frozen == 3) + else if(STAT(FROZEN, self) == 3) { self.revive_progress = bound(0, self.revive_progress - frametime * self.revive_speed, 1); self.health = max(0, autocvar_g_nades_ice_health + (start_health-autocvar_g_nades_ice_health) * self.revive_progress ); @@ -2357,7 +2149,7 @@ void PlayerPreThink (void) { if(self.vehicle) vehicles_exit(VHEF_RELEASE); - self.event_damage(self, self.frozen_by, 1, DEATH_NADE_ICE_FREEZE, self.origin, '0 0 0'); + self.event_damage(self, self, self.frozen_by, 1, DEATH_NADE_ICE_FREEZE.m_id, self.origin, '0 0 0'); } else if ( self.revive_progress <= 0 ) Unfreeze(self); @@ -2369,14 +2161,14 @@ void PlayerPreThink (void) if(time > self.last_vehiclecheck) if(IS_PLAYER(self)) if(!gameover) - if(!self.frozen) + if(!STAT(FROZEN, self)) if(!self.vehicle) - if(self.deadflag == DEAD_NO) + if(!IS_DEAD(self)) { entity veh; for(veh = world; (veh = findflags(veh, vehicle_flags, VHF_ISVEHICLE)); ) if(vlen(veh.origin - self.origin) < autocvar_g_vehicles_enter_radius) - if(veh.deadflag == DEAD_NO) + if(!IS_DEAD(veh)) if(veh.takedamage != DAMAGE_NO) if((veh.vehicle_flags & VHF_MULTISLOT) && SAME_TEAM(veh.owner, self)) Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_VEHICLE_ENTER_GUNNER); @@ -2391,9 +2183,9 @@ void PlayerPreThink (void) if(!self.cvar_cl_newusekeysupported) // FIXME remove this - it was a stupid idea to begin with, we can JUST use the button { - if(self.BUTTON_USE && !self.usekeypressed) + if(PHYS_INPUT_BUTTON_USE(self) && !self.usekeypressed) PlayerUseKey(); - self.usekeypressed = self.BUTTON_USE; + self.usekeypressed = PHYS_INPUT_BUTTON_USE(self); } if(IS_REAL_CLIENT(self)) @@ -2420,26 +2212,10 @@ void PlayerPreThink (void) if(frametime) { - if(self.weapon == WEP_VORTEX.m_id && WEP_CVAR(vortex, charge)) - { - self.weaponentity_glowmod_x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, self.vortex_charge / WEP_CVAR(vortex, charge_animlimit)); - self.weaponentity_glowmod_y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * min(1, self.vortex_charge / WEP_CVAR(vortex, charge_animlimit)); - self.weaponentity_glowmod_z = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_half * min(1, self.vortex_charge / WEP_CVAR(vortex, charge_animlimit)); - - if(self.vortex_charge > WEP_CVAR(vortex, charge_animlimit)) - { - self.weaponentity_glowmod_x = self.weaponentity_glowmod.x + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_full * (self.vortex_charge - WEP_CVAR(vortex, charge_animlimit)) / (1 - WEP_CVAR(vortex, charge_animlimit)); - self.weaponentity_glowmod_y = self.weaponentity_glowmod.y + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_full * (self.vortex_charge - WEP_CVAR(vortex, charge_animlimit)) / (1 - WEP_CVAR(vortex, charge_animlimit)); - self.weaponentity_glowmod_z = self.weaponentity_glowmod.z + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (self.vortex_charge - WEP_CVAR(vortex, charge_animlimit)) / (1 - WEP_CVAR(vortex, charge_animlimit)); - } - } - else - self.weaponentity_glowmod = colormapPaletteColor(self.clientcolors & 0x0F, true) * 2; - player_powerups(); } - if (self.deadflag != DEAD_NO) + if (IS_DEAD(self)) { if(self.personal && g_race_qualifying) { @@ -2456,7 +2232,7 @@ void PlayerPreThink (void) float button_pressed; if(frametime) player_anim(); - button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_HOOK || self.BUTTON_USE); + button_pressed = (PHYS_INPUT_BUTTON_ATCK(self) || PHYS_INPUT_BUTTON_JUMP(self) || PHYS_INPUT_BUTTON_ATCK2(self) || PHYS_INPUT_BUTTON_HOOK(self) || PHYS_INPUT_BUTTON_USE(self)); if (self.deadflag == DEAD_DYING) { @@ -2506,17 +2282,18 @@ void PlayerPreThink (void) self.prevorigin = self.origin; - float do_crouch = self.BUTTON_CROUCH; + float do_crouch = PHYS_INPUT_BUTTON_CROUCH(self); if(self.hook.state) do_crouch = 0; if(self.vehicle) do_crouch = 0; - if(self.frozen) + if(STAT(FROZEN, self)) do_crouch = 0; // WEAPONTODO: THIS SHIT NEEDS TO GO EVENTUALLY // It cannot be predicted by the engine! - if((self.weapon == WEP_SHOCKWAVE.m_id || self.weapon == WEP_SHOTGUN.m_id) && self.weaponentity.wframe == WFRAME_FIRE2 && time < self.weapon_nextthink) + .entity weaponentity = weaponentities[0]; // TODO: unhardcode + if((PS(self).m_weapon == WEP_SHOCKWAVE || PS(self).m_weapon == WEP_SHOTGUN) && self.(weaponentity).wframe == WFRAME_FIRE2 && time < self.(weaponentity).weapon_nextthink) do_crouch = 0; if (do_crouch) @@ -2524,8 +2301,8 @@ void PlayerPreThink (void) if (!self.crouch) { self.crouch = true; - self.view_ofs = self.stat_pl_crouch_view_ofs; - setsize (self, self.stat_pl_crouch_min, self.stat_pl_crouch_max); + self.view_ofs = STAT(PL_CROUCH_VIEW_OFS, self); + setsize (self, STAT(PL_CROUCH_MIN, self), STAT(PL_CROUCH_MAX, self)); // setanim(self, self.anim_duck, false, true, true); // this anim is BROKEN anyway } } @@ -2533,26 +2310,24 @@ void PlayerPreThink (void) { if (self.crouch) { - tracebox(self.origin, self.stat_pl_min, self.stat_pl_max, self.origin, false, self); + tracebox(self.origin, STAT(PL_MIN, self), STAT(PL_MAX, self), self.origin, false, self); if (!trace_startsolid) { self.crouch = false; - self.view_ofs = self.stat_pl_view_ofs; - setsize (self, self.stat_pl_min, self.stat_pl_max); + self.view_ofs = STAT(PL_VIEW_OFS, self); + setsize (self, STAT(PL_MIN, self), STAT(PL_MAX, self)); } } } - FixPlayermodel(); - - GrapplingHookFrame(); + FixPlayermodel(self); // LordHavoc: allow firing on move frames (sub-ticrate), this gives better timing on slow servers //if(frametime) { self.items &= ~self.items_added; - W_WeaponFrame(); + W_WeaponFrame(self); self.items_added = 0; if(self.items & ITEM_Jetpack.m_itemid) @@ -2576,7 +2351,7 @@ void PlayerPreThink (void) secrets_setstatus(); // monsters status - monsters_setstatus(); + monsters_setstatus(self); self.dmg_team = max(0, self.dmg_team - autocvar_g_teamdamage_resetspeed * frametime); @@ -2593,19 +2368,26 @@ void PlayerPreThink (void) // WEAPONTODO: Add weapon request for this if(!zoomstate_set) - SetZoomState(self.BUTTON_ZOOM || self.BUTTON_ZOOMSCRIPT || (self.BUTTON_ATCK2 && self.weapon == WEP_VORTEX.m_id) || (self.BUTTON_ATCK2 && self.weapon == WEP_RIFLE.m_id && WEP_CVAR(rifle, secondary) == 0)); // WEAPONTODO + SetZoomState( + PHYS_INPUT_BUTTON_ZOOM(self) + || PHYS_INPUT_BUTTON_ZOOMSCRIPT(self) + || (PHYS_INPUT_BUTTON_ATCK2(self) && PS(self).m_weapon == WEP_VORTEX) + || (PHYS_INPUT_BUTTON_ATCK2(self) && PS(self).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0) + ); // WEAPONTODO float oldspectatee_status; oldspectatee_status = self.spectatee_status; if(IS_SPEC(self)) - self.spectatee_status = num_for_edict(self.enemy); + self.spectatee_status = etof(self.enemy); else if(IS_OBSERVER(self)) - self.spectatee_status = num_for_edict(self); + self.spectatee_status = etof(self); else self.spectatee_status = 0; if(self.spectatee_status != oldspectatee_status) { ClientData_Touch(self); + if(g_race || g_cts) + race_InitSpectator(); } if(self.teamkill_soundtime) @@ -2613,31 +2395,50 @@ void PlayerPreThink (void) { self.teamkill_soundtime = 0; - setself(self.teamkill_soundsource); - entity oldpusher = self.pusher; - self.pusher = this; - - PlayerSound(playersound_teamshoot, CH_VOICE, VOICETYPE_LASTATTACKER_ONLY); - - self.pusher = oldpusher; - setself(this); + entity e = self.teamkill_soundsource; + entity oldpusher = e.pusher; + e.pusher = this; + PlayerSound(e, playersound_teamshoot, CH_VOICE, VOICETYPE_LASTATTACKER_ONLY); + e.pusher = oldpusher; } if(self.taunt_soundtime) if(time > self.taunt_soundtime) { self.taunt_soundtime = 0; - PlayerSound(playersound_taunt, CH_VOICE, VOICETYPE_AUTOTAUNT); + PlayerSound(self, playersound_taunt, CH_VOICE, VOICETYPE_AUTOTAUNT); } target_voicescript_next(self); // WEAPONTODO: Move into weaponsystem somehow // if a player goes unarmed after holding a loaded weapon, empty his clip size and remove the crosshair ammo ring - if(!self.weapon) + if (PS(self).m_weapon == WEP_Null) self.clip_load = self.clip_size = 0; } +void DrownPlayer(entity this) +{ + if(IS_DEAD(this)) + return; + + if (this.waterlevel != WATERLEVEL_SUBMERGED) + { + if(this.air_finished < time) + PlayerSound(this, playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND); + this.air_finished = time + autocvar_g_balance_contents_drowndelay; + this.dmg = 2; + } + else if (this.air_finished < time) + { // drown! + if (this.pain_finished < time) + { + Damage (this, world, world, autocvar_g_balance_contents_playerdamage_drowning * autocvar_g_balance_contents_damagerate, DEATH_DROWN.m_id, this.origin, '0 0 0'); + this.pain_finished = time + 0.5; + } + } +} + /* ============= PlayerPostThink @@ -2646,7 +2447,7 @@ Called every frame for each client after the physics are run ============= */ .float idlekick_lasttimeleft; -void PlayerPostThink (void) +void PlayerPostThink () {SELFPARAM(); if(sv_maxidle > 0 && frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero). if(IS_REAL_CLIENT(self)) @@ -2657,7 +2458,7 @@ void PlayerPostThink (void) if(self.idlekick_lasttimeleft) { self.idlekick_lasttimeleft = 0; - Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_IDLING); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CPID_IDLING); } } else @@ -2689,10 +2490,11 @@ void PlayerPostThink (void) //CheckPlayerJump(); if(IS_PLAYER(self)) { + DrownPlayer(self); CheckRules_Player(); UpdateChatBubble(); if (self.impulse) - ImpulseCommands(); + ImpulseCommands(self); if (intermission_running) return; // intermission or finale GetPressedKeys(); @@ -2715,7 +2517,7 @@ void PlayerPostThink (void) */ if(self.waypointsprite_attachedforcarrier) - WaypointSprite_UpdateHealth(self.waypointsprite_attachedforcarrier, '1 0 0' * healtharmor_maxdamage(self.health, self.armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON)); + WaypointSprite_UpdateHealth(self.waypointsprite_attachedforcarrier, '1 0 0' * healtharmor_maxdamage(self.health, self.armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id)); playerdemo_write();