X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qc;h=26e14e4de525fc80cddfc8b06990682e2e8b9b31;hb=a31aee64fd727b9e6f58dbf8084f837b40dd69a3;hp=a2f6b5d4a8618106fc4e8f5feaaab094fd37def2;hpb=f5517806dce5953f2a2dc2e9312032e99abcf6d0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc index a2f6b5d4a..26e14e4de 100644 --- a/qcsrc/common/physics.qc +++ b/qcsrc/common/physics.qc @@ -1273,18 +1273,6 @@ void PM_ladder(float maxspd_mod) PM_Accelerate(wishdir, wishspeed, wishspeed, PHYS_ACCELERATE*maxspd_mod, 1, 0, 0, 0); } -void PM_check_jumppad() -{ -#ifdef CSQC - entity oldself = self; - - for(self = world; (self = find(self, classname, "jumppad")); ) - trigger_push_draw(); - - self = oldself; -#endif -} - void PM_jetpack(float maxspd_mod) { //makevectors(PHYS_INPUT_ANGLES(self).y * '0 1 0'); @@ -1851,11 +1839,8 @@ void PM_Main() maxspeed_mod = 1; -#ifdef SVQC - if (self.in_swamp) { + if (self.in_swamp) maxspeed_mod *= self.swamp_slowdown; //cvar("g_balance_swamp_moverate"); - } -#endif // conveyors: first fix velocity if (self.conveyor.state) @@ -1947,8 +1932,6 @@ void PM_Main() #endif CheckPlayerJump(); - PM_check_jumppad(); - if (self.flags & /* FL_WATERJUMP */ 2048) { self.velocity_x = self.movedir_x;