From: Mario <mario@smbclan.net>
Date: Sun, 12 Jun 2016 18:19:12 +0000 (+1000)
Subject: Use a stock model to remain compatible with old clients
X-Git-Tag: xonotic-v0.8.2~807^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41e3520cfef3b385f744db4f169c45c7dd1b71fb;p=xonotic%2Fxonotic-data.pk3dir.git

Use a stock model to remain compatible with old clients
---

diff --git a/models/ctf/shield.md3_0.skin b/models/ctf/shield.md3_0.skin
new file mode 100644
index 000000000..754fce734
--- /dev/null
+++ b/models/ctf/shield.md3_0.skin
@@ -0,0 +1 @@
+shield,shield
diff --git a/models/ctf/shield.md3_1.skin b/models/ctf/shield.md3_1.skin
new file mode 100644
index 000000000..bfeddf2f8
--- /dev/null
+++ b/models/ctf/shield.md3_1.skin
@@ -0,0 +1 @@
+shield,nade_orb
diff --git a/models/nades/orb.md3 b/models/nades/orb.md3
deleted file mode 100644
index 22d7bcc42..000000000
Binary files a/models/nades/orb.md3 and /dev/null differ
diff --git a/models/nades/orb.md3_0.skin b/models/nades/orb.md3_0.skin
deleted file mode 100644
index bfeddf2f8..000000000
--- a/models/nades/orb.md3_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-shield,nade_orb
diff --git a/qcsrc/common/models/all.inc b/qcsrc/common/models/all.inc
index e2a278eb3..f47d8e7c5 100644
--- a/qcsrc/common/models/all.inc
+++ b/qcsrc/common/models/all.inc
@@ -125,7 +125,7 @@ MODEL(PROJECTILE_ROCKETMINSTA_LASER,    "models/elaser.mdl");
 MODEL(PROJECTILE_NADE,                  W_Model("v_ok_grenade.md3"));
 MODEL(NADE_VIEW,                        W_Model("h_ok_grenade.iqm"));
 MODEL(NADE_TIMER,                       "models/ok_nade_counter/ok_nade_counter.md3");
-MODEL(NADE_ORB,                         "models/nades/orb.md3");
+MODEL(NADE_ORB,                         "models/ctf/shield.md3");
 
 MODEL(GIB_CHUNK,                        "models/gibs/chunk.mdl");
 MODEL(GIB_LEG1,                         "models/gibs/leg1.md3");
diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 36ce979ae..65387f5ad 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -548,6 +548,7 @@ entity nades_spawn_orb(entity own, entity realown, vector org, float orb_ltime,
 	orb.solid = SOLID_TRIGGER;
 
 	setmodel(orb, MDL_NADE_ORB);
+	orb.skin = 1;
 	orb.orb_radius = orb_rad; // required for fading
 	vector size = '1 1 1' * orb.orb_radius / 2;
 	setsize(orb, -size, size);
diff --git a/qcsrc/common/mutators/mutator/nades/net.qc b/qcsrc/common/mutators/mutator/nades/net.qc
index d9763f387..af320d9c1 100644
--- a/qcsrc/common/mutators/mutator/nades/net.qc
+++ b/qcsrc/common/mutators/mutator/nades/net.qc
@@ -19,6 +19,7 @@ void orb_draw(entity this)
 void orb_setup(entity e)
 {
 	setmodel(e, MDL_NADE_ORB);
+	e.skin = 1;
 
 	setorigin(e, e.origin);