r2916 - in trunk/data/qcsrc/menu-div0test: . item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 7 08:30:04 EST 2007
Author: div0
Date: 2007-11-07 08:30:04 -0500 (Wed, 07 Nov 2007)
New Revision: 2916
Modified:
trunk/data/qcsrc/menu-div0test/item.c
trunk/data/qcsrc/menu-div0test/item/borderimage.c
trunk/data/qcsrc/menu-div0test/item/button.c
trunk/data/qcsrc/menu-div0test/item/checkbox.c
trunk/data/qcsrc/menu-div0test/item/dialog.c
trunk/data/qcsrc/menu-div0test/item/image.c
trunk/data/qcsrc/menu-div0test/item/listbox.c
trunk/data/qcsrc/menu-div0test/item/slider.c
trunk/data/qcsrc/menu-div0test/item/tab.c
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c
trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_video.c
trunk/data/qcsrc/menu-div0test/nexuiz/nexposee.c
trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c
trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c
trunk/data/qcsrc/menu-div0test/nexuiz/slider.c
trunk/data/qcsrc/menu-div0test/nexuiz/tab.c
trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c
trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
Log:
change "" references and tests to string_null whereever possible
Modified: trunk/data/qcsrc/menu-div0test/item/borderimage.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/borderimage.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/borderimage.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -3,7 +3,7 @@
METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float))
METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector))
METHOD(BorderImage, draw, void(entity))
- ATTRIB(BorderImage, src, string, "")
+ ATTRIB(BorderImage, src, string, string_null)
ATTRIB(BorderImage, borderHeight, float, 0)
ATTRIB(BorderImage, borderVec, vector, '0 0 0')
ATTRIB(BorderImage, color, vector, '1 1 1')
@@ -35,7 +35,7 @@
void drawBorderImage(entity me)
{
//print(vtos(me.borderVec), "\n");
- if(me.src != "")
+ if(me.src)
draw_BorderPicture('0 0 0', me.src, '1 1 0', me.color, 1, me.borderVec);
if(me.fontSize > 0)
drawLabel(me);
Modified: trunk/data/qcsrc/menu-div0test/item/button.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/button.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/button.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -11,7 +11,7 @@
ATTRIB(Button, onClick, void(entity, entity), SUB_Null)
ATTRIB(Button, onClickEntity, entity, NULL)
ATTRIB(Button, src, string, string_null)
- ATTRIB(Button, srcSuffix, string, "")
+ ATTRIB(Button, srcSuffix, string, string_null)
ATTRIB(Button, src2, string, string_null) // is centered, same aspect, and stretched to label size
ATTRIB(Button, srcMulti, float, 1) // 0: button square left, text right; 1: button stretched, text over it
ATTRIB(Button, buttonLeftOfText, float, 0)
Modified: trunk/data/qcsrc/menu-div0test/item/checkbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/checkbox.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/checkbox.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -41,7 +41,7 @@
s = me.pressed;
if(me.useDownAsChecked)
{
- me.srcSuffix = "";
+ me.srcSuffix = string_null;
me.forcePressed = me.checked;
}
else
Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -55,8 +55,8 @@
ATTRIB(Dialog, titleHeight, float, 0) // pixels
ATTRIB(Dialog, titleFontSize, float, 0) // pixels; if 0, title causes no margin
- ATTRIB(Dialog, backgroundImage, string, "")
- ATTRIB(Dialog, closeButtonImage, string, "")
+ ATTRIB(Dialog, backgroundImage, string, string_null)
+ ATTRIB(Dialog, closeButtonImage, string, string_null)
ENDCLASS(Dialog)
#endif
Modified: trunk/data/qcsrc/menu-div0test/item/image.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/image.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/image.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -3,7 +3,7 @@
METHOD(Image, configureImage, void(entity, string))
METHOD(Image, draw, void(entity))
METHOD(Image, toString, string(entity))
- ATTRIB(Image, src, string, "")
+ ATTRIB(Image, src, string, string_null)
ENDCLASS(Image)
#endif
Modified: trunk/data/qcsrc/menu-div0test/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/listbox.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/listbox.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -22,7 +22,7 @@
ATTRIB(ListBox, dragScrollTimer, float, 0)
ATTRIB(ListBox, dragScrollPos, vector, '0 0 0')
- ATTRIB(ListBox, src, string, "") // scrollbar
+ ATTRIB(ListBox, src, string, string_null) // scrollbar
ATTRIB(ListBox, tolerance, vector, '0 0 0') // drag tolerance
ATTRIB(ListBox, scrollbarWidth, float, 0) // pixels
ATTRIB(ListBox, nItems, float, 42)
Modified: trunk/data/qcsrc/menu-div0test/item/slider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/slider.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/slider.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -14,7 +14,7 @@
METHOD(Slider, toString, string(entity))
METHOD(Slider, setValue, void(entity, float))
METHOD(Slider, showNotify, void(entity))
- ATTRIB(Slider, src, string, "")
+ ATTRIB(Slider, src, string, string_null)
ATTRIB(Slider, focusable, float, 1)
ATTRIB(Slider, value, float, 0)
ATTRIB(Slider, valueMin, float, 0)
@@ -53,7 +53,7 @@
}
void configureSliderVisualsSlider(entity me, float sz, float theAlign, float theTextSpace, string gfx)
{
- configureLabelLabel(me, "", sz, theAlign);
+ configureLabelLabel(me, string_null, sz, theAlign);
me.textSpace = theTextSpace;
me.keepspaceLeft = (theTextSpace == 0) ? 0 : (1 - theTextSpace);
me.src = gfx;
@@ -208,6 +208,6 @@
}
me.setText(me, me.valueToText(me, me.value));
drawLabel(me);
- me.text = ""; // TEMPSTRING!
+ me.text = string_null; // TEMPSTRING!
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/item/tab.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/tab.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item/tab.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -3,7 +3,7 @@
ATTRIB(Tab, isTabRoot, float, 0)
ATTRIB(Tab, closable, float, 0)
ATTRIB(Tab, rootDialog, float, 0)
- ATTRIB(Tab, title, string, "")
+ ATTRIB(Tab, title, string, string_null)
ATTRIB(Tab, titleFontSize, float, 0) // pixels
// still to be customized
@@ -20,7 +20,7 @@
ATTRIB(Tab, rowHeight, float, 0) // pixels
ATTRIB(Tab, titleHeight, float, 0) // pixels
- ATTRIB(Tab, backgroundImage, string, "")
+ ATTRIB(Tab, backgroundImage, string, string_null)
ENDCLASS(Tab)
#endif
Modified: trunk/data/qcsrc/menu-div0test/item.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/item.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -84,6 +84,6 @@
string toStringItem(entity me)
{
- return "";
+ return string_null;
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-07 13:30:04 UTC (rev 2916)
@@ -186,7 +186,7 @@
void(string itemname) m_goto =
{
entity e;
- if(itemname == "")
+ if(itemname == "") // this can be called by GameCommand
{
m_hide();
}
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -25,7 +25,7 @@
{
me.inverted = isInverted;
me.checked = 0;
- if(theCvar != "")
+ if(theCvar)
{
me.cvarName = theCvar;
me.loadCvars(me);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -7,7 +7,7 @@
#ifdef INTERFACE
CLASS(NexuizCommandButton) EXTENDS(NexuizButton)
METHOD(NexuizCommandButton, configureNexuizCommandButton, void(entity, string, vector, string, float))
- ATTRIB(NexuizCommandButton, onClickCommand, string, "")
+ ATTRIB(NexuizCommandButton, onClickCommand, string, string_null)
ATTRIB(NexuizCommandButton, flags, float, 0)
ENDCLASS(NexuizCommandButton)
entity makeNexuizCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
@@ -30,7 +30,7 @@
//if(me.flags & COMMANDBUTTON_REVERT)
// loadAllCvars(me.parent);
if(me.flags & COMMANDBUTTON_CLOSE)
- m_goto("");
+ m_goto(string_null);
}
void configureNexuizCommandButtonNexuizCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -27,10 +27,10 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Filter:"));
me.TR(me);
- me.TD(me, 1, 1, slist.sortButton1 = makeNexuizButton("", '0 0 0'));
- me.TD(me, 1, 1, slist.sortButton2 = makeNexuizButton("", '0 0 0'));
- me.TD(me, 1, 1, slist.sortButton3 = makeNexuizButton("", '0 0 0'));
- me.TD(me, 1, 1, slist.sortButton4 = makeNexuizButton("", '0 0 0'));
+ me.TD(me, 1, 1, slist.sortButton1 = makeNexuizButton(string_null, '0 0 0'));
+ me.TD(me, 1, 1, slist.sortButton2 = makeNexuizButton(string_null, '0 0 0'));
+ me.TD(me, 1, 1, slist.sortButton3 = makeNexuizButton(string_null, '0 0 0'));
+ me.TD(me, 1, 1, slist.sortButton4 = makeNexuizButton(string_null, '0 0 0'));
me.TR(me);
me.TD(me, me.rows - 3, me.columns, slist);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_video.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_video.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -54,7 +54,7 @@
e.configureNexuizTextSliderValues(e);
me.TR(me);
- if(cvar_defstring("apple_multithreadedgl") != "")
+ if(cvar_defstring("apple_multithreadedgl") != "") // FIXME can this check against string_null too?
me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "apple_multithreadedgl", "Disable multithreaded OpenGL"));
me.TR(me);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/nexposee.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/nexposee.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/nexposee.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -21,6 +21,6 @@
void closeNexuizNexposee(entity me)
{
- m_goto(""); // hide
+ m_goto(string_null); // hide
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -23,7 +23,7 @@
}
void configureNexuizRadioButtonNexuizRadioButton(entity me, float theGroup, string theCvar, string theValue, string theText)
{
- if(theCvar != "")
+ if(theCvar)
{
me.cvarName = theCvar;
me.cvarValue = theValue;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -16,6 +16,6 @@
#ifdef IMPLEMENTATION
void closeNexuizRootDialog(entity me)
{
- m_goto("");
+ m_goto(string_null);
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/slider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/slider.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/slider.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -33,7 +33,7 @@
vp *= 10;
me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image);
me.configureSliderValues(me, theValueMin, v, theValueMax, theValueStep, vk, vp);
- if(theCvar != "")
+ if(theCvar)
{
me.cvarName = theCvar;
me.loadCvars(me);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/tab.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/tab.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/tab.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -17,7 +17,7 @@
ATTRIB(NexuizTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
ATTRIB(NexuizTab, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE) // pixels
- ATTRIB(NexuizTab, backgroundImage, string, "")
+ ATTRIB(NexuizTab, backgroundImage, string, string_null)
ENDCLASS(NexuizTab)
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c 2007-11-07 13:30:04 UTC (rev 2916)
@@ -27,7 +27,7 @@
void configureNexuizTextSliderNexuizTextSlider(entity me, string theCvar)
{
me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image);
- if(theCvar != "")
+ if(theCvar)
me.cvarName = theCvar;
// don't load it yet
}
@@ -50,7 +50,7 @@
}
void configureNexuizTextSliderValuesNexuizTextSlider(entity me)
{
- me.configureTextSliderValues(me, "");
+ me.configureTextSliderValues(me, string_null);
me.loadCvars(me);
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/util.qc 2007-11-07 13:23:07 UTC (rev 2915)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/util.qc 2007-11-07 13:30:04 UTC (rev 2916)
@@ -42,7 +42,7 @@
e.disabled = ((f < e.cvarMin_setDependent) || (f > e.cvarMax_setDependent));
else
e.disabled = ((f >= e.cvarMax_setDependent) && (f <= e.cvarMin_setDependent));
- if(e.cvar2_setDependent != string_null)
+ if(e.cvar2_setDependent)
{
f = cvar(e.cvar2_setDependent);
if(e.cvar2Min_setDependent <= e.cvar2Max_setDependent)
More information about the nexuiz-commits
mailing list