Removed very stupid piece of code, renamed aw_inactive.

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index d00b4de29bf2fba84c69a9fb0d39b768ce12fb9c..101f16796a27c3f565404ce3f509708f7e3945f0 100644 (file)
--- 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;
        if (self.antiwall_flag == 1)
        {
                self.inactive = 1;

+               self.solid = SOLID_NOT;

        }
        else if (self.antiwall_flag == 2)
        {
                self.inactive = 0;
        }
        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();
                self.solid = self.default_solid;
        }
        g_clientmodel_setcolormaptoactivator();

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 7b7fe131c347cfe8294df786a111e32fedc3b552..717a19b09f09e17165ed9de426b7179b30f05d5a 100644 (file)
--- 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
                {
                        // 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)
                        {
                        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")
                                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;
                                        self = t;
                                        other = stemp;
                                        activator = act;