X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=40039ead81f107743a38a78b3a58be2ea38ba6cd;hb=cf37c1cf5c9d8099faf6009e8a7494e29a224aa7;hp=74494eed5dbc2d97de4f9bc2ff804ee0fd56a0cb;hpb=80cd34d0a48e975018605aabebacba50e8029585;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 74494eed5..40039ead8 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -118,7 +118,7 @@ void spawnpoint_use() self.team = activator.team; some_spawn_has_been_used = 1; } -}; +} // Returns: // _x: prio (-1 if unusable) @@ -153,36 +153,35 @@ vector Spawn_Score(entity spot, entity playerlist, float teamcheck, float anypoi // filter out spots for assault if(spot.target != "") { - local entity ent; + entity ent; float good, found; - ent = find(world, targetname, spot.target); - while(ent) { + found = 0; + good = 0; + for(ent = world; (ent = find(ent, targetname, spot.target)); ) + { + ++found; if(ent.classname == "target_objective") { - found = 1; if(ent.health < 0 || ent.health >= ASSAULT_VALUE_INACTIVE) - return '-1 0 0'; - good = 1; + continue; } else if(ent.classname == "trigger_race_checkpoint") { - found = 1; if(!anypoint) // spectators may spawn everywhere - { if(g_race_qualifying) { // spawn at first if(ent.race_checkpoint != 0) - return '-1 0 0'; + continue; if(spot.race_place != race_lowest_place_spawn) - return '-1 0 0'; + continue; } else { if(ent.race_checkpoint != self.race_respawn_checkpoint) - return '-1 0 0'; + continue; // try reusing the previous spawn if(ent == self.race_respawn_spotref || spot == self.race_respawn_spotref) prio += 1; @@ -195,16 +194,21 @@ vector Spawn_Score(entity spot, entity playerlist, float teamcheck, float anypoi if(pl == 0 && !self.race_started) pl = race_highest_place_spawn; // use last place if he has not even touched finish yet if(spot.race_place != pl) - return '-1 0 0'; + continue; } } } - good = 1; } - ent = find(ent, targetname, spot.target); + ++good; } - if(found && !good) + if(!found) + { + dprint("WARNING: spawnpoint at ", vtos(spot.origin), " could not find its target ", spot.target, "\n"); + return '-1 0 0'; + } + + if(good < found) // at least one was bad return '-1 0 0'; } @@ -224,7 +228,7 @@ float spawn_allbad; float spawn_allgood; entity Spawn_FilterOutBadSpots(entity firstspot, entity playerlist, float mindist, float teamcheck, float anypoint) { - local entity spot, spotlist, spotlistend; + entity spot, spotlist, spotlistend; spawn_allgood = TRUE; spawn_allbad = TRUE; @@ -299,7 +303,7 @@ entity Spawn_WeightedPoint(entity firstspot, float lower, float upper, float exp { // weight of a point: bound(lower, mindisttoplayer, upper)^exponent // multiplied by spot.cnt (useful if you distribute many spawnpoints in a small area) - local entity spot; + entity spot; RandomSelection_Init(); for(spot = firstspot; spot; spot = spot.chain) @@ -317,15 +321,15 @@ Finds a point to respawn */ entity SelectSpawnPoint (float anypoint) { - local float teamcheck; - local entity firstspot_new; - local entity spot, firstspot, playerlist; + float teamcheck; + entity firstspot_new; + entity spot, firstspot, playerlist; spot = find (world, classname, "testplayerstart"); if (spot) return spot; - if(anypoint) + if(anypoint || autocvar_g_spawn_useallspawns) teamcheck = -1; else if(have_team_spawns > 0) { @@ -662,6 +666,7 @@ void PutObserverInServer (void) self.classname = "observer"; self.iscreature = FALSE; + self.damagedbycontents = FALSE; self.health = -666; self.takedamage = DAMAGE_NO; self.solid = SOLID_NOT; @@ -705,6 +710,7 @@ void PutObserverInServer (void) self.model = ""; self.modelindex = 0; self.weapon = 0; + self.weaponname = ""; self.switchingweapon = 0; self.weaponmodel = ""; self.weaponentity = world; @@ -751,15 +757,17 @@ void PutObserverInServer (void) self.frags = FRAGS_SPECTATOR; } +.float model_randomizer; void FixPlayermodel() { - local string defaultmodel; - local float defaultskin, chmdl, oldskin; - local vector m1, m2; + string defaultmodel; + float defaultskin, chmdl, oldskin, n, i; + vector m1, m2; defaultmodel = ""; - if(autocvar_sv_defaultcharacter == 1) { + if(autocvar_sv_defaultcharacter == 1) + { defaultskin = 0; if(teamplay) @@ -778,6 +786,17 @@ void FixPlayermodel() defaultmodel = autocvar_sv_defaultplayermodel; defaultskin = autocvar_sv_defaultplayerskin; } + + n = tokenize_console(defaultmodel); + if(n > 0) + defaultmodel = argv(floor(n * self.model_randomizer)); + + i = strstrofs(defaultmodel, ":", 0); + if(i >= 0) + { + defaultskin = stof(substring(defaultmodel, i+1, -1)); + defaultmodel = substring(defaultmodel, 0, i); + } } if(self.modelindex == 0 && self.deadflag == DEAD_NO) @@ -859,6 +878,9 @@ void PutClientInServer (void) WriteByte(MSG_ONE, SVC_SETVIEW); WriteEntity(MSG_ONE, self); } + + // reset player keys + self.itemkeys = 0; // player is dead and becomes observer // FIXME fix LMS scoring for new system @@ -898,6 +920,7 @@ void PutClientInServer (void) self.classname = "player"; self.wasplayer = TRUE; self.iscreature = TRUE; + self.damagedbycontents = TRUE; self.movetype = MOVETYPE_WALK; self.solid = SOLID_SLIDEBOX; self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID; @@ -906,9 +929,11 @@ void PutClientInServer (void) if(clienttype(self) == CLIENTTYPE_BOT && autocvar_g_botclip_collisions) self.dphitcontentsmask |= DPCONTENTS_BOTCLIP; self.frags = FRAGS_PLAYER; - if(independent_players) + if(INDEPENDENT_PLAYERS) MAKE_INDEPENDENT_PLAYER(self); self.flags = FL_CLIENT; + if(autocvar__notarget) + self.flags |= FL_NOTARGET; self.takedamage = DAMAGE_AIM; if(g_minstagib) self.effects = EF_FULLBRIGHT; @@ -1027,7 +1052,8 @@ void PutClientInServer (void) 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; + if(g_arena) { Spawnqueue_Remove(self); @@ -1049,8 +1075,6 @@ void PutClientInServer (void) self.killcount = 0; } - self.cnt = WEP_LASER; - CL_SpawnWeaponentity(); self.alpha = default_player_alpha; self.colormod = '1 1 1' * autocvar_g_player_brightness; @@ -1092,7 +1116,7 @@ void PutClientInServer (void) entity e; e = get_weaponinfo(j); if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars - self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo")); + self.(weapon_load[j]) = cvar(strcat("g_balance_", e.netname, "_reload_ammo")); } oldself = self; @@ -1109,8 +1133,9 @@ void PutClientInServer (void) MUTATOR_CALLHOOK(PlayerSpawn); self.switchweapon = w_getbestweapon(self); - self.cnt = self.switchweapon; + self.cnt = -1; // W_LastWeapon will not complain self.weapon = 0; + self.weaponname = ""; self.switchingweapon = 0; if(!self.alivetime) @@ -1343,9 +1368,11 @@ void KillIndicator_Think() } } +float clientkilltime; void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 = spec { float killtime; + float starttime; entity e; if (gameover) @@ -1381,13 +1408,16 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 } else { + starttime = max(time, clientkilltime); + self.killindicator = spawn(); self.killindicator.owner = self; self.killindicator.scale = 0.5; setattachment(self.killindicator, self, ""); setorigin(self.killindicator, '0 0 52'); self.killindicator.think = KillIndicator_Think; - self.killindicator.nextthink = time + (self.lip) * 0.05; + self.killindicator.nextthink = starttime + (self.lip) * 0.05; + clientkilltime = max(clientkilltime, self.killindicator.nextthink + 0.05); self.killindicator.cnt = ceil(killtime); self.killindicator.count = bound(0, ceil(killtime), 10); //sprint(self, strcat("^1You'll be dead in ", ftos(self.killindicator.cnt), " seconds\n")); @@ -1402,7 +1432,8 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 setattachment(e.killindicator, e, ""); setorigin(e.killindicator, '0 0 52'); e.killindicator.think = KillIndicator_Think; - e.killindicator.nextthink = time + (e.lip) * 0.05; + e.killindicator.nextthink = starttime + (e.lip) * 0.05; + clientkilltime = max(clientkilltime, e.killindicator.nextthink + 0.05); e.killindicator.cnt = ceil(killtime); } self.lip = 0; @@ -1677,9 +1708,6 @@ void ClientConnect (void) // Wazat's grappling hook SetGrappleHookBindings(); - // get autoswitch state from player when he toggles it - stuffcmd(self, "alias autoswitch \"set cl_autoswitch $1 ; cmd autoswitch $1\"\n"); // default.cfg-ed in 2.4.1 - // get version info from player stuffcmd(self, "cmd clientversion $gameversion\n"); @@ -1781,6 +1809,8 @@ void ClientConnect (void) if(!autocvar_g_campaign) Send_CSQC_Centerprint_Generic(self, CPID_MOTD, getwelcomemessage(), autocvar_welcome_message_time, 0); + + self.model_randomizer = random(); } /* @@ -1835,6 +1865,7 @@ void ClientDisconnect (void) Portal_ClearAll(self); + RemoveGrapplingHook(self); if(self.flagcarried) DropFlag(self.flagcarried, world, world); if(self.ballcarried && g_nexball) @@ -1902,7 +1933,7 @@ void ChatBubbleThink() self.model = self.mdl; else self.model = ""; -}; +} void UpdateChatBubble() { @@ -1931,7 +1962,7 @@ void UpdateChatBubble() // added to the model skins /*void UpdateColorModHack() { - local float c; + float c; c = self.clientcolors & 15; // LordHavoc: only bothering to support white, green, red, yellow, blue if (!teamplay) self.colormod = '0 0 0'; @@ -1941,7 +1972,7 @@ void UpdateChatBubble() else if (c == 12) self.colormod = '1.22 1.22 0.10'; else if (c == 13) self.colormod = '0.10 0.10 1.73'; else self.colormod = '1 1 1'; -};*/ +}*/ .float oldcolormap; void respawn(void) @@ -1955,7 +1986,7 @@ void respawn(void) self.avelocity = randomvec() * autocvar_g_respawn_ghosts_speed * 3 - randomvec() * autocvar_g_respawn_ghosts_speed * 3; self.effects |= EF_ADDITIVE; self.oldcolormap = self.colormap; - self.colormap = 512; + self.colormap = 0; // this originally was 512, but raises a warning in the engine, so get rid of it pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1); if(autocvar_g_respawn_ghosts_maxtime) SUB_SetFade (self, time + autocvar_g_respawn_ghosts_maxtime / 2 + random () * (autocvar_g_respawn_ghosts_maxtime - autocvar_g_respawn_ghosts_maxtime / 2), 1.5); @@ -2518,16 +2549,16 @@ float nJoinAllowed(float includeMe) { return FALSE; // forced spectators can never join // TODO simplify this - local entity e; + entity e; - local float totalClients; + float totalClients; FOR_EACH_CLIENT(e) totalClients += 1; if (!autocvar_g_maxplayers) return maxclients - totalClients + includeMe; - local float currentlyPlaying; + float currentlyPlaying; FOR_EACH_REALPLAYER(e) currentlyPlaying += 1; @@ -2768,9 +2799,12 @@ void PlayerPreThink (void) MUTATOR_CALLHOOK(PlayerPreThink); - if(self.BUTTON_USE && !self.usekeypressed) - PlayerUseKey(); - self.usekeypressed = self.BUTTON_USE; + 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) + PlayerUseKey(); + self.usekeypressed = self.BUTTON_USE; + } PrintWelcomeMessage(); @@ -2937,14 +2971,14 @@ void PlayerPreThink (void) self.prevorigin = self.origin; - if ((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) + if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack { if (!self.crouch) { 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); + // setanim(self, self.anim_duck, FALSE, TRUE, TRUE); // this anim is BROKEN anyway } } else @@ -3003,7 +3037,10 @@ void PlayerPreThink (void) if(g_nexball) nexball_setstatus(); - + + // secret status + secrets_setstatus(); + self.dmg_team = max(0, self.dmg_team - autocvar_g_teamdamage_resetspeed * frametime); //self.angles_y=self.v_angle_y + 90; // temp @@ -3231,7 +3268,7 @@ void PlayerPostThink (void) self.stored_netname = strzone(uid2name(self.crypto_idfp)); if(self.stored_netname != self.netname) { - db_put(ServerProgsDB, strcat("uid2name", self.crypto_idfp), self.netname); + db_put(ServerProgsDB, strcat("/uid2name/", self.crypto_idfp), self.netname); strunzone(self.stored_netname); self.stored_netname = strzone(self.netname); }