From: Samual <samual@xonotic.org>
Date: Thu, 12 Jan 2012 20:26:45 +0000 (-0500)
Subject: Use "null" instead of a whole other model for it -- it's the same thing, but "null... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~24^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b553f0dc135151cf76e0277739a2118e4a31b0c;p=xonotic%2Fxonotic-data.pk3dir.git

Use "null" instead of a whole other model for it -- it's the same thing, but "null" already exists, and doesn't need duplicated.
---

diff --git a/models/null.md3 b/models/null.md3
deleted file mode 100644
index 288e88f3f..000000000
Binary files a/models/null.md3 and /dev/null differ
diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 71cbbba7f..8facbf500 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -197,9 +197,6 @@ void CSQC_Init(void)
 	hud_configure_prev = -1;
 	tab_panel = -1;
 
-
-	precache_model("models/null.md3");
-
 	draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
 }
 
diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 620cdc873..33e0ab05e 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -99,7 +99,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 	}
 
 	e = spawn();
-	setmodel(e, "models/null.md3"); // necessary to attach and read origin // samual: FIXME: this is weird, is there some better way to do this?
+	setmodel(e, "null"); // necessary to attach and read origin // samual: FIXME: this is weird, is there some better way to do this?
 	setattachment(e, self, gettaginfo_name); // attach to the given bone
 	e.classname = "damage";
 	e.owner = self;