r2915 - in trunk/data/qcsrc/menu-div0test: item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 7 08:23:07 EST 2007
Author: div0
Date: 2007-11-07 08:23:07 -0500 (Wed, 07 Nov 2007)
New Revision: 2915
Modified:
trunk/data/qcsrc/menu-div0test/item/button.c
trunk/data/qcsrc/menu-div0test/item/container.c
trunk/data/qcsrc/menu-div0test/item/dialog.c
trunk/data/qcsrc/menu-div0test/item/inputcontainer.c
trunk/data/qcsrc/menu-div0test/item/nexposee.c
trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
Log:
use if not( instead of if(!, thanks to Spike
Modified: trunk/data/qcsrc/menu-div0test/item/button.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/button.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/item/button.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -71,7 +71,7 @@
me.mouseDrag(me, pos); // verify coordinates
if(me.pressed)
{
- if(!me.disabled)
+ if not(me.disabled)
me.onClick(me, me.onClickEntity);
me.pressed = 0;
}
@@ -137,7 +137,7 @@
if(me.clickTime > 0 && me.clickTime < frametime)
{
// keyboard click timer expired? Fire the event then.
- if(!me.disabled)
+ if not(me.disabled)
me.onClick(me, me.onClickEntity);
}
me.clickTime -= frametime;
Modified: trunk/data/qcsrc/menu-div0test/item/container.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/container.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/item/container.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -48,7 +48,7 @@
void hideNotifyContainer(entity me)
{
entity e;
- if(!me.shown)
+ if not(me.shown)
return;
me.shown = 0;
for(e = me.firstChild; e; e = e.nextSibling)
@@ -136,7 +136,7 @@
{
if(e.focusable)
me.focusable += 1;
- if(!e.Container_alpha)
+ if not(e.Container_alpha)
continue;
draw_shift = boxToGlobal(e.Container_origin, oldshift, oldscale);
draw_scale = boxToGlobalSize(e.Container_size, oldscale);
@@ -281,7 +281,7 @@
void setFocusContainer(entity me, entity other)
{
if(other)
- if(!me.focused)
+ if not(me.focused)
error("Trying to set focus in a non-focused control!");
if(me.focusedChild == other)
return;
Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -116,7 +116,7 @@
frame.configureBorderImage(frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.titleHeight);
me.addItem(me, frame, '0 0 0', '1 1 0', 1);
- if(!me.titleFontSize)
+ if not(me.titleFontSize)
me.titleHeight = 0; // no title bar
absWidth = me.intendedWidth * cvar("vid_conwidth");
Modified: trunk/data/qcsrc/menu-div0test/item/inputcontainer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/inputcontainer.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/item/inputcontainer.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -54,7 +54,7 @@
{
for(ff = f.prevSibling; ff; ff = ff.prevSibling)
{
- if(!ff.focusable)
+ if not(ff.focusable)
continue;
me.setFocus(me, ff);
return 1;
@@ -64,7 +64,7 @@
{
for(ff = me.lastChild; ff; ff = ff.prevSibling)
{
- if(!ff.focusable)
+ if not(ff.focusable)
continue;
me.setFocus(me, ff);
return 1;
@@ -78,7 +78,7 @@
{
for(ff = f.nextSibling; ff; ff = ff.nextSibling)
{
- if(!ff.focusable)
+ if not(ff.focusable)
continue;
me.setFocus(me, ff);
return 1;
@@ -88,7 +88,7 @@
{
for(ff = me.firstChild; ff; ff = ff.nextSibling)
{
- if(!ff.focusable)
+ if not(ff.focusable)
continue;
me.setFocus(me, ff);
return 1;
@@ -106,7 +106,7 @@
e = me.mouseFocusedChild;
ne = me.itemFromPoint(me, pos);
if(ne)
- if(!ne.focusable)
+ if not(ne.focusable)
ne = NULL;
me.mouseFocusedChild = ne;
if(ne)
Modified: trunk/data/qcsrc/menu-div0test/item/nexposee.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/nexposee.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/item/nexposee.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -208,7 +208,7 @@
}
else if(me.animationState == 2)
{
- if(!mousePressContainer(me, pos))
+ if not(mousePressContainer(me, pos))
{
me.animationState = 3;
setFocusContainer(me, NULL);
@@ -271,14 +271,14 @@
{
if(me.selectedChild)
me.selectedChild = me.selectedChild.prevSibling;
- if(!me.selectedChild)
+ if not(me.selectedChild)
me.selectedChild = me.lastChild;
}
else
{
if(me.selectedChild)
me.selectedChild = me.selectedChild.nextSibling;
- if(!me.selectedChild)
+ if not(me.selectedChild)
me.selectedChild = me.firstChild;
}
}
@@ -309,7 +309,7 @@
}
if(me.focusedChild)
me.selectedChild = me.focusedChild;
- if(!me.selectedChild)
+ if not(me.selectedChild)
me.animationState = 0;
setFocusContainer(me, NULL);
return 1;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c 2007-11-06 22:34:13 UTC (rev 2914)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c 2007-11-07 13:23:07 UTC (rev 2915)
@@ -234,7 +234,7 @@
if(gethostcachenumber(SLIST_FIELD_NUMPLAYERS, i) >= gethostcachenumber(SLIST_FIELD_MAXPLAYERS, i))
theAlpha = 0.2;
- else if(!gethostcachenumber(SLIST_FIELD_NUMHUMANS, i))
+ else if not(gethostcachenumber(SLIST_FIELD_NUMHUMANS, i))
theAlpha = 0.5;
else
theAlpha = 1;
More information about the nexuiz-commits
mailing list