X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=c2a5877761c419c2aaa6adba704a371387198ae0;hb=8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f;hp=45d8b53582ec0df2d7ec7406240a464a14a6e7de;hpb=3b934631926acf4b06d969dcd361a26a3073d2c8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 45d8b5358..c2a587776 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -62,7 +62,7 @@ STATIC_METHOD(Client, Add, void(Client this, int _team)) WITHSELF(this, PutClientInServer()); } -void PutObserverInServer(); +void PutObserverInServer(entity this); void ClientDisconnect(); STATIC_METHOD(Client, Remove, void(Client this)) @@ -76,6 +76,30 @@ void send_CSQC_teamnagger() { WriteHeader(MSG_BROADCAST, TE_CSQC_TEAMNAGGER); } +int CountSpectators(entity player, entity to) +{ + if(!player) { return 0; } // not sure how, but best to be safe + + int spec_count = 0; + + FOREACH_CLIENT(IS_REAL_CLIENT(it) && IS_SPEC(it) && it != to && it.enemy == player, + { + spec_count++; + }); + + return spec_count; +} + +void WriteSpectators(entity player, entity to) +{ + if(!player) { return; } // not sure how, but best to be safe + + FOREACH_CLIENT(IS_REAL_CLIENT(it) && IS_SPEC(it) && it != to && it.enemy == player, + { + WriteByte(MSG_ENTITY, num_for_edict(it)); + }); +} + bool ClientData_Send(entity this, entity to, int sf) { assert(to == this.owner, return false); @@ -88,6 +112,7 @@ bool ClientData_Send(entity this, entity to, int sf) 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 + sf |= 16; // always check spectators WriteHeader(MSG_ENTITY, ENT_CLIENT_CLIENTDATA); WriteByte(MSG_ENTITY, sf); @@ -101,6 +126,14 @@ bool ClientData_Send(entity this, entity to, int sf) WriteAngle(MSG_ENTITY, e.v_angle.x); WriteAngle(MSG_ENTITY, e.v_angle.y); } + + if(sf & 16) + { + float specs = CountSpectators(e, to); + WriteByte(MSG_ENTITY, specs); + WriteSpectators(e, to); + } + return true; } @@ -177,17 +210,16 @@ void setplayermodel(entity e, string modelname) { precache_model(modelname); _setmodel(e, modelname); - player_setupanimsformodel(); + player_setupanimsformodel(e); if(!autocvar_g_debug_globalsounds) UpdatePlayerSounds(e); } void FixPlayermodel(entity player); /** putting a client as observer in the server */ -void PutObserverInServer() +void PutObserverInServer(entity this) { - SELFPARAM(); - bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver); + bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this); PlayerState_detach(this); if (IS_PLAYER(this) && this.health >= 1) { @@ -196,7 +228,7 @@ void PutObserverInServer() } { - entity spot = SelectSpawnPoint(true); + entity spot = SelectSpawnPoint(this, true); if (!spot) LOG_FATAL("No spawnpoints for observers?!?"); this.angles = spot.angles; this.angles_z = 0; @@ -226,6 +258,7 @@ void PutObserverInServer() RemoveGrapplingHook(this); Portal_ClearAll(this); Unfreeze(this); + SetSpectatee(this, world); if (this.alivetime) { @@ -234,7 +267,7 @@ void PutObserverInServer() this.alivetime = 0; } - if (this.vehicle) vehicles_exit(VHEF_RELEASE); + if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); WaypointSprite_PlayerDead(this); @@ -248,7 +281,7 @@ void PutObserverInServer() if (this.killcount != FRAGS_SPECTATOR) { - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_SPECTATE, this.netname); + Send_Notification(NOTIF_ALL, NULL, 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, this, MSG_INFO, INFO_CHAT_NOSPECTATORS); @@ -294,7 +327,7 @@ void PutObserverInServer() this.superweapons_finished = 0; this.pushltime = 0; this.istypefrag = 0; - this.think = func_null; + setthink(this, func_null); this.nextthink = 0; this.hook_time = 0; this.deadflag = DEAD_NO; @@ -371,9 +404,22 @@ void FixPlayermodel(entity player) defaultmodel = substring(defaultmodel, 0, i); } } - MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin); - defaultmodel = ret_string; - defaultskin = ret_int; + if(autocvar_sv_defaultcharacterskin && !defaultskin) + { + if(teamplay) + { + string s = Static_Team_ColorName_Lower(player.team); + if (s != "neutral") + defaultskin = cvar(strcat("sv_defaultplayerskin_", s)); + } + + if(!defaultskin) + defaultskin = autocvar_sv_defaultplayerskin; + } + + MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin, player); + defaultmodel = M_ARGV(0, string); + defaultskin = M_ARGV(1, int); bool chmdl = false; int oldskin; @@ -401,8 +447,16 @@ void FixPlayermodel(entity player) chmdl = true; } - oldskin = player.skin; - player.skin = stof(player.playerskin); + if(!autocvar_sv_defaultcharacterskin) + { + oldskin = player.skin; + player.skin = stof(player.playerskin); + } + else + { + oldskin = player.skin; + player.skin = defaultskin; + } } if(chmdl || oldskin != player.skin) // model or skin has changed @@ -421,8 +475,7 @@ void FixPlayermodel(entity player) /** Called when a client spawns in the server */ void PutClientInServer() -{ - SELFPARAM(); +{ENGINE_EVENT(); if (IS_BOT_CLIENT(this)) { TRANSMUTE(Player, this); } else if (IS_REAL_CLIENT(this)) { @@ -442,7 +495,7 @@ void PutClientInServer() MUTATOR_CALLHOOK(PutClientInServer, this); if (IS_OBSERVER(this)) { - PutObserverInServer(); + PutObserverInServer(this); } else if (IS_PLAYER(this)) { PlayerState_attach(this); accuracy_resend(this); @@ -450,7 +503,7 @@ void PutClientInServer() if (this.team < 0) JoinBestTeam(this, false, true); - entity spot = SelectSpawnPoint(false); + entity spot = SelectSpawnPoint(this, false); if (!spot) { Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_NOSPAWNS); return; // spawn failed @@ -526,7 +579,7 @@ void PutClientInServer() this.pain_frame = 0; this.pain_finished = 0; this.pushltime = 0; - this.think = func_null; // players have no think function + setthink(this, func_null); // players have no think function this.nextthink = 0; this.dmg_team = 0; this.ballistics_density = autocvar_g_ballistics_density_player; @@ -598,7 +651,7 @@ void PutClientInServer() // reset fields the weapons may use FOREACH(Weapons, true, LAMBDA( - it.wr_resetplayer(it); + it.wr_resetplayer(it, this); // reload all reloadable weapons if (it.spawnflags & WEP_FLAG_RELOADABLE) { this.weapon_load[it.m_id] = it.reloading_ammo; @@ -608,15 +661,13 @@ void PutClientInServer() { string s = spot.target; spot.target = string_null; - WITH(entity, activator, this, LAMBDA( - WITHSELF(spot, SUB_UseTargets()) - )); + SUB_UseTargets(spot, this, NULL); spot.target = s; } Unfreeze(this); - MUTATOR_CALLHOOK(PlayerSpawn, spot); + MUTATOR_CALLHOOK(PlayerSpawn, this, spot); if (autocvar_spawn_debug) { @@ -637,7 +688,7 @@ void PutClientInServer() } } -void ClientInit_misc(); +void ClientInit_misc(entity this); .float ebouncefactor, ebouncestop; // electro's values // TODO do we need all these fields, or should we stop autodetecting runtime @@ -651,12 +702,11 @@ bool ClientInit_SendEntity(entity this, entity to, int sf) // TODO: make easier to use Registry_send_all(); W_PROP_reload(MSG_ONE, to); - ClientInit_misc(); + ClientInit_misc(this); MUTATOR_CALLHOOK(Ent_Init); } -void ClientInit_misc() +void ClientInit_misc(entity this) { - SELFPARAM(); int channel = MSG_ONE; WriteHeader(channel, ENT_CLIENT_INIT); WriteByte(channel, g_nexball_meter_period * 32); @@ -678,8 +728,8 @@ void ClientInit_misc() WriteCoord(channel, autocvar_g_trueaim_minrange); } -void ClientInit_CheckUpdate() -{SELFPARAM(); +void ClientInit_CheckUpdate(entity this) +{ this.nextthink = time; if(this.count != autocvar_g_balance_armor_blockpercent) { @@ -689,13 +739,12 @@ void ClientInit_CheckUpdate() } void ClientInit_Spawn() -{SELFPARAM(); - +{ entity e = new_pure(clientinit); - e.think = ClientInit_CheckUpdate; + setthink(e, ClientInit_CheckUpdate); Net_LinkEntity(e, false, 0, ClientInit_SendEntity); - WITHSELF(e, ClientInit_CheckUpdate()); + ClientInit_CheckUpdate(e); } /* @@ -717,7 +766,7 @@ SetChangeParms ============= */ void SetChangeParms () -{SELFPARAM(); +{ENGINE_EVENT(); // save parms for level change parm1 = this.parm_idlesince - time; @@ -761,18 +810,18 @@ void ClientKill_Now_TeamChange(entity this) { if(blockSpectators) Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); - WITHSELF(this, PutObserverInServer()); + PutObserverInServer(this); } else WITHSELF(this, SV_ChangeTeam(this.killindicator_teamchange - 1)); this.killindicator_teamchange = 0; } -void ClientKill_Now() -{SELFPARAM(); +void ClientKill_Now(entity this) +{ if(this.vehicle) { - vehicles_exit(VHEF_RELEASE); + vehicles_exit(this.vehicle, VHEF_RELEASE); if(!this.killindicator_teamchange) { this.vehicle_health = -1; @@ -783,7 +832,7 @@ void ClientKill_Now() if(this.killindicator && !wasfreed(this.killindicator)) remove(this.killindicator); - this.killindicator = world; + this.killindicator = NULL; if(this.killindicator_teamchange) ClientKill_Now_TeamChange(this); @@ -793,25 +842,25 @@ void ClientKill_Now() // now I am sure the player IS dead } -void KillIndicator_Think() -{SELFPARAM(); +void KillIndicator_Think(entity this) +{ if (gameover) { - this.owner.killindicator = world; + this.owner.killindicator = NULL; remove(this); return; } if (this.owner.alpha < 0 && !this.owner.vehicle) { - this.owner.killindicator = world; + this.owner.killindicator = NULL; remove(this); return; } if(this.cnt <= 0) { - WITHSELF(this.owner, ClientKill_Now()); + ClientKill_Now(this.owner); return; } else if(g_cts && this.health == 1) // health == 1 means that it's silent @@ -834,8 +883,8 @@ void KillIndicator_Think() } float clientkilltime; -void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 = spec -{SELFPARAM(); +void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change, -1 = auto, -2 = spec +{ float killtime; float starttime; entity e; @@ -863,7 +912,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 if(killtime <= 0 || !IS_PLAYER(this) || IS_DEAD(this)) { - ClientKill_Now(); + ClientKill_Now(this); } else { @@ -874,14 +923,14 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 this.killindicator.scale = 0.5; setattachment(this.killindicator, this, ""); setorigin(this.killindicator, '0 0 52'); - this.killindicator.think = KillIndicator_Think; + setthink(this.killindicator, KillIndicator_Think); this.killindicator.nextthink = starttime + (this.lip) * 0.05; clientkilltime = max(clientkilltime, this.killindicator.nextthink + 0.05); this.killindicator.cnt = ceil(killtime); this.killindicator.count = bound(0, ceil(killtime), 10); //sprint(this, strcat("^1You'll be dead in ", ftos(this.killindicator.cnt), " seconds\n")); - for(e = world; (e = find(e, classname, "body")) != world; ) + for(e = NULL; (e = find(e, classname, "body")) != NULL; ) { if(e.enemy != this) continue; @@ -890,7 +939,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 e.killindicator.scale = 0.5; setattachment(e.killindicator, e, ""); setorigin(e.killindicator, '0 0 52'); - e.killindicator.think = KillIndicator_Think; + setthink(e.killindicator, KillIndicator_Think); e.killindicator.nextthink = starttime + (e.lip) * 0.05; clientkilltime = max(clientkilltime, e.killindicator.nextthink + 0.05); e.killindicator.cnt = ceil(killtime); @@ -933,12 +982,12 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 } void ClientKill () -{SELFPARAM(); +{ENGINE_EVENT(); if(gameover) return; if(this.player_blocked) return; if(STAT(FROZEN, this)) return; - ClientKill_TeamChange(0); + ClientKill_TeamChange(this, 0); } void FixClientCvars(entity e) @@ -983,7 +1032,7 @@ Called once (not at each match start) when a client begins a connection to the s ============= */ void ClientPreConnect () -{SELFPARAM(); +{ENGINE_EVENT(); if(autocvar_sv_eventlog) { GameLogEcho(sprintf(":connect:%d:%d:%s", @@ -1003,8 +1052,7 @@ Called when a client connects to the server ============= */ void ClientConnect() -{ - SELFPARAM(); +{ENGINE_EVENT(); if (Ban_MaybeEnforceBanOnce(this)) return; assert(!IS_CLIENT(this), return); this.flags |= FL_CLIENT; @@ -1123,7 +1171,7 @@ void ClientConnect() if (!autocvar_g_campaign) { this.motd_actived_time = -1; - Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage(this)); } if (g_weaponarena_weapons == WEPSET(TUBA)) @@ -1145,7 +1193,7 @@ void ClientConnect() sv_notice_join(this); FOREACH_ENTITY_FLOAT(init_for_player_needed, true, { - WITHSELF(it, it.init_for_player(it)); + it.init_for_player(it, this); }); MUTATOR_CALLHOOK(ClientConnect, this); @@ -1160,21 +1208,22 @@ Called when a client disconnects from the server .entity chatbubbleentity; void ReadyCount(); void ClientDisconnect() -{ - SELFPARAM(); +{ENGINE_EVENT(); assert(IS_CLIENT(this), return); PlayerStats_GameReport_FinalizePlayer(this); - if (this.vehicle) vehicles_exit(VHEF_RELEASE); + if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); if (this.active_minigame) part_minigame(this); if (IS_PLAYER(this)) Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); if (autocvar_sv_eventlog) GameLogEcho(strcat(":part:", ftos(this.playerid))); - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname); + + SetSpectatee(this, NULL); - MUTATOR_CALLHOOK(ClientDisconnect); + MUTATOR_CALLHOOK(ClientDisconnect, this); ClientState_detach(this); @@ -1191,7 +1240,7 @@ void ClientDisconnect() if (this.chatbubbleentity) remove(this.chatbubbleentity); if (this.killindicator) remove(this.killindicator); - WaypointSprite_PlayerGone(); + WaypointSprite_PlayerGone(this); bot_relinkplayerlist(); @@ -1205,13 +1254,13 @@ void ClientDisconnect() if (vote_called && IS_REAL_CLIENT(this)) VoteCount(false); } -void ChatBubbleThink() -{SELFPARAM(); +void ChatBubbleThink(entity this) +{ this.nextthink = time; if ((this.owner.alpha < 0) || this.owner.chatbubbleentity != this) { - if(this.owner) // but why can that ever be world? - this.owner.chatbubbleentity = world; + if(this.owner) // but why can that ever be NULL? + this.owner.chatbubbleentity = NULL; remove(this); return; } @@ -1231,8 +1280,8 @@ void ChatBubbleThink() } -void UpdateChatBubble() -{SELFPARAM(); +void UpdateChatBubble(entity this) +{ if (this.alpha < 0) return; // spawn a chatbubble entity if needed @@ -1241,7 +1290,7 @@ void UpdateChatBubble() this.chatbubbleentity = new(chatbubbleentity); this.chatbubbleentity.owner = this; this.chatbubbleentity.exteriormodeltoclient = this; - this.chatbubbleentity.think = ChatBubbleThink; + setthink(this.chatbubbleentity, ChatBubbleThink); this.chatbubbleentity.nextthink = time; setmodel(this.chatbubbleentity, MDL_CHAT); // precision set below //setorigin(this.chatbubbleentity, this.origin + '0 0 15' + this.maxs_z * '0 0 1'); @@ -1270,8 +1319,8 @@ void UpdateChatBubble() else this.colormod = '1 1 1'; }*/ -void respawn() -{SELFPARAM(); +void respawn(entity this) +{ if(this.alpha >= 0 && autocvar_g_respawn_ghosts) { this.solid = SOLID_NOT; @@ -1288,11 +1337,11 @@ void respawn() CopyBody(this, 1); this.effects |= EF_NODRAW; // prevent another CopyBody - PutClientInServer(); + WITHSELF(this, PutClientInServer()); } -void play_countdown(float finished, Sound samp) -{SELFPARAM(); +void play_countdown(entity this, float finished, Sound samp) +{ TC(Sound, samp); if(IS_REAL_CLIENT(this)) if(floor(finished - time - frametime) != floor(finished - time)) @@ -1300,8 +1349,8 @@ void play_countdown(float finished, Sound samp) sound (this, CH_INFO, samp, VOL_BASE, ATTEN_NORM); } -void player_powerups () -{SELFPARAM(); +void player_powerups(entity this) +{ // add a way to see what the items were BEFORE all of these checks for the mutator hook int items_prev = this.items; @@ -1322,12 +1371,12 @@ void player_powerups () { if (this.items & ITEM_Strength.m_itemid) { - play_countdown(this.strength_finished, SND_POWEROFF); + play_countdown(this, this.strength_finished, SND_POWEROFF); this.effects = this.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT); if (time > this.strength_finished) { this.items = this.items - (this.items & ITEM_Strength.m_itemid); - //Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERDOWN_STRENGTH, this.netname); + //Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERDOWN_STRENGTH, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERDOWN_STRENGTH); } } @@ -1336,18 +1385,18 @@ void player_powerups () if (time < this.strength_finished) { this.items = this.items | ITEM_Strength.m_itemid; - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_STRENGTH, this.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_STRENGTH, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERUP_STRENGTH); } } if (this.items & ITEM_Shield.m_itemid) { - play_countdown(this.invincible_finished, SND_POWEROFF); + play_countdown(this, this.invincible_finished, SND_POWEROFF); this.effects = this.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT); if (time > this.invincible_finished) { this.items = this.items - (this.items & ITEM_Shield.m_itemid); - //Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERDOWN_SHIELD, this.netname); + //Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERDOWN_SHIELD, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERDOWN_SHIELD); } } @@ -1356,7 +1405,7 @@ void player_powerups () if (time < this.invincible_finished) { this.items = this.items | ITEM_Shield.m_itemid; - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_SHIELD, this.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_SHIELD, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERUP_SHIELD); } } @@ -1366,7 +1415,7 @@ void player_powerups () { this.superweapons_finished = 0; this.items = this.items - (this.items & IT_SUPERWEAPON); - //Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_SUPERWEAPON_LOST, this.netname); + //Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_SUPERWEAPON_LOST, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_SUPERWEAPON_LOST); } else if (this.items & IT_UNLIMITED_SUPERWEAPONS) @@ -1375,12 +1424,12 @@ void player_powerups () } else { - play_countdown(this.superweapons_finished, SND_POWEROFF); + play_countdown(this, this.superweapons_finished, SND_POWEROFF); if (time > this.superweapons_finished) { this.items = this.items - (this.items & IT_SUPERWEAPON); this.weapons &= ~WEPSET_SUPERWEAPONS; - //Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_SUPERWEAPON_BROKEN, this.netname); + //Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_SUPERWEAPON_BROKEN, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_SUPERWEAPON_BROKEN); } } @@ -1390,7 +1439,7 @@ void player_powerups () if (time < this.superweapons_finished || (this.items & IT_UNLIMITED_SUPERWEAPONS)) { this.items = this.items | IT_SUPERWEAPON; - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_SUPERWEAPON_PICKUP, this.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_SUPERWEAPON_PICKUP, this.netname); Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_SUPERWEAPON_PICKUP); } else @@ -1463,22 +1512,32 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re return current; } -void player_regen () -{SELFPARAM(); +void player_regen(entity this) +{ float max_mod, regen_mod, rot_mod, limit_mod; max_mod = regen_mod = rot_mod = limit_mod = 1; - regen_mod_max = max_mod; - regen_mod_regen = regen_mod; - regen_mod_rot = rot_mod; - regen_mod_limit = limit_mod; - - regen_health = autocvar_g_balance_health_regen; - regen_health_linear = autocvar_g_balance_health_regenlinear; - regen_health_rot = autocvar_g_balance_health_rot; - regen_health_rotlinear = autocvar_g_balance_health_rotlinear; - regen_health_stable = autocvar_g_balance_health_regenstable; - regen_health_rotstable = autocvar_g_balance_health_rotstable; - if(!MUTATOR_CALLHOOK(PlayerRegen)) + + float regen_health = autocvar_g_balance_health_regen; + float regen_health_linear = autocvar_g_balance_health_regenlinear; + float regen_health_rot = autocvar_g_balance_health_rot; + float regen_health_rotlinear = autocvar_g_balance_health_rotlinear; + float regen_health_stable = autocvar_g_balance_health_regenstable; + float regen_health_rotstable = autocvar_g_balance_health_rotstable; + bool mutator_returnvalue = MUTATOR_CALLHOOK(PlayerRegen, this, max_mod, regen_mod, rot_mod, limit_mod, regen_health, regen_health_linear, regen_health_rot, + regen_health_rotlinear, regen_health_stable, regen_health_rotstable); + max_mod = M_ARGV(1, float); + regen_mod = M_ARGV(2, float); + rot_mod = M_ARGV(3, float); + limit_mod = M_ARGV(4, float); + regen_health = M_ARGV(5, float); + regen_health_linear = M_ARGV(6, float); + regen_health_rot = M_ARGV(7, float); + regen_health_rotlinear = M_ARGV(8, float); + regen_health_stable = M_ARGV(9, float); + regen_health_rotstable = M_ARGV(10, float); + + + if(!mutator_returnvalue) if(!STAT(FROZEN, this)) { float mina, maxa, limith, limita; @@ -1487,11 +1546,6 @@ void player_regen () limith = autocvar_g_balance_health_limit; limita = autocvar_g_balance_armor_limit; - max_mod = regen_mod_max; - regen_mod = regen_mod_regen; - rot_mod = regen_mod_rot; - limit_mod = regen_mod_limit; - regen_health_rotstable = regen_health_rotstable * max_mod; regen_health_stable = regen_health_stable * max_mod; limith = limith * limit_mod; @@ -1506,7 +1560,7 @@ void player_regen () if(this.health < 1) { if(this.vehicle) - vehicles_exit(VHEF_RELEASE); + vehicles_exit(this.vehicle, VHEF_RELEASE); if(this.event_damage) this.event_damage(this, this, this, 1, DEATH_ROT.m_id, this.origin, '0 0 0'); } @@ -1524,8 +1578,8 @@ void player_regen () } bool zoomstate_set; -void SetZoomState(float z) -{SELFPARAM(); +void SetZoomState(entity this, float z) +{ if(z != this.zoomstate) { this.zoomstate = z; @@ -1534,10 +1588,9 @@ void SetZoomState(float z) zoomstate_set = true; } -void GetPressedKeys() +void GetPressedKeys(entity this) { - SELFPARAM(); - MUTATOR_CALLHOOK(GetPressedKeys); + MUTATOR_CALLHOOK(GetPressedKeys, this); int keys = this.pressedkeys; keys = BITSET(keys, KEY_FORWARD, this.movement.x > 0); keys = BITSET(keys, KEY_BACKWARD, this.movement.x < 0); @@ -1602,7 +1655,7 @@ void SpectateCopy(entity this, entity spectatee) this.fixangle = true; setorigin(this, spectatee.origin); setsize(this, spectatee.mins, spectatee.maxs); - SetZoomState(spectatee.zoomstate); + SetZoomState(this, spectatee.zoomstate); anticheat_spectatecopy(this, spectatee); this.hud = spectatee.hud; @@ -1632,8 +1685,8 @@ void SpectateCopy(entity this, entity spectatee) } } -bool SpectateUpdate() -{SELFPARAM(); +bool SpectateUpdate(entity this) +{ if(!this.enemy) return false; @@ -1648,61 +1701,66 @@ bool SpectateUpdate() return true; } -bool SpectateSet() -{SELFPARAM(); +bool SpectateSet(entity this) +{ if(!IS_PLAYER(this.enemy)) return false; + ClientData_Touch(this.enemy); + msg_entity = this; WriteByte(MSG_ONE, SVC_SETVIEW); WriteEntity(MSG_ONE, this.enemy); this.movetype = MOVETYPE_NONE; accuracy_resend(this); - if(!SpectateUpdate()) - PutObserverInServer(); + if(!SpectateUpdate(this)) + PutObserverInServer(this); return true; } -void SetSpectatee(entity player, entity spectatee) +void SetSpectatee(entity this, entity spectatee) { - entity old_spectatee = player.enemy; + entity old_spectatee = this.enemy; - player.enemy = spectatee; + this.enemy = spectatee; // WEAPONTODO // these are required to fix the spectator bug with arc if(old_spectatee && old_spectatee.arc_beam) { old_spectatee.arc_beam.SendFlags |= ARC_SF_SETTINGS; } - if(player.enemy && player.enemy.arc_beam) { player.enemy.arc_beam.SendFlags |= ARC_SF_SETTINGS; } + if(this.enemy && this.enemy.arc_beam) { this.enemy.arc_beam.SendFlags |= ARC_SF_SETTINGS; } + + // needed to update spectator list + if(old_spectatee) { ClientData_Touch(old_spectatee); } } -bool Spectate(entity pl) -{SELFPARAM(); +bool Spectate(entity this, entity pl) +{ if(MUTATOR_CALLHOOK(SpectateSet, this, pl)) return false; - pl = spec_player; + pl = M_ARGV(1, entity); SetSpectatee(this, pl); - return SpectateSet(); + return SpectateSet(this); } -bool SpectateNext() -{SELFPARAM(); +bool SpectateNext(entity this) +{ other = find(this.enemy, classname, STR_PLAYER); if (MUTATOR_CALLHOOK(SpectateNext, this, other)) - other = spec_player; + other = M_ARGV(1, entity); else if (!other) other = find(other, classname, STR_PLAYER); if(other) { SetSpectatee(this, other); } - return SpectateSet(); + return SpectateSet(this); } -bool SpectatePrev() -{SELFPARAM(); +bool SpectatePrev(entity this) +{ // NOTE: chain order is from the highest to the lower entnum (unlike find) other = findchain(classname, STR_PLAYER); if (!other) // no player @@ -1717,10 +1775,10 @@ bool SpectatePrev() switch (MUTATOR_CALLHOOK(SpectatePrev, this, other, first)) { case MUT_SPECPREV_FOUND: - other = spec_player; + other = M_ARGV(1, entity); break; case MUT_SPECPREV_RETURN: - other = spec_player; + other = M_ARGV(1, entity); return true; case MUT_SPECPREV_CONTINUE: default: @@ -1734,7 +1792,7 @@ bool SpectatePrev() } SetSpectatee(this, other); - return SpectateSet(); + return SpectateSet(this); } /* @@ -1744,8 +1802,8 @@ ShowRespawnCountdown() Update a respawn countdown display. ============= */ -void ShowRespawnCountdown() -{SELFPARAM(); +void ShowRespawnCountdown(entity this) +{ float number; if(!IS_DEAD(this)) // just respawned? return; @@ -1763,8 +1821,8 @@ void ShowRespawnCountdown() } } -void LeaveSpectatorMode() -{SELFPARAM(); +void LeaveSpectatorMode(entity this) +{ if(this.caplayer) return; if(nJoinAllowed(this, this)) @@ -1773,6 +1831,8 @@ void LeaveSpectatorMode() { TRANSMUTE(Player, this); + SetSpectatee(self, world); + if(autocvar_g_campaign || autocvar_g_balance_teams) { JoinBestTeam(this, false, true); } @@ -1781,9 +1841,9 @@ void LeaveSpectatorMode() Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_PREVENT_JOIN); - PutClientInServer(); + WITHSELF(this, PutClientInServer()); - if(IS_PLAYER(this)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), this.netname); } + if(IS_PLAYER(this)) { Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), this.netname); } } else stuffcmd(this, "menu_showteamselect\n"); @@ -1840,8 +1900,8 @@ bool nJoinAllowed(entity this, entity ignore) * Checks whether the client is an observer or spectator, if so, he will get kicked after * g_maxplayers_spectator_blocktime seconds */ -void checkSpectatorBlock() -{SELFPARAM(); +void checkSpectatorBlock(entity this) +{ if(IS_SPEC(this) || IS_OBSERVER(this)) if(!this.caplayer) if(IS_REAL_CLIENT(this)) @@ -1865,7 +1925,7 @@ void PrintWelcomeMessage(entity this) } else { if (PHYS_INPUT_BUTTON_INFO(this)) { this.motd_actived_time = time; - Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); + Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage(this)); } } } @@ -1900,8 +1960,8 @@ void PrintWelcomeMessage(entity this) } } -void ObserverThink() -{SELFPARAM(); +void ObserverThink(entity this) +{ if ( this.impulse ) { MinigameImpulse(this, this.impulse); @@ -1914,7 +1974,7 @@ void ObserverThink() this.flags |= FL_SPAWNING; } else if(PHYS_INPUT_BUTTON_ATCK(this) && !this.version_mismatch) { this.flags &= ~FL_JUMPRELEASED; - if(SpectateNext()) { + if(SpectateNext(this)) { TRANSMUTE(Spectator, this); } } else { @@ -1928,15 +1988,15 @@ void ObserverThink() if(this.flags & FL_SPAWNING) { this.flags &= ~FL_SPAWNING; - LeaveSpectatorMode(); + LeaveSpectatorMode(this); return; } } } } -void SpectatorThink() -{SELFPARAM(); +void SpectatorThink(entity this) +{ if ( this.impulse ) { if(MinigameImpulse(this, this.impulse)) @@ -1948,29 +2008,29 @@ void SpectatorThink() this.flags |= FL_SPAWNING; } else if(PHYS_INPUT_BUTTON_ATCK(this) || this.impulse == 10 || this.impulse == 15 || this.impulse == 18 || (this.impulse >= 200 && this.impulse <= 209)) { this.flags &= ~FL_JUMPRELEASED; - if(SpectateNext()) { + if(SpectateNext(this)) { TRANSMUTE(Spectator, this); } else { TRANSMUTE(Observer, this); - PutClientInServer(); + WITHSELF(this, PutClientInServer()); } this.impulse = 0; } else if(this.impulse == 12 || this.impulse == 16 || this.impulse == 19 || (this.impulse >= 220 && this.impulse <= 229)) { this.flags &= ~FL_JUMPRELEASED; - if(SpectatePrev()) { + if(SpectatePrev(this)) { TRANSMUTE(Spectator, this); } else { TRANSMUTE(Observer, this); - PutClientInServer(); + WITHSELF(this, PutClientInServer()); } this.impulse = 0; } else if (PHYS_INPUT_BUTTON_ATCK2(this)) { this.flags &= ~FL_JUMPRELEASED; TRANSMUTE(Observer, this); - PutClientInServer(); + WITHSELF(this, PutClientInServer()); } else { - if(!SpectateUpdate()) - PutObserverInServer(); + if(!SpectateUpdate(this)) + PutObserverInServer(this); } } else { if (!(PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_ATCK2(this))) { @@ -1978,20 +2038,20 @@ void SpectatorThink() if(this.flags & FL_SPAWNING) { this.flags &= ~FL_SPAWNING; - LeaveSpectatorMode(); + LeaveSpectatorMode(this); return; } } - if(!SpectateUpdate()) - PutObserverInServer(); + if(!SpectateUpdate(this)) + PutObserverInServer(this); } this.flags |= FL_CLIENT | FL_NOTARGET; } void vehicles_enter (entity pl, entity veh); -void PlayerUseKey() -{SELFPARAM(); +void PlayerUseKey(entity this) +{ if (!IS_PLAYER(this)) return; @@ -1999,7 +2059,7 @@ void PlayerUseKey() { if(!gameover) { - vehicles_exit(VHEF_NORMAL); + vehicles_exit(this.vehicle, VHEF_NORMAL); return; } } @@ -2009,7 +2069,7 @@ void PlayerUseKey() if(!IS_DEAD(this)) if(!gameover) { - entity head, closest_target = world; + entity head, closest_target = NULL; head = WarpZone_FindRadius(this.origin, autocvar_g_vehicles_enter_radius, true); while(head) // find the closest acceptable target to enter @@ -2021,7 +2081,7 @@ void PlayerUseKey() { if(closest_target) { - if(vlen(this.origin - head.origin) < vlen(this.origin - closest_target.origin)) + if(vlen2(this.origin - head.origin) < vlen2(this.origin - closest_target.origin)) { closest_target = head; } } else { closest_target = head; } @@ -2035,7 +2095,7 @@ void PlayerUseKey() } // a use key was pressed; call handlers - MUTATOR_CALLHOOK(PlayerUseKey); + MUTATOR_CALLHOOK(PlayerUseKey, this); } @@ -2047,12 +2107,10 @@ Called every frame for each client before the physics are run ============= */ .float usekeypressed; -void() nexball_setstatus; .float last_vehiclecheck; .int items_added; void PlayerPreThink () -{ - SELFPARAM(); +{ENGINE_EVENT(); WarpZone_PlayerPhysics_FixVAngle(this); STAT(GAMESTARTTIME, this) = game_starttime; @@ -2070,7 +2128,7 @@ void PlayerPreThink () if (blockSpectators && frametime) { // WORKAROUND: only use dropclient in server frames (frametime set). // Never use it in cl_movement frames (frametime zero). - checkSpectatorBlock(); + checkSpectatorBlock(this); } zoomstate_set = false; @@ -2130,14 +2188,15 @@ void PlayerPreThink () if (this.health < 1) { if (this.vehicle) - vehicles_exit(VHEF_RELEASE); - this.event_damage(this, this, this.frozen_by, 1, DEATH_NADE_ICE_FREEZE.m_id, this.origin, '0 0 0'); + vehicles_exit(this.vehicle, VHEF_RELEASE); + if(this.event_damage) + this.event_damage(this, this, this.frozen_by, 1, DEATH_NADE_ICE_FREEZE.m_id, this.origin, '0 0 0'); } else if (this.revive_progress <= 0) Unfreeze(this); } - MUTATOR_CALLHOOK(PlayerPreThink); + MUTATOR_CALLHOOK(PlayerPreThink, this); if(autocvar_g_vehicles_enter) if(time > this.last_vehiclecheck) @@ -2148,8 +2207,8 @@ void PlayerPreThink () if(!IS_DEAD(this)) { entity veh; - for(veh = world; (veh = findflags(veh, vehicle_flags, VHF_ISVEHICLE)); ) - if(vlen(veh.origin - this.origin) < autocvar_g_vehicles_enter_radius) + for(veh = NULL; (veh = findflags(veh, vehicle_flags, VHF_ISVEHICLE)); ) + if(vdist(veh.origin - this.origin, <, autocvar_g_vehicles_enter_radius)) if(!IS_DEAD(veh)) if(veh.takedamage != DAMAGE_NO) if((veh.vehicle_flags & VHF_MULTISLOT) && SAME_TEAM(veh.owner, this)) @@ -2166,7 +2225,7 @@ void PlayerPreThink () if(!this.cvar_cl_newusekeysupported) // FIXME remove this - it was a stupid idea to begin with, we can JUST use the button { if(PHYS_INPUT_BUTTON_USE(this) && !this.usekeypressed) - PlayerUseKey(); + PlayerUseKey(this); this.usekeypressed = PHYS_INPUT_BUTTON_USE(this); } @@ -2174,10 +2233,10 @@ void PlayerPreThink () PrintWelcomeMessage(this); if (IS_PLAYER(this)) { - CheckRules_Player(); + CheckRules_Player(this); if (intermission_running) { - IntermissionThink(); + IntermissionThink(this); return; } @@ -2189,21 +2248,21 @@ void PlayerPreThink () this.fixangle = true; } - if (frametime) player_powerups(); + if (frametime) player_powerups(this); if (IS_DEAD(this)) { if (this.personal && g_race_qualifying) { if (time > this.respawn_time) { STAT(RESPAWN_TIME, this) = this.respawn_time = time + 1; // only retry once a second - respawn(); + respawn(this); this.impulse = CHIMPULSE_SPEEDRUN.impulse; } } else { - if (frametime) player_anim(); + if (frametime) player_anim(this); bool button_pressed = (PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this) || PHYS_INPUT_BUTTON_ATCK2(this) || PHYS_INPUT_BUTTON_HOOK(this) || PHYS_INPUT_BUTTON_USE(this)); if (this.deadflag == DEAD_DYING) { - if ((this.respawn_flags & RESPAWN_FORCE) && !autocvar_g_respawn_delay_max) { + if ((this.respawn_flags & RESPAWN_FORCE) && !(this.respawn_time < this.respawn_time_max)) { this.deadflag = DEAD_RESPAWNING; } else if (!button_pressed) { this.deadflag = DEAD_DEAD; @@ -2222,16 +2281,21 @@ void PlayerPreThink () if (time > this.respawn_time) { this.respawn_time = time + 1; // only retry once a second this.respawn_time_max = this.respawn_time; - respawn(); + respawn(this); } } - ShowRespawnCountdown(); + ShowRespawnCountdown(this); if (this.respawn_flags & RESPAWN_SILENT) STAT(RESPAWN_TIME, this) = 0; - else if ((this.respawn_flags & RESPAWN_FORCE) && autocvar_g_respawn_delay_max) - STAT(RESPAWN_TIME, this) = this.respawn_time_max; + else if ((this.respawn_flags & RESPAWN_FORCE) && this.respawn_time < this.respawn_time_max) + { + if (time < this.respawn_time) + STAT(RESPAWN_TIME, this) = this.respawn_time; + else if (this.deadflag != DEAD_RESPAWNING) + STAT(RESPAWN_TIME, this) = -this.respawn_time_max; + } else STAT(RESPAWN_TIME, this) = this.respawn_time; } @@ -2290,17 +2354,17 @@ void PlayerPreThink () this.items |= this.items_added; } - player_regen(); + player_regen(this); // WEAPONTODO: Add a weapon request for this // rot vortex charge to the charge limit if (WEP_CVAR(vortex, charge_rot_rate) && this.vortex_charge > WEP_CVAR(vortex, charge_limit) && this.vortex_charge_rottime < time) this.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1); - if (frametime) player_anim(); + if (frametime) player_anim(this); // secret status - secrets_setstatus(); + secrets_setstatus(this); // monsters status monsters_setstatus(this); @@ -2308,19 +2372,19 @@ void PlayerPreThink () this.dmg_team = max(0, this.dmg_team - autocvar_g_teamdamage_resetspeed * frametime); } else if (gameover) { - if (intermission_running) IntermissionThink(); + if (intermission_running) IntermissionThink(this); return; } else if (IS_OBSERVER(this)) { - ObserverThink(); + ObserverThink(this); } else if (IS_SPEC(this)) { - SpectatorThink(); + SpectatorThink(this); } // WEAPONTODO: Add weapon request for this if (!zoomstate_set) { - SetZoomState( + SetZoomState(this, PHYS_INPUT_BUTTON_ZOOM(this) || PHYS_INPUT_BUTTON_ZOOMSCRIPT(this) || (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_VORTEX) || (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0) @@ -2380,7 +2444,7 @@ void DrownPlayer(entity this) { // 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'); + Damage (this, NULL, NULL, 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; } } @@ -2395,8 +2459,7 @@ Called every frame for each client after the physics are run */ .float idlekick_lasttimeleft; void PlayerPostThink () -{ - SELFPARAM(); +{ENGINE_EVENT(); if (sv_maxidle > 0) if (frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero). if (IS_REAL_CLIENT(this)) @@ -2418,7 +2481,7 @@ void PlayerPostThink () Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_DISCONNECT_IDLING, timeleft); } if (timeleft <= 0) { - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_KICK_IDLING, this.netname); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_KICK_IDLING, this.netname); dropclient(this); return; } @@ -2431,17 +2494,17 @@ void PlayerPostThink () } } - CheatFrame(); + CheatFrame(this); //CheckPlayerJump(); if (IS_PLAYER(this)) { DrownPlayer(this); - CheckRules_Player(); - UpdateChatBubble(); + CheckRules_Player(this); + UpdateChatBubble(this); if (this.impulse) ImpulseCommands(this); if (intermission_running) return; // intermission or finale - GetPressedKeys(); + GetPressedKeys(this); } if (this.waypointsprite_attachedforcarrier) { @@ -2449,7 +2512,7 @@ void PlayerPostThink () WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v); } - playerdemo_write(); + playerdemo_write(this); CSQCMODEL_AUTOUPDATE(this); }