r5131 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Nov 27 15:25:16 EST 2008
Author: div0
Date: 2008-11-27 15:25:15 -0500 (Thu, 27 Nov 2008)
New Revision: 5131
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorbutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/crosshairbutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/playermodel.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider_decibels.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
r5128 | div0 | 2008-11-27 19:20:49 +0100 (Thu, 27 Nov 2008) | 2 lines
call the WC helper for assault and onslaught (although its results are not used). Makes sure the worldstatus is always set.
r5129 | div0 | 2008-11-27 19:58:45 +0100 (Thu, 27 Nov 2008) | 3 lines
fix loadCvars for cvar-less controls
r5130 | div0 | 2008-11-27 20:01:00 +0100 (Thu, 27 Nov 2008) | 2 lines
oops, this was wrong
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/.patchsets 2008-11-27 20:25:15 UTC (rev 5131)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5126
+revisions_applied = 1-5130
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -79,12 +79,19 @@
void loadCvarsNexuizCheckBox(entity me)
{
float m, d;
+
+ if not(me.cvarName)
+ return;
+
m = (me.yesValue + me.noValue) * 0.5;
d = (cvar(me.cvarName) - m) / (me.yesValue - m);
me.checked = (d > 0);
}
void saveCvarsNexuizCheckBox(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.checked)
cvar_set(me.cvarName, ftos(me.yesValue));
else
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorbutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorbutton.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/colorbutton.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -46,6 +46,9 @@
}
void loadCvarsNexuizColorButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.cvarPart == 1)
me.checked = (cvar(me.cvarName) & 240) == me.cvarValueFloat * 16;
else
@@ -53,6 +56,9 @@
}
void saveCvarsNexuizColorButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.checked)
{
if(me.cvarPart == 1)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/crosshairbutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/crosshairbutton.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/crosshairbutton.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -43,10 +43,16 @@
}
void loadCvarsNexuizCrosshairButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
me.checked = (cvar(me.cvarName) == me.cvarValueFloat);
}
void saveCvarsNexuizCrosshairButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.checked)
cvar_set(me.cvarName, ftos(me.cvarValueFloat));
// TODO on an apply button, read _cl_color and execute the color command for it
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 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -104,14 +104,15 @@
void saveCvarsLaserWeaponArenaWeaponButton(entity me)
{
string suffix;
+
suffix = "";
if(me.cvarValue != "laser")
if(cvar("menu_weaponarena_with_laser"))
suffix = " laser";
if(me.checked)
- cvar_set(me.cvarName, strcat(me.cvarValue, suffix));
+ cvar_set("g_weaponarena", strcat(me.cvarValue, suffix));
else
- cvar_set(me.cvarName, me.cvarOffValue);
+ cvar_set("g_weaponarena", me.cvarOffValue);
}
.void(entity) draw_weaponarena;
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -52,10 +52,16 @@
}
void loadCvarsNexuizGametypeButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
me.checked = cvar(me.cvarName);
}
void saveCvarsNexuizGametypeButton(entity me)
{
+ if not(me.cvarName)
+ return;
+
cvar_set(me.cvarName, ftos(me.checked));
}
void GameTypeButton_Click(entity me, entity other)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -45,8 +45,7 @@
}
void focusLeaveNexuizInputBox(entity me)
{
- if(me.cvarName)
- me.saveCvars(me);
+ me.saveCvars(me);
}
void setTextNexuizInputBox(entity me, string new)
{
@@ -60,10 +59,14 @@
}
void loadCvarsNexuizInputBox(entity me)
{
+ if not(me.cvarName)
+ return;
setTextInputBox(me, cvar_string(me.cvarName));
}
void saveCvarsNexuizInputBox(entity me)
{
+ if not(me.cvarName)
+ return;
cvar_set(me.cvarName, me.text);
}
float keyDownNexuizInputBox(entity me, float key, float ascii, float shift)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -34,7 +34,6 @@
ATTRIB(NexuizMapList, startButton, entity, NULL)
- ATTRIB(NexuizMapList, cvarName, string, "dummy")
METHOD(NexuizMapList, loadCvars, void(entity))
ATTRIB(NexuizMapList, typeToSearchString, string, string_null)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/playermodel.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/playermodel.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/playermodel.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -11,7 +11,6 @@
ATTRIB(NexuizPlayerModelSelector, currentModelTitle, string, string_null)
ATTRIB(NexuizPlayerModelSelector, currentModelTxtName, string, string_null)
ATTRIB(NexuizPlayerModelSelector, currentModelDescription, string, string_null)
- ATTRIB(NexuizPlayerModelSelector, cvarName, string, "_cl_playermodel")
METHOD(NexuizPlayerModelSelector, go, void(entity, float))
ATTRIB(NexuizPlayerModelSelector, origin, vector, '0 0 0')
ATTRIB(NexuizPlayerModelSelector, size, vector, '0 0 0')
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -51,7 +51,10 @@
void loadCvarsNexuizRadioButton(entity me)
{
if(me.cvarValue)
- me.checked = (cvar_string(me.cvarName) == me.cvarValue);
+ {
+ if(me.cvarName)
+ me.checked = (cvar_string(me.cvarName) == me.cvarValue);
+ }
else
{
if(me.cvarName)
@@ -91,10 +94,13 @@
{
if(me.cvarValue)
{
- if(me.checked)
- cvar_set(me.cvarName, me.cvarValue);
- else if(me.cvarOffValue)
- cvar_set(me.cvarName, me.cvarOffValue);
+ if(me.cvarName)
+ {
+ if(me.checked)
+ cvar_set(me.cvarName, me.cvarValue);
+ else if(me.cvarOffValue)
+ cvar_set(me.cvarName, me.cvarOffValue);
+ }
}
else
{
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -57,10 +57,16 @@
}
void loadCvarsNexuizSlider(entity me)
{
+ if not(me.cvarName)
+ return;
+
me.value = cvar(me.cvarName);
}
void saveCvarsNexuizSlider(entity me)
{
+ if not(me.cvarName)
+ return;
+
cvar_set(me.cvarName, ftos(me.value));
}
#endif
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider_decibels.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider_decibels.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider_decibels.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -58,6 +58,10 @@
void loadCvarsNexuizDecibelsSlider(entity me)
{
float v;
+
+ if not(me.cvarName)
+ return;
+
v = cvar(me.cvarName);
if(v >= 0.98)
me.value = 0;
@@ -68,6 +72,9 @@
}
void saveCvarsNexuizDecibelsSlider(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.value >= -0.1)
cvar_set(me.cvarName, "1");
if(me.value < -33)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c 2008-11-27 20:25:15 UTC (rev 5131)
@@ -49,10 +49,16 @@
}
void loadCvarsNexuizTextSlider(entity me)
{
+ if not(me.cvarName)
+ return;
+
me.setValueFromIdentifier(me, cvar_string(me.cvarName));
}
void saveCvarsNexuizTextSlider(entity me)
{
+ if not(me.cvarName)
+ return;
+
if(me.value >= 0 && me.value < me.nValues)
cvar_set(me.cvarName, me.getIdentifier(me));
}
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc 2008-11-27 20:25:15 UTC (rev 5131)
@@ -9,12 +9,12 @@
}
void saveCvarsOf(entity ignore, entity e)
{
- if(e.cvarName)
+ if(e.saveCvars)
e.saveCvars(e);
}
void loadCvarsOf(entity ignore, entity e)
{
- if(e.cvarName)
+ if(e.loadCvars)
e.loadCvars(e);
}
void saveAllCvars(entity root)
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2008-11-27 19:01:00 UTC (rev 5130)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2008-11-27 20:25:15 UTC (rev 5131)
@@ -1198,6 +1198,9 @@
{
entity head;
local float t1, t2, t3, t4;
+
+ WinningConditionHelper(); // set worldstatus
+
// first check if the game has ended
t1 = t2 = t3 = t4 = 0;
head = find(world, classname, "onslaught_generator");
@@ -1252,8 +1255,10 @@
float WinningCondition_Assault()
{
local float status;
+
+ WinningConditionHelper(); // set worldstatus
+
status = WINNING_NO;
-
// as the timelimit has not yet passed just assume the defending team will win
if(assault_attacker_team == COLOR_TEAM1)
{
More information about the nexuiz-commits
mailing list