r2906 - in trunk/data/qcsrc/menu-div0test: . item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Nov 5 04:46:44 EST 2007
Author: div0
Date: 2007-11-05 04:46:39 -0500 (Mon, 05 Nov 2007)
New Revision: 2906
Modified:
trunk/data/qcsrc/menu-div0test/item/listbox.c
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/menu.qh
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
Log:
add global "time" as in QC (to allow double click detection later); clean up warnings
Modified: trunk/data/qcsrc/menu-div0test/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/listbox.c 2007-11-04 22:23:43 UTC (rev 2905)
+++ trunk/data/qcsrc/menu-div0test/item/listbox.c 2007-11-05 09:46:39 UTC (rev 2906)
@@ -75,7 +75,6 @@
float mouseDragListBox(entity me, vector pos)
{
float hit;
- float v;
me.updateControlTopBottom(me);
me.dragScrollPos = pos;
if(me.pressed == 1)
@@ -147,7 +146,7 @@
}
float mouseReleaseListBox(entity me, vector pos)
{
- vector absSize, clickOrigin;
+ vector absSize;
if(me.pressed == 1)
{
// slider dragging mode
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-04 22:23:43 UTC (rev 2905)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-05 09:46:39 UTC (rev 2906)
@@ -93,6 +93,7 @@
t = gettime();
realFrametime = frametime = min(0.2, t - menuPrevTime);
menuPrevTime = t;
+ time += frametime;
if(Menu_Active)
if(getkeydest() != KEY_MENU || getmousetarget() != MT_MENU)
Modified: trunk/data/qcsrc/menu-div0test/menu.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qh 2007-11-04 22:23:43 UTC (rev 2905)
+++ trunk/data/qcsrc/menu-div0test/menu.qh 2007-11-05 09:46:39 UTC (rev 2906)
@@ -23,6 +23,7 @@
const float S_ALT = 4;
float frametime;
+float time;
entity main;
void m_hide();
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c 2007-11-04 22:23:43 UTC (rev 2905)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c 2007-11-05 09:46:39 UTC (rev 2906)
@@ -27,7 +27,6 @@
void fillNexuizAudioSettingsTab(entity me)
{
entity e;
- float i;
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Music Volume:"));
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2007-11-04 22:23:43 UTC (rev 2905)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2007-11-05 09:46:39 UTC (rev 2906)
@@ -16,7 +16,7 @@
void configureMainWindowMainWindow(entity me)
{
- entity dlg, n, i, b, c, mc, t1, t2, t3, cb;
+ entity dlg, n, i, b, c, mc, t1, t2, t3;
n = spawnNexuizNexposee();
me.addItem(me, n, '0 0 0', '1 1 0', 1);
More information about the nexuiz-commits
mailing list