Remove old unused movelib functions

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 43fc151c88cb31da0e8d23efcc31633e9ef63e13..05e8ab34ba6f243d199137033ebb51d1970694f5 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -679,7 +679,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                if(self.flags & FL_FLY || self.flags & FL_SWIM)
                        movelib_move_simple(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6);
                else
-                       movelib_move_simple_gravity(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6);
+                       movelib_move(v_forward, ((self.enemy) ? runspeed : walkspeed), 0, 200, 0.6);
 
                if(time > self.pain_finished)
                if(time > self.attack_finished_single)
@@ -962,14 +962,9 @@ float monster_initialize(float mon_id, float nodrop)
        entity mon = get_monsterinfo(mon_id);
 
        // support for quake style removing monsters based on skill
-       switch(monster_skill)
-       {
-               case 0:
-               case 1: if(self.spawnflags & MONSTERSKILL_NOTEASY)              return FALSE; break;
-               case 2: if(self.spawnflags & MONSTERSKILL_NOTMEDIUM)    return FALSE; break;
-               default:
-               case 3: if(self.spawnflags & MONSTERSKILL_NOTHARD)              return FALSE; break;
-       }
+       if(monster_skill <= 1) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return FALSE; }
+       if(monster_skill == 2) if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) { return FALSE; }
+       if(monster_skill >= 3) if(self.spawnflags & MONSTERSKILL_NOTHARD) { return FALSE; }
 
        if(self.team && !teamplay)
                self.team = 0;

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index b8f46b534dd5c09c0da8331f4ff9325e62b8c279..9b9f7fde01abe5dc22dcd51310665c265aa15e6d 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -102,19 +102,6 @@ void movelib_move(vector force,float max_velocity,float drag,float theMass,float
             self.velocity = normalize(self.velocity) * (mspeed - 50);//* max_velocity;
 }
 
-void movelib_move_simple_gravity(vector newdir,float velo,float blendrate)
-{
-    float z_speed = self.velocity_z;
-    self.movelib_lastupdate = time;
-    self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo;
-    self.velocity_z = z_speed * self.gravity;
-}
-
-void movelib_jump_simple(float power){
-    self.velocity_z=power;
-    self.movelib_lastupdate = time;
-}
-
 /*
 .float mass;
 .float side_friction;