From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Fri, 14 May 2010 02:38:27 +0000 (-0400)
Subject: Laser and shotgun rescaling.
X-Git-Tag: xonotic-v0.1.0preview~605^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b98a829c6cc020f9e6e001222122b5cbe7418da0;p=xonotic%2Fxonotic-data.pk3dir.git

Laser and shotgun rescaling.
---

diff --git a/models/weapons/h_laser.dpm b/models/weapons/h_laser.dpm
deleted file mode 100644
index e5fcb46c6..000000000
Binary files a/models/weapons/h_laser.dpm and /dev/null differ
diff --git a/models/weapons/h_laser.dpm.framegroups b/models/weapons/h_laser.dpm.framegroups
deleted file mode 100644
index 0a59625b6..000000000
--- a/models/weapons/h_laser.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
new file mode 100644
index 000000000..bf370a017
Binary files /dev/null and b/models/weapons/h_laser.iqm differ
diff --git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups
new file mode 100644
index 000000000..0a59625b6
--- /dev/null
+++ b/models/weapons/h_laser.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.dpm b/models/weapons/h_shotgun.dpm
deleted file mode 100644
index ad489c5ad..000000000
Binary files a/models/weapons/h_shotgun.dpm and /dev/null differ
diff --git a/models/weapons/h_shotgun.dpm.framegroups b/models/weapons/h_shotgun.dpm.framegroups
deleted file mode 100644
index 0a59625b6..000000000
--- a/models/weapons/h_shotgun.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.iqm b/models/weapons/h_shotgun.iqm
new file mode 100644
index 000000000..985a612f6
Binary files /dev/null and b/models/weapons/h_shotgun.iqm differ
diff --git a/models/weapons/h_shotgun.iqm.framegroups b/models/weapons/h_shotgun.iqm.framegroups
new file mode 100644
index 000000000..0a59625b6
--- /dev/null
+++ b/models/weapons/h_shotgun.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/v_laser.md3 b/models/weapons/v_laser.md3
index 56c78c133..3f87cf4e0 100644
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ
diff --git a/models/weapons/v_shotgun.md3 b/models/weapons/v_shotgun.md3
index 89a5a435d..0a064bedc 100644
Binary files a/models/weapons/v_shotgun.md3 and b/models/weapons/v_shotgun.md3 differ
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index d90c97a38..4d749d0ba 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -167,7 +167,7 @@ float w_laser(float req)
 	{
 		precache_model ("models/weapons/g_laser.md3");
 		precache_model ("models/weapons/v_laser.md3");
-		precache_model ("models/weapons/h_laser.dpm");
+		precache_model ("models/weapons/h_laser.iqm");
 		precache_sound ("weapons/lasergun_fire.wav");
 		precache_sound ("weapons/gauntlet_fire.wav");
 	}