[nexuiz-commits] r6408 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-02 05:18:38 -0400 (Thu, 02 Apr 2009)
New Revision: 6408

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc
Log:
r6406 | div0 | 2009-04-02 08:17:02 +0200 (Thu, 02 Apr 2009) | 2 lines
fix a tiny menu bug (try finding it without reading this diff) :P
r6407 | div0 | 2009-04-02 10:49:10 +0200 (Thu, 02 Apr 2009) | 2 lines
fix a tiny waypointsprite interpolation bug


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-02 08:49:10 UTC (rev 6407)
+++ branches/nexuiz-2.0/.patchsets	2009-04-02 09:18:38 UTC (rev 6408)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6404
+revisions_applied = 1-6407

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-04-02 08:49:10 UTC (rev 6407)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-04-02 09:18:38 UTC (rev 6408)
@@ -112,7 +112,7 @@
 	string suffix;
 
 	suffix = "";
-	if(me.cvarValue != "laser")
+	if(me.cvarValue != "laser" && me.cvarValue != "most")
 		if(cvar("menu_weaponarena_with_laser"))
 			suffix = " laser";
 	if(me.checked)
@@ -128,7 +128,7 @@
 	// run the old function
 	me.saveCvars_weaponarena(me);
 
-	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser"));
+	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser") || (cvar_string("g_weaponarena") == "most"));
 
 	if not(me.disabled)
 	{
@@ -145,7 +145,7 @@
 
 void preDrawLaserWeaponArenaLaserButton(entity me)
 {
-	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser"));
+	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser") || (cvar_string("g_weaponarena") == "most"));
 	// run the old function
 	me.draw_weaponarena(me);
 }

Modified: branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc	2009-04-02 08:49:10 UTC (rev 6407)
+++ branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc	2009-04-02 09:18:38 UTC (rev 6408)
@@ -242,7 +242,10 @@
 	wp.health = lifetime;
 	wp.exteriormodeltoclient = ref;
 	if(ref)
+	{
 		wp.view_ofs = ofs;
+		setorigin(wp, ref.origin + ofs);
+	}
 	else
 		setorigin(wp, ofs);
 	wp.enemy = showto;