X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=89647d5be241eae4bb2d68944adea631942a16fc;hp=143b2d18b82f6396948a08785d28e52b45b47c88;hb=77f03e6ce033bef39ac19e0e7cb6e606ffcb26db;hpb=df110eb632e3d04119c2d0771e0d54c1a1ea27b8 diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 143b2d18b8..89647d5be2 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1,14 +1,41 @@ +#include "waypointsprites.qh" + +#include "cl_impulse.qh" +#include "cl_player.qh" +#include "ent_cs.qh" +#include "g_subs.qh" +#include "ipban.qh" +#include "miscfunctions.qh" +#include "portals.qh" +#include "teamplay.qh" +#include "playerdemo.qh" +#include "secret.qh" + +#include "bot/bot.qh" +#include "bot/navigation.qh" + +#include "weapons/hitplot.qh" +#include "weapons/weaponsystem.qh" + +#include "../common/net_notice.qh" + +#include "../common/monsters/sv_monsters.qh" + +#include "../warpzonelib/server.qh" + +float c1, c2, c3, c4; + void send_CSQC_teamnagger() { WriteByte(MSG_BROADCAST, SVC_TEMPENTITY); WriteByte(MSG_BROADCAST, TE_CSQC_TEAMNAGGER); } -float ClientData_Send(entity to, float sf) +float ClientData_Send(entity to, int sf) { if(to != self.owner) { error("wtf"); - return FALSE; + return false; } entity e; @@ -36,16 +63,16 @@ float ClientData_Send(entity to, float sf) if(sf & 8) { - WriteAngle(MSG_ENTITY, e.v_angle_x); - WriteAngle(MSG_ENTITY, e.v_angle_y); + WriteAngle(MSG_ENTITY, e.v_angle.x); + WriteAngle(MSG_ENTITY, e.v_angle.y); } - return TRUE; + return true; } void ClientData_Attach() { - Net_LinkEntity(self.clientdata = spawn(), FALSE, 0, ClientData_Send); + Net_LinkEntity(self.clientdata = spawn(), false, 0, ClientData_Send); self.clientdata.drawonlytoclient = self; self.clientdata.owner = self; } @@ -142,7 +169,7 @@ void PutObserverInServer (void) if(IS_PLAYER(self)) { pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); } - spot = SelectSpawnPoint (TRUE); + spot = SelectSpawnPoint (true); if(!spot) error("No spawnpoints for observers?!?\n"); RemoveGrapplingHook(self); // Wazat's Grappling Hook @@ -165,7 +192,7 @@ void PutObserverInServer (void) if(self.alivetime) { if(!warmup_stage) - PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime); + PS_GR_P_ADDVAL(self, PLAYERSTATS_ALIVETIME, time - self.alivetime); self.alivetime = 0; } @@ -183,10 +210,10 @@ void PutObserverInServer (void) if(autocvar_g_chat_nospectators == 1 || (cvar("g_warmup") && !(warmup_stage || gameover) && autocvar_g_chat_nospectators == 2)) Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CHAT_NOSPECTATORS); - if(self.just_joined == FALSE) { + if(self.just_joined == false) { LogTeamchange(self.playerid, -1, 4); } else - self.just_joined = FALSE; + self.just_joined = false; } PlayerScore_Clear(self); // clear scores when needed @@ -196,9 +223,9 @@ void PutObserverInServer (void) self.spectatortime = time; self.classname = "observer"; - self.iscreature = FALSE; + self.iscreature = false; self.teleportable = TELEPORT_SIMPLE; - self.damagedbycontents = FALSE; + self.damagedbycontents = false; self.health = -666; self.takedamage = DAMAGE_NO; self.solid = SOLID_NOT; @@ -231,8 +258,8 @@ void PutObserverInServer (void) self.deadflag = DEAD_NO; self.angles = spot.angles; self.angles_z = 0; - self.fixangle = TRUE; - self.crouch = FALSE; + 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 @@ -272,7 +299,7 @@ void FixPlayermodel() defaultmodel = ""; defaultskin = 0; - chmdl = FALSE; + chmdl = false; if(autocvar_sv_defaultcharacter == 1) { @@ -319,7 +346,7 @@ void FixPlayermodel() m2 = self.maxs; setplayermodel (self, defaultmodel); setsize (self, m1, m2); - chmdl = TRUE; + chmdl = true; } oldskin = self.skin; @@ -332,7 +359,7 @@ void FixPlayermodel() m2 = self.maxs; setplayermodel (self, self.playermodel); setsize (self, m1, m2); - chmdl = TRUE; + chmdl = true; } oldskin = self.skin; @@ -387,9 +414,9 @@ void PutClientInServer (void) accuracy_resend(self); if(self.team < 0) - JoinBestTeam(self, FALSE, TRUE); + JoinBestTeam(self, false, true); - spot = SelectSpawnPoint (FALSE); + spot = SelectSpawnPoint (false); if(!spot) { Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_NOSPAWNS); @@ -402,10 +429,10 @@ void PutClientInServer (void) vehicles_exit(VHEF_RELESE); self.classname = "player"; - self.wasplayer = TRUE; - self.iscreature = TRUE; + self.wasplayer = true; + self.iscreature = true; self.teleportable = TELEPORT_NORMAL; - self.damagedbycontents = TRUE; + self.damagedbycontents = true; self.movetype = MOVETYPE_WALK; self.solid = SOLID_SLIDEBOX; self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID; @@ -512,7 +539,7 @@ void PutClientInServer (void) 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.fixangle = true; // turn this way immediately self.velocity = '0 0 0'; self.avelocity = '0 0 0'; self.punchangle = '0 0 0'; @@ -523,7 +550,7 @@ void PutClientInServer (void) entity spawnevent = spawn(); spawnevent.owner = self; - Net_LinkEntity(spawnevent, FALSE, 0.5, SpawnEvent_Send); + Net_LinkEntity(spawnevent, false, 0.5, SpawnEvent_Send); // Cut off any still running player sounds. stopsound(self, CH_PLAYER_SINGLE); @@ -532,11 +559,11 @@ void PutClientInServer (void) FixPlayermodel(); self.drawonlytoclient = world; - self.crouch = FALSE; + 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)); + setorigin (self, spot.origin + '0 0 1' * (1 - self.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; @@ -546,9 +573,9 @@ void PutClientInServer (void) self.event_damage = PlayerDamage; - self.bot_attack = TRUE; - self.monster_attack = TRUE; - + self.bot_attack = true; + self.monster_attack = true; + self.spider_slowness = 0; self.BUTTON_ATCK = self.BUTTON_JUMP = self.BUTTON_ATCK2 = 0; @@ -563,7 +590,7 @@ void PutClientInServer (void) self.colormod = '1 1 1' * autocvar_g_player_brightness; self.exteriorweaponentity.alpha = default_weapon_alpha; - self.speedrunning = FALSE; + self.speedrunning = false; //stuffcmd(self, "chase_active 0"); //stuffcmd(self, "set viewsize $tmpviewsize \n"); @@ -576,8 +603,7 @@ void PutClientInServer (void) WEP_ACTION(j, WR_RESETPLAYER); // all weapons must be fully loaded when we spawn - entity e; - e = get_weaponinfo(j); + entity e = get_weaponinfo(j); if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars self.(weapon_load[j]) = e.reloading_ammo; } @@ -654,7 +680,7 @@ float ClientInit_SendEntity(entity to, float sf) 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; + return true; } void ClientInit_CheckUpdate() @@ -694,7 +720,7 @@ void ClientInit_Spawn() e = spawn(); e.classname = "clientinit"; e.think = ClientInit_CheckUpdate; - Net_LinkEntity(e, FALSE, 0, ClientInit_SendEntity); + Net_LinkEntity(e, false, 0, ClientInit_SendEntity); o = self; self = e; @@ -753,7 +779,7 @@ void ClientKill_Now_TeamChange() { if(self.killindicator_teamchange == -1) { - JoinBestTeam( self, FALSE, TRUE ); + JoinBestTeam( self, false, true ); } else if(self.killindicator_teamchange == -2) { @@ -967,23 +993,6 @@ void FixClientCvars(entity e) stuffcmd(e, "cl_cmd settemp cl_prydoncursor_notrace 0\n"); if(autocvar_sv_gentle) stuffcmd(e, "cl_cmd settemp cl_gentle 1\n"); - /* - * we no longer need to stuff this. Remove this comment block if you feel - * 2.3 and higher (or was it 2.2.3?) don't need these any more - stuffcmd(e, strcat("cl_gravity ", ftos(autocvar_sv_gravity), "\n")); - stuffcmd(e, strcat("cl_movement_accelerate ", ftos(autocvar_sv_accelerate), "\n")); - stuffcmd(e, strcat("cl_movement_friction ", ftos(autocvar_sv_friction), "\n")); - stuffcmd(e, strcat("cl_movement_maxspeed ", ftos(autocvar_sv_maxspeed), "\n")); - stuffcmd(e, strcat("cl_movement_airaccelerate ", ftos(autocvar_sv_airaccelerate), "\n")); - stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(autocvar_sv_maxairspeed), "\n")); - stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(autocvar_sv_stopspeed), "\n")); - stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(autocvar_sv_jumpvelocity), "\n")); - stuffcmd(e, strcat("cl_movement_stepheight ", ftos(autocvar_sv_stepheight), "\n")); - stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(autocvar_sv_friction_on_land), "\n")); - stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(autocvar_sv_airaccel_qw), "\n")); - stuffcmd(e, strcat("set cl_movement_airaccel_sideways_friction ", ftos(autocvar_sv_airaccel_sideways_friction), "\n")); - stuffcmd(e, "cl_movement_edgefriction 1\n"); - */ } float PlayerInIDList(entity p, string idlist) @@ -1007,6 +1016,27 @@ float PlayerInIDList(entity p, string idlist) return 0; } +#ifdef DP_EXT_PRECONNECT +/* +============= +ClientPreConnect + +Called once (not at each match start) when a client begins a connection to the server +============= +*/ +void ClientPreConnect (void) +{ + if(autocvar_sv_eventlog) + { + GameLogEcho(sprintf(":connect:%d:%d:%s", + self.playerid, + num_for_edict(self), + ((IS_REAL_CLIENT(self)) ? self.netaddress : "bot") + )); + } +} +#endif + /* ============= ClientConnect @@ -1047,6 +1077,8 @@ void ClientConnect (void) player_count = 0; } + if(IS_REAL_CLIENT(self)) { PlayerStats_PlayerBasic_CheckUpdate(self); } + PlayerScore_Attach(self); ClientData_Attach(); accuracy_init(self); @@ -1099,7 +1131,7 @@ void ClientConnect (void) if(self.team_forced > 0) self.team_forced = 0; - JoinBestTeam(self, FALSE, FALSE); // if the team number is valid, keep it + JoinBestTeam(self, false, false); // if the team number is valid, keep it if((autocvar_sv_spectate == 1) || autocvar_g_campaign || self.team_forced < 0) { self.classname = "observer"; @@ -1125,17 +1157,17 @@ void ClientConnect (void) self.playerid = (playerid_last = playerid_last + 1); - PlayerStats_AddEvent(sprintf("kills-%d", self.playerid)); + PlayerStats_GameReport_AddEvent(sprintf("kills-%d", self.playerid)); if(IS_BOT_CLIENT(self)) - PlayerStats_AddPlayer(self); + PlayerStats_GameReport_AddPlayer(self); if(autocvar_sv_eventlog) GameLogEcho(strcat(":join:", ftos(self.playerid), ":", ftos(num_for_edict(self)), ":", ((IS_REAL_CLIENT(self)) ? self.netaddress : "bot"), ":", self.netname)); LogTeamchange(self.playerid, self.team, 1); - self.just_joined = TRUE; // stop spamming the eventlog with additional lines when the client connects + self.just_joined = true; // stop spamming the eventlog with additional lines when the client connects self.netname_previous = strzone(self.netname); @@ -1155,6 +1187,10 @@ void ClientConnect (void) // Wazat's grappling hook SetGrappleHookBindings(); + // Jetpack binds + stuffcmd(self, "alias +jetpack +button10\n"); + stuffcmd(self, "alias -jetpack -button10\n"); + // get version info from player stuffcmd(self, "cmd clientversion $gameversion\n"); @@ -1235,9 +1271,9 @@ void ClientDisconnect (void) return; } - if(IS_PLAYER(self)) { pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); } + PlayerStats_GameReport_FinalizePlayer(self); - PlayerStats_AddGlobalInfo(self); + if(IS_PLAYER(self)) { pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); } CheatShutdownClient(); @@ -1338,7 +1374,7 @@ void UpdateChatBubble() self.chatbubbleentity.nextthink = time; setmodel(self.chatbubbleentity, "models/misc/chatbubble.spr"); // precision set below //setorigin(self.chatbubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1'); - setorigin(self.chatbubbleentity, '0 0 15' + self.maxs_z * '0 0 1'); + setorigin(self.chatbubbleentity, '0 0 15' + self.maxs.z * '0 0 1'); setattachment(self.chatbubbleentity, self, ""); // sticks to moving player better, also conserves bandwidth self.chatbubbleentity.mdl = self.chatbubbleentity.model; self.chatbubbleentity.model = ""; @@ -1573,7 +1609,7 @@ void player_regen (void) mina = autocvar_g_balance_armor_regenstable; 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; @@ -1618,12 +1654,12 @@ void SetZoomState(float z) void GetPressedKeys(void) { MUTATOR_CALLHOOK(GetPressedKeys); - if (self.movement_x > 0) // get if movement keys are pressed + if (self.movement.x > 0) // get if movement keys are pressed { // forward key pressed self.pressedkeys |= KEY_FORWARD; self.pressedkeys &= ~KEY_BACKWARD; } - else if (self.movement_x < 0) + else if (self.movement.x < 0) { // backward key pressed self.pressedkeys |= KEY_BACKWARD; self.pressedkeys &= ~KEY_FORWARD; @@ -1634,12 +1670,12 @@ void GetPressedKeys(void) { self.pressedkeys &= ~KEY_BACKWARD; } - if (self.movement_y > 0) + if (self.movement.y > 0) { // right key pressed self.pressedkeys |= KEY_RIGHT; self.pressedkeys &= ~KEY_LEFT; } - else if (self.movement_y < 0) + else if (self.movement.y < 0) { // left key pressed self.pressedkeys |= KEY_LEFT; self.pressedkeys &= ~KEY_RIGHT; @@ -1718,7 +1754,7 @@ void SpectateCopy(entity spectatee) { self.frozen = spectatee.frozen; self.revive_progress = spectatee.revive_progress; if(!self.BUTTON_USE) - self.fixangle = TRUE; + self.fixangle = true; setorigin(self, spectatee.origin); setsize(self, spectatee.mins, spectatee.maxs); SetZoomState(spectatee.zoomstate); @@ -1727,7 +1763,7 @@ void SpectateCopy(entity spectatee) { self.hud = spectatee.hud; if(spectatee.vehicle) { - self.fixangle = FALSE; + self.fixangle = false; //self.velocity = spectatee.vehicle.velocity; self.vehicle_health = spectatee.vehicle_health; self.vehicle_shield = spectatee.vehicle_shield; @@ -1740,9 +1776,9 @@ void SpectateCopy(entity spectatee) { msg_entity = self; WriteByte (MSG_ONE, SVC_SETVIEWANGLES); - WriteAngle(MSG_ONE, spectatee.v_angle_x); - WriteAngle(MSG_ONE, spectatee.v_angle_y); - WriteAngle(MSG_ONE, spectatee.v_angle_z); + WriteAngle(MSG_ONE, spectatee.v_angle.x); + WriteAngle(MSG_ONE, spectatee.v_angle.y); + WriteAngle(MSG_ONE, spectatee.v_angle.z); //WriteByte (MSG_ONE, SVC_SETVIEW); // WriteEntity(MSG_ONE, self); @@ -1767,11 +1803,10 @@ float SpectateUpdate() return 1; } - float SpectateSet() { if(self.enemy.classname != "player") - return FALSE; + return false; /*if(self.enemy.vehicle) { @@ -1795,7 +1830,7 @@ float SpectateSet() if(!SpectateUpdate()) PutObserverInServer(); //} - return TRUE; + return true; } void SetSpectator(entity player, entity spectatee) @@ -1866,7 +1901,7 @@ float SpectatePrev() // NOTE: chain order is from the highest to the lower entnum (unlike find) other = findchain(classname, "player"); if (!other) // no player - return FALSE; + return false; entity first = other; // skip players until current spectated player @@ -1885,7 +1920,7 @@ float SpectatePrev() while(other.team != self.team) other = other.chain; if(other == self.enemy) - return TRUE; + return true; } } else @@ -1937,7 +1972,7 @@ void LeaveSpectatorMode() nades_RemoveBonus(self); if(autocvar_g_campaign || autocvar_g_balance_teams) - { JoinBestTeam(self, FALSE, TRUE); } + { JoinBestTeam(self, false, true); } if(autocvar_g_campaign) { campaign_bots_may_start = 1; } @@ -1960,7 +1995,7 @@ void LeaveSpectatorMode() /** * Determines whether the player is allowed to join. This depends on cvar - * g_maxplayers, if it isn't used this function always return TRUE, otherwise + * g_maxplayers, if it isn't used this function always return true, otherwise * it checks whether the number of currently playing players exceeds g_maxplayers. * @return int number of free slots for players, 0 if none */ @@ -2156,6 +2191,33 @@ 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; +} + /* ============= PlayerPreThink @@ -2165,7 +2227,7 @@ Called every frame for each client before the physics are run */ .float usekeypressed; void() nexball_setstatus; -.float items_added; +.int items_added; void PlayerPreThink (void) { WarpZone_PlayerPhysics_FixVAngle(); @@ -2187,8 +2249,17 @@ void PlayerPreThink (void) zoomstate_set = 0; - if(self.netname_previous != self.netname) - { + // Savage: Check for nameless players + if (isInvisibleString(self.netname)) { + string new_name = strzone(strcat("Player@", self.netaddress)); + if(autocvar_sv_eventlog) + GameLogEcho(strcat(":name:", ftos(self.playerid), ":", new_name)); + if(self.netname_previous) + strunzone(self.netname_previous); + self.netname_previous = strzone(new_name); + self.netname = self.netname_previous; + // stuffcmd(self, strcat("name ", self.netname, "\n")); + } else if(self.netname_previous != self.netname) { if(autocvar_sv_eventlog) GameLogEcho(strcat(":name:", ftos(self.playerid), ":", self.netname)); if(self.netname_previous) @@ -2256,7 +2327,7 @@ void PlayerPreThink (void) { 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 ); - + if(self.health < 1) { if(self.vehicle) @@ -2295,7 +2366,7 @@ void PlayerPreThink (void) // FIXME turn this into CSQC stuff self.v_angle = self.lastV_angle; self.angles = self.lastV_angle; - self.fixangle = TRUE; + self.fixangle = true; } if(frametime) @@ -2308,13 +2379,13 @@ void PlayerPreThink (void) 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)); + 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; + self.weaponentity_glowmod = colormapPaletteColor(self.clientcolors & 0x0F, true) * 2; player_powerups(); } @@ -2395,7 +2466,7 @@ void PlayerPreThink (void) do_crouch = 0; // WEAPONTODO: THIS SHIT NEEDS TO GO EVENTUALLY - // It cannot be predicted by the engine! + // It cannot be predicted by the engine! if((self.weapon == WEP_SHOCKWAVE || self.weapon == WEP_SHOTGUN) && self.weaponentity.wframe == WFRAME_FIRE2 && time < self.weapon_nextthink) do_crouch = 0; @@ -2403,20 +2474,20 @@ void PlayerPreThink (void) { if (!self.crouch) { - self.crouch = TRUE; + self.crouch = true; self.view_ofs = PL_CROUCH_VIEW_OFS; setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); - // setanim(self, self.anim_duck, FALSE, TRUE, TRUE); // this anim is BROKEN anyway + // setanim(self, self.anim_duck, false, true, true); // this anim is BROKEN anyway } } else { if (self.crouch) { - tracebox(self.origin, PL_MIN, PL_MAX, self.origin, FALSE, self); + tracebox(self.origin, PL_MIN, PL_MAX, self.origin, false, self); if (!trace_startsolid) { - self.crouch = FALSE; + self.crouch = false; self.view_ofs = PL_VIEW_OFS; setsize (self, PL_MIN, PL_MAX); } @@ -2444,7 +2515,7 @@ void PlayerPreThink (void) player_regen(); - // WEAPONTODO: Add a weapon request for this + // WEAPONTODO: Add a weapon request for this // rot vortex charge to the charge limit if(WEP_CVAR(vortex, charge_rot_rate) && self.vortex_charge > WEP_CVAR(vortex, charge_limit) && self.vortex_charge_rottime < time) self.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), self.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1); @@ -2519,33 +2590,6 @@ void PlayerPreThink (void) self.clip_load = self.clip_size = 0; } -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; -} - /* ============= PlayerPostThink @@ -2556,12 +2600,6 @@ Called every frame for each client after the physics are run .float idlekick_lasttimeleft; void PlayerPostThink (void) { - // Savage: Check for nameless players - if (isInvisibleString(self.netname)) { - self.netname = "Player"; - stuffcmd(self, strcat("name ", self.netname, substring(ftos(random()), 2, -1), "\n")); - } - 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_PLAYER(self) || sv_maxidle_spectatorsareidle) { @@ -2638,8 +2676,6 @@ void PlayerPostThink (void) } */ - //pointparticles(particleeffectnum("machinegun_impact"), self.origin + self.view_ofs + '0 0 7', '0 0 0', 1); - 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));