X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=3688c4eceb49022b6cf05770addf58ff4635d305;hp=13111fbd6517b71108b696429732f92b98d622a0;hb=b945d959784e5b249c66aea4f3326d8ae048f1cd;hpb=a178ce04d0e69fccb80466c7fdb6913676dbfca7 diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 13111fbd65..3688c4eceb 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -220,9 +220,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(); + } } { @@ -259,7 +270,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; } @@ -496,7 +507,7 @@ void PutPlayerInServer(entity this) accuracy_resend(this); if (this.team < 0) - JoinBestTeam(this, false, true); + JoinBestTeam(this, true); entity spot = SelectSpawnPoint(this, false); if (!spot) { @@ -526,7 +537,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; @@ -548,6 +558,11 @@ void PutPlayerInServer(entity this) this.health = start_health; this.armorvalue = start_armorvalue; this.weapons = start_weapons; + if (MUTATOR_CALLHOOK(ForbidRandomStartWeapons, this) == false) + { + GiveRandomWeapons(this, random_start_weapons_count, + autocvar_g_random_start_weapons, random_start_ammo); + } } SetSpectatee_status(this, 0); @@ -602,7 +617,10 @@ void PutPlayerInServer(entity this) this.fire_endtime = -1; this.revive_progress = 0; this.revival_time = 0; + this.air_finished = time + 12; + this.waterlevel = WATERLEVEL_NONE; + this.watertype = CONTENT_EMPTY; entity spawnevent = new_pure(spawnevent); spawnevent.owner = this; @@ -624,7 +642,6 @@ void PutPlayerInServer(entity this) 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 this.oldorigin = this.origin; - this.lastteleporttime = time; // prevent insane speeds due to changing origin if(this.conveyor) IL_REMOVE(g_conveyed, this); this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player @@ -642,9 +659,11 @@ void PutPlayerInServer(entity this) PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false; + // player was spectator if (CS(this).killcount == FRAGS_SPECTATOR) { PlayerScore_Clear(this); CS(this).killcount = 0; + CS(this).startplaytime = time; } for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) @@ -861,19 +880,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 ); + JoinBestTeam( this, 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) @@ -881,7 +900,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'); @@ -893,7 +912,7 @@ 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) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false) @@ -958,7 +977,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) { @@ -1172,12 +1191,10 @@ void ClientConnect(entity this) } if (!teamplay && this.team_forced > 0) this.team_forced = 0; - { - int id = this.playerid; - this.playerid = 0; // silent - JoinBestTeam(this, false, false); // if the team number is valid, keep it - this.playerid = id; - } + int playerid_save = this.playerid; + this.playerid = 0; // silent + JoinBestTeam(this, false); // if the team number is valid, keep it + this.playerid = playerid_save; if (autocvar_sv_spectate || autocvar_g_campaign || this.team_forced < 0) { TRANSMUTE(Observer, this); @@ -1205,8 +1222,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 @@ -1990,7 +2005,7 @@ void Join(entity this) if(!this.team_selected) if(autocvar_g_campaign || autocvar_g_balance_teams) - JoinBestTeam(this, false, true); + JoinBestTeam(this, true); if(autocvar_g_campaign) campaign_bots_may_start = true; @@ -2482,19 +2497,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 +2663,7 @@ void PlayerPreThink (entity this) void DrownPlayer(entity this) { - if(IS_DEAD(this)) + if(IS_DEAD(this) || game_stopped || time < game_starttime) return; if (this.waterlevel != WATERLEVEL_SUBMERGED || this.vehicle) @@ -2653,7 +2671,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! @@ -2748,6 +2765,11 @@ void PlayerPostThink (entity this) } if (IS_PLAYER(this)) { + if(this.death_time == time && IS_DEAD(this)) + { + this.maxs.z = 5; + setsize(this, this.mins, this.maxs); + } DrownPlayer(this); UpdateChatBubble(this); if (CS(this).impulse) ImpulseCommands(this);