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

1 files changed, 10 insertions, 46 deletions

diff --git a/src/fpsgame/render.cpp b/src/fpsgame/render.cpp
index fff917e..dd8a5ee 100644
--- a/src/fpsgame/render.cpp
+++ b/src/fpsgame/render.cpp
@@ -6,42 +6,16 @@ extern float gatherspawninfos(dynent *d, int tag, vector<spawninfo> &spawninfos)
 namespace game {
 	vector<fpsent *> bestplayers;
 	vector<const char *> bestteams;
-	VARP(ragdoll, 0, 1, 1);
-	VARP(ragdollmillis, 0, 10000, 300000);
-	VARP(ragdollfade, 0, 1000, 300000);
 	VARP(playermodel, 0, 0, 0);
 	VARP(hidedead, 0, 0, 2);
-	vector<fpsent *> ragdolls;
-	void saveragdoll(fpsent *d) {
-		if(!d->ragdoll || !ragdollmillis || (!ragdollfade && lastmillis > d->lastpain + ragdollmillis)) return;
-		fpsent *r = new fpsent(*d);
-		r->lastupdate = ragdollfade && lastmillis > d->lastpain + max(ragdollmillis - ragdollfade, 0) ? lastmillis - max(ragdollmillis - ragdollfade, 0) : d->lastpain;
-		r->edit = NULL;
-		r->ai = NULL;
-		r->attackchan = r->idlechan = -1;
-		if(d==player1) r->playermodel = playermodel;
-		ragdolls.add(r);
-		d->ragdoll = NULL;
-	}
-	void clearragdolls() {
-		ragdolls.deletecontents();
-	}
-	void moveragdolls() {
-		loopv(ragdolls) {
-			fpsent *d = ragdolls[i];
-			if(lastmillis > d->lastupdate + ragdollmillis) {
-				delete ragdolls.remove(i--);
-				continue;
-			}
-			moveragdoll(d);
-		}
-	}
-	static const playermodelinfo playermodels[1] = {
-	 {
-		 "mrfixit", "mrfixit/blue", "mrfixit/red", "mrfixit/hudguns", NULL, "mrfixit/horns", {
-		 "mrfixit/armor/blue", "mrfixit/armor/green", "mrfixit/armor/yellow" },
-		"mrfixit", "mrfixit_blue", "mrfixit_red", true },
-	};
+	static const playermodelinfo playermodels[1] = { {
+		//~const char *ffa, *blueteam, *redteam, *hudguns,
+				   //~*vwep, *quad, *armour[3],
+				   //~*ffaicon, *blueicon, *redicon;
+		"mrfixit", "mrfixit/blue", "mrfixit/red", "mrfixit/hudguns", NULL, "mrfixit/horns",
+		{ "mrfixit/armor/blue", "mrfixit/armor/green", "mrfixit/armor/yellow" },
+		"mrfixit", "mrfixit_blue", "mrfixit_red"
+	} };
 	const playermodelinfo *getplayermodelinfo(int n) {
 		(void) n;
 		return &playermodels[0];
@@ -108,7 +82,7 @@ namespace game {
 			case 1: mdlname = mdl.blueteam; break;
 			case 2: mdlname = mdl.redteam; break;
 		}
-		renderclient(d, mdlname, a[0].tag ? a : NULL, hold, attack, delay, lastaction, intermission && d->state!=CS_DEAD ? 0 : d->lastpain, fade, ragdoll && mdl.ragdoll);
+		renderclient(d, mdlname, a[0].tag ? a : NULL, hold, attack, delay, lastaction, intermission && d->state!=CS_DEAD ? 0 : d->lastpain, fade);
 	}
 	VARP(teamskins, 0, 0, 1);
 	VARP(statusicons, 0, 1, 1);
@@ -194,15 +168,6 @@ namespace game {
 				renderstatusicons(d, team, offset);
 			}
 		}
-		loopv(ragdolls) {
-			fpsent *d = ragdolls[i];
-			int team = 0;
-			if(teamskins || m_teammode) team = isteam(player1->team, d->team) ? 1 : 2;
-			float fade = 1.0f;
-			if(ragdollmillis && ragdollfade)
-				fade -= clamp(float(lastmillis - (d->lastupdate + max(ragdollmillis - ragdollfade, 0)))/min(ragdollmillis, ragdollfade), 0.0f, 1.0f);
-			renderplayer(d, getplayermodelinfo(d), team, fade, mainpass);
-		}
 		if(isthirdperson() && !followingplayer() && (player1->state!=CS_DEAD || hidedead != 1)) renderplayer(player1, getplayermodelinfo(player1), teamskins || m_teammode ? 1 : 0, 1, mainpass);
 		entities::renderentities();
 		renderbouncers();
@@ -212,7 +177,6 @@ namespace game {
 	VARP(hudgun, 0, 1, 1);
 	VARP(hudgunsway, 0, 1, 1);
 	VARP(teamhudguns, 0, 1, 1);
-	VARP(chainsawhudgun, 0, 1, 1);
 	VAR(testhudgun, 0, 0, 1);
 	FVAR(swaystep, 1, 35.0f, 100);
 	FVAR(swayside, 0, 0.04f, 1);
@@ -263,7 +227,7 @@ namespace game {
 		d->muzzle = vec(-1, -1, -1);
 		a[0] = modelattach("tag_muzzle", &d->muzzle);
 		dynent *interp = NULL;
-		if(d->gunselect==GUN_FIST && chainsawhudgun) {
+		if(d->gunselect==GUN_FIST) {
 			anim |= ANIM_LOOP;
 			base = 0;
 			interp = &guninterp;