r3161 - in trunk/data/qcsrc/menu-div0test: . nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 17 04:16:34 EST 2008
Author: div0
Date: 2008-01-17 04:16:27 -0500 (Thu, 17 Jan 2008)
New Revision: 3161
Modified:
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/menu.qh
trunk/data/qcsrc/menu-div0test/nexuiz/campaign.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer_winner.c
trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
Log:
fix some warnings, move some Nexuiz specific stuff out of menu.qc. Untested.
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-17 09:16:27 UTC (rev 3161)
@@ -12,12 +12,9 @@
float menuAlpha;
float menuLogoAlpha;
float prevMenuAlpha;
-float menuLoadedMaplist;
+float menuInitialized;
float menuNotTheFirstFrame;
-string campaign_name_previous;
-float campaign_won_previous;
-
void SUB_Null() { };
void() m_init =
@@ -59,12 +56,10 @@
dprint_load();
- menuLoadedMaplist = 0;
- MapInfo_Enumerate();
- if(!MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 1))
+ menuInitialized = 0;
+ if(!preMenuInit())
return;
- menuLoadedMaplist = 1;
-
+ menuInitialized = 1;
GameCommand_Init();
fh = -1;
@@ -101,7 +96,7 @@
void(float key, float ascii) m_keyup =
{
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
return;
if(!Menu_Active)
return;
@@ -125,7 +120,7 @@
void(float key, float ascii) m_keydown =
{
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
return;
if(!Menu_Active)
return;
@@ -179,7 +174,7 @@
menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading
}
}
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
{
// TODO draw an info image about this situation
m_init_delayed();
@@ -191,28 +186,7 @@
menuPrevTime = t;
time += frametime;
- if not(campaign_name_previous)
- campaign_name_previous = strzone(strcat(campaign_name, "x")); // force unequal
- if(campaign_name == campaign_name_previous)
- {
- if(cvar(strcat("g_campaign", campaign_name, "_won")))
- {
- if(!campaign_won_previous)
- {
- m_display();
- DialogOpenButton_Click_withCoords(NULL, main.winnerDialog, '0 0 0', '1 1 0');
- }
- campaign_won_previous = 1;
- }
- else
- campaign_won_previous = 0;
- }
- else
- {
- strunzone(campaign_name_previous);
- campaign_name_previous = strzone(campaign_name);
- campaign_won_previous = cvar(strcat("g_campaign", campaign_name, "_won"));
- }
+ preMenuDraw();
if(Menu_Active)
{
@@ -322,7 +296,7 @@
setkeydest(KEY_MENU);
setmousetarget(MT_MENU);
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
return;
if(mouseButtonsPressed)
@@ -339,7 +313,7 @@
setkeydest(KEY_GAME);
setmousetarget(MT_CLIENT);
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
return;
main.focusLeave(main);
@@ -362,7 +336,7 @@
void(string itemname) m_goto =
{
entity e;
- if(!menuLoadedMaplist)
+ if(!menuInitialized)
return;
if(itemname == "") // this can be called by GameCommand
{
Modified: trunk/data/qcsrc/menu-div0test/menu.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qh 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/menu.qh 2008-01-17 09:16:27 UTC (rev 3161)
@@ -42,3 +42,6 @@
float conwidth, conheight; // "virtual" conwidth/height values for other stuff to assume for scaling
void SUB_Null();
+
+float preMenuInit(); // you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded.
+void preMenuDraw(); // this is run before the menu is drawn. You may put some stuff there that has to be done every frame.
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/campaign.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/campaign.c 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/campaign.c 2008-01-17 09:16:27 UTC (rev 3161)
@@ -188,7 +188,6 @@
float p;
vector theColor;
float theAlpha;
- float done;
float j, n;
vector o;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c 2008-01-17 09:16:27 UTC (rev 3161)
@@ -13,8 +13,7 @@
#ifdef IMPLEMENTATION
void fillNexuizSingleplayerDialog(entity me)
{
- entity e, e0;
- float n;
+ entity e;
me.TR(me);
me.TDempty(me, (me.columns - 2) / 2);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer_winner.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer_winner.c 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer_winner.c 2008-01-17 09:16:27 UTC (rev 3161)
@@ -12,7 +12,7 @@
#ifdef IMPLEMENTATION
void fillNexuizWinnerDialog(entity me)
{
- entity mc, e;
+ entity e;
me.TR(me);
me.TD(me, me.rows - 2, me.columns, e = makeNexuizImage("/gfx/winner", 1.0));
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/util.qc 2008-01-17 09:10:30 UTC (rev 3160)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/util.qc 2008-01-17 09:16:27 UTC (rev 3161)
@@ -92,3 +92,40 @@
e.draw = setDependent_Draw;
setDependent_Check(e);
}
+
+float preMenuInit()
+{
+ MapInfo_Enumerate();
+ if(!MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 1))
+ return FALSE;
+ return TRUE;
+}
+
+string campaign_name_previous;
+float campaign_won_previous;
+void preMenuDraw()
+{
+ if not(campaign_name_previous)
+ campaign_name_previous = strzone(strcat(campaign_name, "x")); // force unequal
+ if(campaign_name == campaign_name_previous)
+ {
+ if(cvar(strcat("g_campaign", campaign_name, "_won")))
+ {
+ if(!campaign_won_previous)
+ {
+ m_display();
+ DialogOpenButton_Click_withCoords(NULL, main.winnerDialog, '0 0 0', '1 1 0');
+ }
+ campaign_won_previous = 1;
+ }
+ else
+ campaign_won_previous = 0;
+ }
+ else
+ {
+ strunzone(campaign_name_previous);
+ campaign_name_previous = strzone(campaign_name);
+ campaign_won_previous = cvar(strcat("g_campaign", campaign_name, "_won"));
+ }
+
+}
More information about the nexuiz-commits
mailing list