From 41e3520cfef3b385f744db4f169c45c7dd1b71fb Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 13 Jun 2016 04:19:12 +1000 Subject: [PATCH] Use a stock model to remain compatible with old clients --- models/ctf/shield.md3_0.skin | 1 + .../orb.md3_0.skin => ctf/shield.md3_1.skin} | 0 models/nades/orb.md3 | Bin 22036 -> 0 bytes qcsrc/common/models/all.inc | 2 +- qcsrc/common/mutators/mutator/nades/nades.qc | 1 + qcsrc/common/mutators/mutator/nades/net.qc | 1 + 6 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 models/ctf/shield.md3_0.skin rename models/{nades/orb.md3_0.skin => ctf/shield.md3_1.skin} (100%) delete mode 100644 models/nades/orb.md3 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/nades/orb.md3_0.skin b/models/ctf/shield.md3_1.skin similarity index 100% rename from models/nades/orb.md3_0.skin rename to models/ctf/shield.md3_1.skin diff --git a/models/nades/orb.md3 b/models/nades/orb.md3 deleted file mode 100644 index 22d7bcc42d9d1cfe7e6b2fe903622864a59240a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22036 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 J=izzxe*j8MV{8Bb 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); -- 2.39.2