X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=d53fe2082309958f83602af3d5556a42285367ee;hp=c687c4502c33ae7c7ec9c8c69fc95559f6d2a788;hb=ad1729bd8b56b054466689731f0a2f59f13e55ee;hpb=fcc8aede8e35dd63dd5e0f170a5ab496b0b4a94b diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index c687c4502c..d53fe20823 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -170,7 +170,7 @@ void PutObserverInServer (void) if(self.alivetime) { - if(!inWarmupStage) + if(!warmup_stage) PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime); self.alivetime = 0; } @@ -241,7 +241,7 @@ void PutObserverInServer (void) setorigin (self, (spot.origin + PL_VIEW_OFS)); // offset it so that the spectator spawns higher off the ground, looks better this way self.prevorigin = self.origin; self.items = 0; - WEPSET_CLEAR_E(self); + self.weapons = '0 0 0'; self.model = ""; FixPlayermodel(); setmodel(self, "null"); @@ -297,7 +297,13 @@ void FixPlayermodel() n = tokenize_console(defaultmodel); if(n > 0) + { defaultmodel = argv(floor(n * self.model_randomizer)); + // However, do NOT randomize if the player-selected model is in the list. + for (i = 0; i < n; ++i) + if ((argv(i) == self.playermodel && defaultskin == stof(self.playerskin)) || argv(i) == strcat(self.playermodel, ":", self.playerskin)) + defaultmodel = argv(i); + } i = strstrofs(defaultmodel, ":", 0); if(i >= 0) @@ -424,7 +430,7 @@ void PutClientInServer (void) self.nex_charge = autocvar_g_balance_nex_charge_start; } - if(inWarmupStage) + if(warmup_stage) { self.ammo_shells = warmup_start_ammo_shells; self.ammo_nails = warmup_start_ammo_nails; @@ -433,7 +439,11 @@ void PutClientInServer (void) self.ammo_fuel = warmup_start_ammo_fuel; self.health = warmup_start_health; self.armorvalue = warmup_start_armorvalue; - WEPSET_COPY_EA(self, warmup_start_weapons); + + if(g_warmup_allguns == 2) + self.weapons = warmup_start_weapons; + else if(g_warmup_allguns == 1) + self.weapons = (warmup_start_weapons & (weaponsInMap | start_weapons)); } else { @@ -444,10 +454,10 @@ void PutClientInServer (void) self.ammo_fuel = start_ammo_fuel; self.health = start_health; self.armorvalue = start_armorvalue; - WEPSET_COPY_EA(self, start_weapons); + self.weapons = start_weapons; } - if(WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) // exception for minstagib, as minstanex is a superweapon + if(self.weapons & WEPSET_SUPERWEAPONS) self.superweapons_finished = time + autocvar_g_balance_superweapons_time; else self.superweapons_finished = 0; @@ -455,10 +465,10 @@ void PutClientInServer (void) if(g_weaponarena_random) { if(g_weaponarena_random_with_laser) - WEPSET_ANDNOT_EW(self, WEP_LASER); + self.weapons &= ~WEPSET_LASER; W_RandomWeapons(self, g_weaponarena_random); if(g_weaponarena_random_with_laser) - WEPSET_OR_EW(self, WEP_LASER); + self.weapons |= WEPSET_LASER; } self.items = start_items; @@ -593,7 +603,7 @@ void PutClientInServer (void) self.weaponname = ""; self.switchingweapon = 0; - if(!inWarmupStage) + if(!warmup_stage) if(!self.alivetime) self.alivetime = time; @@ -811,7 +821,7 @@ void KillIndicator_Think() if(IS_REAL_CLIENT(self.owner)) { if(self.cnt <= 10) - { Send_Notification(NOTIF_ONE, self.owner, MSG_ANNCE, Announcer_PickNumber(self.cnt)); } + { Send_Notification(NOTIF_ONE, self.owner, MSG_ANNCE, Announcer_PickNumber(CNT_KILL, self.cnt)); } } self.nextthink = time + 1; self.cnt -= 1; @@ -1180,7 +1190,7 @@ void ClientConnect (void) Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD, getwelcomemessage()); } - if(autocvar_g_bugrigs || WEPSET_EQ_AW(g_weaponarena_weapons, WEP_TUBA)) + if(autocvar_g_bugrigs || (g_weaponarena_weapons == WEPSET_TUBA)) stuffcmd(self, "cl_cmd settemp chase_active 1\n"); } @@ -1282,7 +1292,7 @@ void ClientDisconnect (void) // Here, everything has been done that requires this player to be a client. - self.flags &~= FL_CLIENT; + self.flags &= ~FL_CLIENT; if (self.chatbubbleentity) remove (self.chatbubbleentity); @@ -1403,7 +1413,7 @@ void play_countdown(float finished, string samp) if(IS_REAL_CLIENT(self)) if(floor(finished - time - frametime) != floor(finished - time)) if(finished - time < 6) - sound (self, CH_INFO, samp, VOL_BASE, ATTN_NORM); + sound (self, CH_INFO, samp, VOL_BASE, ATTEN_NORM); } void player_powerups (void) @@ -1414,9 +1424,9 @@ void player_powerups (void) if((self.items & IT_USING_JETPACK) && !self.deadflag) self.modelflags |= MF_ROCKET; else - self.modelflags &~= MF_ROCKET; + self.modelflags &= ~MF_ROCKET; - self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST); + self.effects &= ~(EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST); if((self.alpha < 0 || self.deadflag) && !self.vehicle) // don't apply the flags if the player is gibbed return; @@ -1468,7 +1478,7 @@ void player_powerups (void) } if (self.items & IT_SUPERWEAPON) { - if (!WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) + if (!(self.weapons & WEPSET_SUPERWEAPONS)) { self.superweapons_finished = 0; self.items = self.items - (self.items & IT_SUPERWEAPON); @@ -1485,13 +1495,13 @@ void player_powerups (void) if (time > self.superweapons_finished) { self.items = self.items - (self.items & IT_SUPERWEAPON); - WEPSET_ANDNOT_EA(self, WEPBIT_SUPERWEAPONS); + self.weapons &= ~WEPSET_SUPERWEAPONS; //Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_SUPERWEAPON_BROKEN, self.netname); Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_SUPERWEAPON_BROKEN); } } } - else if(WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) + else if(self.weapons & WEPSET_SUPERWEAPONS) { if (time < self.superweapons_finished || (self.items & IT_UNLIMITED_SUPERWEAPONS)) { @@ -1502,7 +1512,7 @@ void player_powerups (void) else { self.superweapons_finished = 0; - WEPSET_ANDNOT_EA(self, WEPBIT_SUPERWEAPONS); + self.weapons &= ~WEPSET_SUPERWEAPONS; } } else @@ -1517,15 +1527,6 @@ void player_powerups (void) if(autocvar_g_fullbrightplayers) self.effects = self.effects | EF_FULLBRIGHT; - // midair gamemode: damage only while in the air - // if in midair mode, being on ground grants temporary invulnerability - // (this is so that multishot weapon don't clear the ground flag on the - // first damage in the frame, leaving the player vulnerable to the - // remaining hits in the same frame) - if (self.flags & FL_ONGROUND) - if (g_midair) - self.spawnshieldtime = max(self.spawnshieldtime, time + autocvar_g_midair_shieldtime); - if (time >= game_starttime) if (time < self.spawnshieldtime) self.effects = self.effects | (EF_ADDITIVE | EF_FULLBRIGHT); @@ -1617,7 +1618,7 @@ void player_regen (void) } if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, rot_mod * frametime * (time > self.pauserotfuel_finished), limitf); + self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished) * ((self.items & IT_FUEL_REGEN) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, rot_mod * frametime * (time > self.pauserotfuel_finished), limitf); } float zoomstate_set; @@ -1636,52 +1637,52 @@ void GetPressedKeys(void) { if (self.movement_x > 0) // get if movement keys are pressed { // forward key pressed self.pressedkeys |= KEY_FORWARD; - self.pressedkeys &~= KEY_BACKWARD; + self.pressedkeys &= ~KEY_BACKWARD; } else if (self.movement_x < 0) { // backward key pressed self.pressedkeys |= KEY_BACKWARD; - self.pressedkeys &~= KEY_FORWARD; + self.pressedkeys &= ~KEY_FORWARD; } else { // no x input - self.pressedkeys &~= KEY_FORWARD; - self.pressedkeys &~= KEY_BACKWARD; + self.pressedkeys &= ~KEY_FORWARD; + self.pressedkeys &= ~KEY_BACKWARD; } if (self.movement_y > 0) { // right key pressed self.pressedkeys |= KEY_RIGHT; - self.pressedkeys &~= KEY_LEFT; + self.pressedkeys &= ~KEY_LEFT; } else if (self.movement_y < 0) { // left key pressed self.pressedkeys |= KEY_LEFT; - self.pressedkeys &~= KEY_RIGHT; + self.pressedkeys &= ~KEY_RIGHT; } else { // no y input - self.pressedkeys &~= KEY_RIGHT; - self.pressedkeys &~= KEY_LEFT; + self.pressedkeys &= ~KEY_RIGHT; + self.pressedkeys &= ~KEY_LEFT; } if (self.BUTTON_JUMP) // get if jump and crouch keys are pressed self.pressedkeys |= KEY_JUMP; else - self.pressedkeys &~= KEY_JUMP; + self.pressedkeys &= ~KEY_JUMP; if (self.BUTTON_CROUCH) self.pressedkeys |= KEY_CROUCH; else - self.pressedkeys &~= KEY_CROUCH; + self.pressedkeys &= ~KEY_CROUCH; if (self.BUTTON_ATCK) self.pressedkeys |= KEY_ATCK; else - self.pressedkeys &~= KEY_ATCK; + self.pressedkeys &= ~KEY_ATCK; if (self.BUTTON_ATCK2) self.pressedkeys |= KEY_ATCK2; else - self.pressedkeys &~= KEY_ATCK2; + self.pressedkeys &= ~KEY_ATCK2; } /* @@ -1712,7 +1713,7 @@ void SpectateCopy(entity spectatee) { self.strength_finished = spectatee.strength_finished; self.invincible_finished = spectatee.invincible_finished; self.pressedkeys = spectatee.pressedkeys; - WEPSET_COPY_EE(self, spectatee); + self.weapons = spectatee.weapons; self.switchweapon = spectatee.switchweapon; self.switchingweapon = spectatee.switchingweapon; self.weapon = spectatee.weapon; @@ -1919,7 +1920,7 @@ void ShowRespawnCountdown() { self.respawn_countdown = number - 1; if(ceil(self.respawn_time - (time + 0.5)) == number) // only say it if it is the same number even in 0.5s; to prevent overlapping sounds - Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(number)); + { Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(CNT_RESPAWN, number)); } } } } @@ -2048,7 +2049,7 @@ void PrintWelcomeMessage() { if(self.BUTTON_INFO) // BUTTON_INFO hides initial MOTD self.motd_actived_time = -2; // wait until BUTTON_INFO gets released - else if(self.motd_actived_time == -2 || IS_PLAYER(self) || time - self.jointime > autocvar_welcome_message_time) + else if(self.motd_actived_time == -2 || IS_PLAYER(self)) { // instanctly hide MOTD self.motd_actived_time = 0; @@ -2062,10 +2063,10 @@ void ObserverThink() float prefered_movetype; if (self.flags & FL_JUMPRELEASED) { if (self.BUTTON_JUMP && !self.version_mismatch) { - self.flags &~= FL_JUMPRELEASED; + self.flags &= ~FL_JUMPRELEASED; self.flags |= FL_SPAWNING; } else if(self.BUTTON_ATCK && !self.version_mismatch) { - self.flags &~= FL_JUMPRELEASED; + self.flags &= ~FL_JUMPRELEASED; if(SpectateNext()) { self.classname = "spectator"; } @@ -2079,7 +2080,7 @@ void ObserverThink() self.flags |= FL_JUMPRELEASED; if(self.flags & FL_SPAWNING) { - self.flags &~= FL_SPAWNING; + self.flags &= ~FL_SPAWNING; LeaveSpectatorMode(); return; } @@ -2091,10 +2092,10 @@ void SpectatorThink() { if (self.flags & FL_JUMPRELEASED) { if (self.BUTTON_JUMP && !self.version_mismatch) { - self.flags &~= FL_JUMPRELEASED; + self.flags &= ~FL_JUMPRELEASED; self.flags |= FL_SPAWNING; - } else if(self.BUTTON_ATCK || self.impulse == 10 || self.impulse == 15 || self.impulse == 18 || self.impulse >= 200 && self.impulse <= 209) { - self.flags &~= FL_JUMPRELEASED; + } else if(self.BUTTON_ATCK || self.impulse == 10 || self.impulse == 15 || self.impulse == 18 || (self.impulse >= 200 && self.impulse <= 209)) { + self.flags &= ~FL_JUMPRELEASED; if(SpectateNext()) { self.classname = "spectator"; } else { @@ -2102,8 +2103,8 @@ void SpectatorThink() PutClientInServer(); } self.impulse = 0; - } else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19 || self.impulse >= 220 && self.impulse <= 229) { - self.flags &~= FL_JUMPRELEASED; + } else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19 || (self.impulse >= 220 && self.impulse <= 229)) { + self.flags &= ~FL_JUMPRELEASED; if(SpectatePrev()) { self.classname = "spectator"; } else { @@ -2112,7 +2113,7 @@ void SpectatorThink() } self.impulse = 0; } else if (self.BUTTON_ATCK2) { - self.flags &~= FL_JUMPRELEASED; + self.flags &= ~FL_JUMPRELEASED; self.classname = "observer"; PutClientInServer(); } else { @@ -2124,7 +2125,7 @@ void SpectatorThink() self.flags |= FL_JUMPRELEASED; if(self.flags & FL_SPAWNING) { - self.flags &~= FL_SPAWNING; + self.flags &= ~FL_SPAWNING; LeaveSpectatorMode(); return; } @@ -2355,8 +2356,6 @@ void PlayerPreThink (void) float do_crouch = self.BUTTON_CROUCH; if(self.hook.state) do_crouch = 0; - if(self.health <= g_bloodloss) - do_crouch = 1; if(self.vehicle) do_crouch = 0; if(self.freezetag_frozen) @@ -2388,15 +2387,6 @@ void PlayerPreThink (void) } } - if(self.health <= g_bloodloss && self.deadflag == DEAD_NO) - { - if(self.bloodloss_timer < time) - { - self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0'); - self.bloodloss_timer = time + 0.5 + random() * 0.5; - } - } - FixPlayermodel(); GrapplingHookFrame(); @@ -2404,7 +2394,7 @@ void PlayerPreThink (void) // LordHavoc: allow firing on move frames (sub-ticrate), this gives better timing on slow servers //if(frametime) { - self.items &~= self.items_added; + self.items &= ~self.items_added; W_WeaponFrame(); @@ -2424,9 +2414,6 @@ void PlayerPreThink (void) if(frametime) player_anim(); - - if(g_nexball) - nexball_setstatus(); // secret status secrets_setstatus(); @@ -2564,7 +2551,7 @@ void PlayerPostThink (void) else if(timeleft <= 10) { if(timeleft != self.idlekick_lasttimeleft) - Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(timeleft)); + { Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(CNT_IDLE, timeleft)); } self.idlekick_lasttimeleft = timeleft; } } @@ -2614,7 +2601,7 @@ 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)); + WaypointSprite_UpdateHealth(self.waypointsprite_attachedforcarrier, '1 0 0' * healtharmor_maxdamage(self.health, self.armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON)); playerdemo_write();