X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=b65e62a85ca7915bd52e2e70625d2673e7c8df25;hb=8c8a22011714768f8c5b3ac887d0fd099fc08d8b;hp=79087eb8a366e9a5ed91c67de9024d058ef3140f;hpb=616650bb18362024afeed71fed91d33dc1708d09;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 79087eb8a..b65e62a85 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -48,13 +48,7 @@ void PlayerJump (void) mjumpheight = autocvar_sv_jumpvelocity; if (self.waterlevel >= WATERLEVEL_SWIMMING) { - if (self.watertype == CONTENT_WATER) - self.velocity_z = 200; - else if (self.watertype == CONTENT_SLIME) - self.velocity_z = 80; - else - self.velocity_z = 50; - + self.velocity_z = self.stat_sv_maxspeed * 0.7; return; } @@ -169,10 +163,7 @@ void PlayerJump (void) self.flags &~= FL_ONGROUND; self.flags &~= FL_JUMPRELEASED; - if (self.crouch) - setanim(self, self.anim_duckjump, FALSE, TRUE, TRUE); - else if (self.animstate_startframe != self.anim_melee_x || (self.animstate_startframe == self.anim_melee_x && time - self.animstate_starttime >= 21/20)) // jump animation shouldn't override melee until we have animation blending (or until the anim finished, 21/20 = numframes/fps) - setanim(self, self.anim_jump, FALSE, TRUE, TRUE); + animdecide_setaction(self, ANIMACTION_JUMP, TRUE); if(g_jump_grunt) PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND); @@ -361,7 +352,7 @@ void RaceCarPhysics() rigvel_z -= frametime * autocvar_sv_gravity; // 4x gravity plays better rigvel_xy = vec2(rigvel); - if(g_bugrigs_planar_movement_car_jumping && !g_touchexplode) // touchexplode is a better way to handle collisions + if(g_bugrigs_planar_movement_car_jumping) mt = MOVE_NORMAL; else mt = MOVE_NOMONSTERS; @@ -707,28 +698,12 @@ void SV_PlayerPhysics() WarpZone_PlayerPhysics_FixVAngle(); maxspd_mod = 1; - if(g_minstagib && (self.items & IT_INVINCIBLE)) - maxspd_mod *= autocvar_g_minstagib_speed_highspeed; if(self.ballcarried) if(g_nexball) maxspd_mod *= autocvar_g_nexball_basketball_carrier_highspeed; else if(g_keepaway) maxspd_mod *= autocvar_g_keepaway_ballcarrier_highspeed; - if(g_runematch) - { - if(self.runes & RUNE_SPEED) - { - if(self.runes & CURSE_SLOW) - maxspd_mod *= autocvar_g_balance_rune_speed_combo_highspeed; - else - maxspd_mod *= autocvar_g_balance_rune_speed_highspeed; - } - else if(self.runes & CURSE_SLOW) - { - maxspd_mod *= autocvar_g_balance_curse_slow_highspeed; - } - } maxspd_mod *= autocvar_g_movement_highspeed; // fix physics stats for g_movement_highspeed @@ -829,7 +804,7 @@ void SV_PlayerPhysics() self.punchvector = '0 0 0'; } - if (clienttype(self) == CLIENTTYPE_BOT) + if (IS_BOT_CLIENT(self)) { if(playerdemo_read()) return; @@ -838,7 +813,7 @@ void SV_PlayerPhysics() self.items &~= IT_USING_JETPACK; - if(self.classname == "player") + if(IS_PLAYER(self)) { if(self.race_penalty) if(time > self.race_penalty) @@ -875,6 +850,12 @@ void SV_PlayerPhysics() MUTATOR_CALLHOOK(PlayerPhysics); + if(self.player_blocked) + { + self.movement = '0 0 0'; + self.disableclientprediction = 1; + } + maxspd_mod = 1; swampspd_mod = 1; @@ -886,20 +867,20 @@ void SV_PlayerPhysics() if(self.conveyor.state) self.velocity -= self.conveyor.movedir; - if(self.classname != "player") + if not(IS_PLAYER(self)) { maxspd_mod = autocvar_sv_spectator_speed_multiplier; if(!self.spectatorspeed) self.spectatorspeed = maxspd_mod; - if(self.impulse && self.impulse <= 19) + if(self.impulse && self.impulse <= 19 || self.impulse >= 200 && self.impulse <= 209 || self.impulse >= 220 && self.impulse <= 229) { if(self.lastclassname != "player") { - if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18) + if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18 || self.impulse >= 200 && self.impulse <= 209) self.spectatorspeed = bound(1, self.spectatorspeed + 0.5, 5); else if(self.impulse == 11) self.spectatorspeed = maxspd_mod; - else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19) + else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19 || self.impulse >= 220 && self.impulse <= 229) self.spectatorspeed = bound(1, self.spectatorspeed - 0.5, 5); else if(self.impulse >= 1 && self.impulse <= 9) self.spectatorspeed = 1 + 0.5 * (self.impulse - 1); @@ -935,7 +916,7 @@ void SV_PlayerPhysics() } if(self.flags & FL_ONGROUND) - if(self.classname == "player") // no fall sounds for observers thank you very much + if(IS_PLAYER(self)) // no fall sounds for observers thank you very much if(self.wasFlying) { self.wasFlying = 0; @@ -960,7 +941,7 @@ void SV_PlayerPhysics() if(IsFlying(self)) self.wasFlying = 1; - if(self.classname == "player") + if(IS_PLAYER(self)) CheckPlayerJump(); if (self.flags & FL_WATERJUMP ) @@ -973,7 +954,7 @@ void SV_PlayerPhysics() self.teleport_time = 0; } } - else if (g_bugrigs && self.classname == "player") + else if (g_bugrigs && IS_PLAYER(self)) { RaceCarPhysics(); } @@ -1068,7 +1049,7 @@ void SV_PlayerPhysics() PM_Accelerate(wishdir, wishspeed, wishspeed, autocvar_sv_accelerate*maxspd_mod, 1, 0, 0, 0); } } - else if ((self.items & IT_JETPACK) && self.BUTTON_HOOK && (!autocvar_g_jetpack_fuel || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO)) + else if ((self.items & IT_JETPACK) && self.BUTTON_HOOK && (!autocvar_g_jetpack_fuel || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.freezetag_frozen) { //makevectors(self.v_angle_y * '0 1 0'); makevectors(self.v_angle); @@ -1170,7 +1151,7 @@ void SV_PlayerPhysics() else if (self.flags & FL_ONGROUND) { // we get here if we ran out of ammo - if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32)) + if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && self.ammo_fuel < 0.01) sprint(self, "You don't have any fuel for the ^2Jetpack\n"); // walking @@ -1253,7 +1234,7 @@ void SV_PlayerPhysics() { float wishspeed0; // we get here if we ran out of ammo - if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32)) + if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && self.ammo_fuel < 0.01) sprint(self, "You don't have any fuel for the ^2Jetpack\n"); if(maxspd_mod < 1) @@ -1325,7 +1306,7 @@ void SV_PlayerPhysics() } } - if((g_cts || g_race) && self.classname != "observer") { + if((g_cts || g_race) && !IS_OBSERVER(self)) { if(vlen(self.velocity - self.velocity_z * '0 0 1') > speedaward_speed) { speedaward_speed = vlen(self.velocity - self.velocity_z * '0 0 1'); speedaward_holder = self.netname;