From: Mario <mario.mario@y7mail.com>
Date: Wed, 2 Oct 2013 04:51:18 +0000 (-0700)
Subject: Remove old unused movelib functions
X-Git-Tag: xonotic-v0.8.0~241^2^2~61
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=394b01dabd862d5b88e0bd22640422a512b41f05;p=xonotic%2Fxonotic-data.pk3dir.git

Remove old unused movelib functions
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 43fc151c8..05e8ab34b 100644
--- 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 b8f46b534..9b9f7fde0 100644
--- 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;