From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 9 Oct 2011 14:30:32 +0000 (+0200)
Subject: remove legacy animinfo spam stuff
X-Git-Tag: xonotic-v0.6.0~40^2~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e349b52126f03ef45ee0fe39b596ada31bb4fd6c;p=xonotic%2Fxonotic-data.pk3dir.git

remove legacy animinfo spam stuff
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 15bb65262..77c92e645 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -229,44 +229,7 @@ void player_setupanimsformodel()
 	self.anim_backright = '21 1 1';
 	self.anim_backleft  = '22 1 1';
 	self.anim_melee = '23 1 1';
-	animparseerror = FALSE;
-	animfilename = strcat(self.model, ".animinfo");
-	animfile = fopen(animfilename, FILE_READ);
-	if (animfile >= 0)
-	{
-		self.anim_die1         = animparseline(animfile);
-		self.anim_die2         = animparseline(animfile);
-		self.anim_draw         = animparseline(animfile);
-		self.anim_duck         = animparseline(animfile);
-		self.anim_duckwalk     = animparseline(animfile);
-		self.anim_duckjump     = animparseline(animfile);
-		self.anim_duckidle     = animparseline(animfile);
-		self.anim_idle         = animparseline(animfile);
-		self.anim_jump         = animparseline(animfile);
-		self.anim_pain1        = animparseline(animfile);
-		self.anim_pain2        = animparseline(animfile);
-		self.anim_shoot        = animparseline(animfile);
-		self.anim_taunt        = animparseline(animfile);
-		self.anim_run          = animparseline(animfile);
-		self.anim_runbackwards = animparseline(animfile);
-		self.anim_strafeleft   = animparseline(animfile);
-		self.anim_straferight  = animparseline(animfile);
-		self.anim_forwardright = animparseline(animfile);
-		self.anim_forwardleft  = animparseline(animfile);
-		self.anim_backright    = animparseline(animfile);
-		self.anim_backleft     = animparseline(animfile);
-		self.anim_melee	       = animparseline(animfile);
-		fclose(animfile);
-
-		// derived anims
-		self.anim_dead1 = '0 1 1' + '1 0 0' * (self.anim_die1_x + self.anim_die1_y - 1);
-		self.anim_dead2 = '0 1 1' + '1 0 0' * (self.anim_die2_x + self.anim_die2_y - 1);
-
-		if (animparseerror)
-			print("Parse error in ", animfilename, ", some player animations are broken\n");
-	}
-	else
-		dprint("File ", animfilename, " not found, assuming legacy .zym model animation timings\n");
+	// TODO introspect models for finding right "fps" value (1/duration)
 	// reset animstate now
 	setanim(self, self.anim_idle, TRUE, FALSE, TRUE);
 };
diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index b3b0e6ea0..4b50f7ade 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -376,24 +376,11 @@ void CL_WeaponEntity_SetModel(string name)
 		else
 		{
 			setmodel(self, strcat("models/weapons/h_", name, ".iqm")); // precision set below
-			animfilename = strcat("models/weapons/h_", name, ".iqm.animinfo");
-			animfile = fopen(animfilename, FILE_READ);
 			// preset some defaults that work great for renamed zym files (which don't need an animinfo)
 			self.anim_fire1  = '0 1 0.01';
 			self.anim_fire2  = '1 1 0.01';
 			self.anim_idle   = '2 1 0.01';
 			self.anim_reload = '3 1 0.01';
-			if (animfile >= 0)
-			{
-				animparseerror = FALSE;
-				self.anim_fire1  = animparseline(animfile);
-				self.anim_fire2  = animparseline(animfile);
-				self.anim_idle   = animparseline(animfile);
-				self.anim_reload = animparseline(animfile);
-				fclose(animfile);
-				if (animparseerror)
-					print("Parse error in ", animfilename, ", some player animations are broken\n");
-			}
 
 			// if we have a "weapon" tag, let's attach the v_ model to it ("invisible hand" style model)
 			// if we don't, this is a "real" animated model
diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index c311f3774..28e66f324 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -58,30 +58,6 @@ void updateanim(entity e)
 	//print(ftos(time), " -> ", ftos(e.frame), "\n");
 };
 
-float animparseerror;
-vector animparseline(float animfile)
-{
-	local string line;
-	local float c;
-	local vector anim;
-	if (animfile < 0)
-		return '0 1 2';
-	line = fgets(animfile);
-	c = tokenize_console(line);
-	if (c < 3)
-	{
-		animparseerror = TRUE;
-		return '0 1 2';
-	}
-	anim_x = stof(argv(0));
-	anim_y = stof(argv(1));
-	anim_z = stof(argv(2));
-	// don't allow completely bogus values
-	if (anim_x < 0 || anim_y < 1 || anim_z < 0.001)
-		anim = '0 1 2';
-	return anim;
-};
-
 /*
 ==================
 SUB_Remove