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 (file)
index 0000000..754fce7
--- /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 (file)
index 0000000..bfeddf2
--- /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 (file)
index 22d7bcc..0000000
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 (file)
index bfeddf2..0000000
--- 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 e2a278eb3713993044aadea72e9e21441d04100b..f47d8e7c5afdd76ea2ce79630d28a11e4ee608e6 100644 (file)
--- 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 36ce979aef9b39df0ccea336e07cfed627835cd9..65387f5adc9bd0bafc8e5aee181f786aa4897e17 100644 (file)
--- 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 d9763f38743d6b769ffaf4b6e8cfcf3c8d1d4bae..af320d9c15555c866f30505e72dee4d0c41c237a 100644 (file)
--- 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);