From: Penguinum <penguinum@gmail.com>
Date: Tue, 19 May 2015 06:56:26 +0000 (+0300)
Subject: Removed very stupid piece of code, renamed aw_inactive.
X-Git-Tag: xonotic-v0.8.1~40^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=754e6b0083895315729a0d0ba42a2e798f61d365;p=xonotic%2Fxonotic-data.pk3dir.git

Removed very stupid piece of code, renamed aw_inactive.
---

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index d00b4de29..101f16796 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -37,17 +37,11 @@ void g_clientmodel_use(void)
 	if (self.antiwall_flag == 1)
 	{
 		self.inactive = 1;
+		self.solid = SOLID_NOT;
 	}
 	else if (self.antiwall_flag == 2)
 	{
 		self.inactive = 0;
-	}
-	if (self.inactive)
-	{
-		self.solid = SOLID_NOT;
-	}
-	else
-	{
 		self.solid = self.default_solid;
 	}
 	g_clientmodel_setcolormaptoactivator();
diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 7b7fe131c..717a19b09 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -105,7 +105,7 @@ void SUB_UseTargets()
 		{
 			// Flag to set func_clientwall state
 			// 1 == deactivate, 2 == activate, 0 == do nothing
-			float aw_inactive = self.antiwall_flag;
+			float aw_flag = self.antiwall_flag;
 			for(t = world; (t = find(t, targetname, s)); )
 			if(t.use)
 			{
@@ -116,7 +116,7 @@ void SUB_UseTargets()
 				else
 				{
 					if (t.classname == "func_clientwall" || t.classname == "func_clientillusionary")
-						t.antiwall_flag = aw_inactive;
+						t.antiwall_flag = aw_flag;
 					self = t;
 					other = stemp;
 					activator = act;