Compiles, removed a lot of code, do not run it...HEADmaster

1 files changed, 6 insertions, 6 deletions

diff --git a/src/engine/model.h b/src/engine/model.h
index 16f1629..40b8b00 100644
--- a/src/engine/model.h
+++ b/src/engine/model.h
@@ -3,20 +3,21 @@ enum { MDL_MD5, MDL_IQM, NUMMODELTYPES };
 struct model {
 	char *name;
 	float spinyaw, spinpitch, offsetyaw, offsetpitch;
-	bool collide, ellipsecollide, shadow, alphadepth, depthoffset;
+	bool collide, ellipsecollide, alphadepth, depthoffset;
 	float scale;
 	vec translate;
-	BIH *bih;
 	vec bbcenter, bbradius, bbextend, collidecenter, collideradius;
 	float rejectradius, eyeheight, collidexyradius, collideheight;
 	int batch;
-	model(const char *name) : name(name ? newstring(name) : NULL), spinyaw(0), spinpitch(0), offsetyaw(0), offsetpitch(0), collide(true), ellipsecollide(false), shadow(true), alphadepth(true), depthoffset(false), scale(1.0f), translate(0, 0, 0), bih(0), bbcenter(0, 0, 0), bbradius(-1, -1, -1), bbextend(0, 0, 0), collidecenter(0, 0, 0), collideradius(-1, -1, -1), rejectradius(-1), eyeheight(0.9f), collidexyradius(0), collideheight(0), batch(-1) {}
-	virtual ~model() { DELETEA(name); DELETEP(bih); }
+	model(const char *name) : name(name ? newstring(name) : NULL), spinyaw(0), spinpitch(0), offsetyaw(0), offsetpitch(0), collide(true), ellipsecollide(false),
+	alphadepth(true), depthoffset(false), scale(1.0f), translate(0, 0, 0), bbcenter(0, 0, 0), bbradius(-1, -1, -1), bbextend(0, 0, 0),
+	collidecenter(0, 0, 0), collideradius(-1, -1, -1), rejectradius(-1), eyeheight(0.9f), collidexyradius(0), collideheight(0), batch(-1) {}
+
+	virtual ~model() { DELETEA(name); }
 	virtual void calcbb(vec &center, vec &radius) = 0;
 	virtual void render(int anim, int basetime, int basetime2, const vec &o, float yaw, float pitch, dynent *d, modelattach *a = NULL, const vec &color = vec(0, 0, 0), const vec &dir = vec(0, 0, 0), float transparent = 1) = 0;
 	virtual bool load() = 0;
 	virtual int type() const = 0;
-	virtual BIH *setBIH() { return 0; }
 	virtual bool skeletal() const { return false; }
 	virtual void setshader(Shader *) {}
 	virtual void setspec(float) {}
@@ -25,7 +26,6 @@ struct model {
 	virtual void setalphablend(bool) {}
 	virtual void setfullbright(float) {}
 	virtual void setcullface(bool) {}
-	virtual void preloadBIH() { if(!bih) setBIH(); }
 	virtual void preloadshaders() {}
 	virtual void preloadmeshes() {}
 	virtual void cleanup() {}