r5674 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 26 17:44:45 EST 2009
Author: div0
Date: 2009-01-26 17:44:45 -0500 (Mon, 26 Jan 2009)
New Revision: 5674
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
fix invis
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-01-26 22:42:16 UTC (rev 5673)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-01-26 22:44:45 UTC (rev 5674)
@@ -2112,7 +2112,8 @@
if(time > self.teleport_time)
{
self.teleport_time = 0;
- self.effects = self.effects - (self.effects & EF_NODRAW);
+ if(! (self.items & IT_STRENGTH))
+ self.effects = self.effects - (self.effects & EF_NODRAW);
if(self.weaponentity)
self.weaponentity.flags = self.weaponentity.flags - (self.weaponentity.flags & EF_NODRAW);
}
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-01-26 22:42:16 UTC (rev 5673)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2009-01-26 22:44:45 UTC (rev 5674)
@@ -285,6 +285,15 @@
self.alpha = self.owner.alpha;
else
self.alpha = 1;
+
+ /* Minstagib invis doesnt set alpha with perfect invis,
+ * but only sets EF_NODRAW, so we have to copy it, too.
+ */
+ if(self.owner.effects & EF_NODRAW)
+ self.effects |= EF_NODRAW;
+ else
+ self.effects -= self.effects & EF_NODRAW;
+
self.colormap = self.owner.colormap;
self.angles = '0 0 0';
@@ -344,6 +353,15 @@
self.alpha = self.owner.alpha;
else
self.alpha = 1;
+
+ /* Minstagib invis doesnt set alpha with perfect invis,
+ * but only sets EF_NODRAW, so we have to copy it, too.
+ */
+ if(self.owner.effects & EF_NODRAW)
+ self.effects |= EF_NODRAW;
+ else
+ self.effects -= self.effects & EF_NODRAW;
+
self.colormap = self.owner.colormap;
};
More information about the nexuiz-commits
mailing list