X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=2e2116c3496a40e1cafdf39e97918ef79f3b4569;hb=57659ff7226cfc4411d212a5aa1875effbf7d4e1;hp=f1d417d6bace6987d6f1a72984f6f77260b7db0f;hpb=b2d3d16a9a3e5df1c518ecd2fce0bfa741db190a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index f1d417d6b..2e2116c34 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -12,7 +12,9 @@ #include "teamplay.qh" #include "playerdemo.qh" #include "spawnpoints.qh" +#include "resources.qh" #include "g_damage.qh" +#include "handicap.qh" #include "g_hook.qh" #include "command/common.qh" #include "cheats.qh" @@ -59,6 +61,8 @@ #include "../lib/warpzone/server.qh" +#include + STATIC_METHOD(Client, Add, void(Client this, int _team)) { ClientConnect(this); @@ -218,9 +222,20 @@ void PutObserverInServer(entity this) bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this); PlayerState_detach(this); - if (IS_PLAYER(this) && this.health >= 1) { - // despawn effect - Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); + if (IS_PLAYER(this)) + { + if(this.health >= 1) + { + // despawn effect + Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); + } + + // was a player, recount votes and ready status + if(IS_REAL_CLIENT(this)) + { + if (vote_called) { VoteCount(false); } + ReadyCount(); + } } { @@ -257,7 +272,7 @@ void PutObserverInServer(entity this) if (this.alivetime) { if (!warmup_stage) - PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime); + PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime); this.alivetime = 0; } @@ -268,7 +283,9 @@ void PutObserverInServer(entity this) if (mutator_returnvalue) { // mutator prevents resetting teams+score } else { + int oldteam = this.team; this.team = -1; // move this as it is needed to log the player spectating in eventlog + MUTATOR_CALLHOOK(Player_ChangedTeam, this, oldteam, this.team); this.frags = FRAGS_SPECTATOR; PlayerScore_Clear(this); // clear scores when needed } @@ -522,7 +539,6 @@ void PutPlayerInServer(entity this) 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; @@ -544,6 +560,8 @@ void PutPlayerInServer(entity this) this.health = start_health; this.armorvalue = start_armorvalue; this.weapons = start_weapons; + GiveRandomWeapons(this, random_start_weapons_count, + autocvar_g_random_start_weapons, random_start_ammo); } SetSpectatee_status(this, 0); @@ -857,19 +875,19 @@ Called when a client types 'kill' in the console .float clientkill_nexttime; void ClientKill_Now_TeamChange(entity this) { - if(CS(this).killindicator_teamchange == -1) + if(this.killindicator_teamchange == -1) { JoinBestTeam( this, false, true ); } - else if(CS(this).killindicator_teamchange == -2) + else if(this.killindicator_teamchange == -2) { if(blockSpectators) Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); PutObserverInServer(this); } else - SV_ChangeTeam(this, CS(this).killindicator_teamchange - 1); - CS(this).killindicator_teamchange = 0; + SV_ChangeTeam(this, this.killindicator_teamchange - 1); + this.killindicator_teamchange = 0; } void ClientKill_Now(entity this) @@ -877,7 +895,7 @@ void ClientKill_Now(entity this) if(this.vehicle) { vehicles_exit(this.vehicle, VHEF_RELEASE); - if(!CS(this).killindicator_teamchange) + if(!this.killindicator_teamchange) { this.vehicle_health = -1; Damage(this, this, this, 1 , DEATH_KILL.m_id, this.origin, '0 0 0'); @@ -889,11 +907,13 @@ void ClientKill_Now(entity this) this.killindicator = NULL; - if(CS(this).killindicator_teamchange) + if(this.killindicator_teamchange) ClientKill_Now_TeamChange(this); - if(!IS_SPEC(this) && !IS_OBSERVER(this)) + if (!IS_SPEC(this) && !IS_OBSERVER(this) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false) + { Damage(this, this, this, 100000, DEATH_KILL.m_id, this.origin, '0 0 0'); + } // now I am sure the player IS dead } @@ -952,7 +972,7 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change, return; killtime = M_ARGV(1, float); - CS(this).killindicator_teamchange = targetteam; + this.killindicator_teamchange = targetteam; if(!this.killindicator) { @@ -1199,8 +1219,6 @@ void ClientConnect(entity this) CS(this).just_joined = true; // stop spamming the eventlog with additional lines when the client connects - CS(this).netname_previous = strzone(this.netname); - if(teamplay && IS_PLAYER(this)) Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname); else @@ -1267,6 +1285,8 @@ void ClientConnect(entity this) it.init_for_player(it, this); }); + Handicap_Initialize(this); + MUTATOR_CALLHOOK(ClientConnect, this); if (IS_REAL_CLIENT(this)) @@ -1628,8 +1648,8 @@ void player_regen(entity this) float mina, maxa, limith, limita; maxa = autocvar_g_balance_armor_rotstable; mina = autocvar_g_balance_armor_regenstable; - limith = autocvar_g_balance_health_limit; - limita = autocvar_g_balance_armor_limit; + limith = GetResourceLimit(this, RESOURCE_HEALTH); + limita = GetResourceLimit(this, RESOURCE_ARMOR); regen_health_rotstable = regen_health_rotstable * max_mod; regen_health_stable = regen_health_stable * max_mod; @@ -1656,7 +1676,7 @@ void player_regen(entity this) maxf = autocvar_g_balance_fuel_rotstable; minf = autocvar_g_balance_fuel_regenstable; - limitf = autocvar_g_balance_fuel_limit; + limitf = GetResourceLimit(this, RESOURCE_FUEL); this.ammo_fuel = CalcRotRegen(this.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > this.pauseregen_finished) * ((this.items & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > this.pauserotfuel_finished), limitf); } @@ -1738,6 +1758,8 @@ void SpectateCopy(entity this, entity spectatee) this.weapons = spectatee.weapons; this.vortex_charge = spectatee.vortex_charge; this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo; + this.okvortex_charge = spectatee.okvortex_charge; + this.okvortex_chargepool_ammo = spectatee.okvortex_chargepool_ammo; this.hagar_load = spectatee.hagar_load; this.arc_heat_percent = spectatee.arc_heat_percent; this.minelayer_mines = spectatee.minelayer_mines; @@ -2474,19 +2496,22 @@ void PlayerPreThink (entity this) // WORKAROUND: only use dropclient in server frames (frametime set). // Never use it in cl_movement frames (frametime zero). checkSpectatorBlock(this); - } + } zoomstate_set = false; // Check for nameless players - if (isInvisibleString(this.netname)) { - this.netname = strzone(sprintf("Player#%d", this.playerid)); - // stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe? - } - if (this.netname != CS(this).netname_previous) { - if (autocvar_sv_eventlog) { + if (this.netname == "" || this.netname != CS(this).netname_previous) + { + bool assume_unchanged = (CS(this).netname_previous == ""); + if (isInvisibleString(this.netname)) + { + this.netname = strzone(sprintf("Player#%d", this.playerid)); + assume_unchanged = false; + // stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe? + } + if (!assume_unchanged && autocvar_sv_eventlog) GameLogEcho(strcat(":name:", ftos(this.playerid), ":", playername(this, false))); - } if (CS(this).netname_previous) strunzone(CS(this).netname_previous); CS(this).netname_previous = strzone(this.netname); } @@ -2645,7 +2670,6 @@ void DrownPlayer(entity this) if(this.air_finished < time) PlayerSound(this, playersound_gasp, CH_PLAYER, VOL_BASE, VOICETYPE_PLAYERSOUND); this.air_finished = time + autocvar_g_balance_contents_drowndelay; - this.dmg = 2; } else if (this.air_finished < time) { // drown!