r3077 - trunk/data/qcsrc/menu-div0test
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Jan 1 17:44:31 EST 2008
Author: div0
Date: 2008-01-01 17:44:31 -0500 (Tue, 01 Jan 2008)
New Revision: 3077
Modified:
trunk/data/qcsrc/menu-div0test/menu.qc
Log:
minor menu fading display bug fix
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-01 22:37:00 UTC (rev 3076)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-01 22:44:31 UTC (rev 3077)
@@ -154,6 +154,15 @@
if(cvar("cl_capturevideo"))
frametime = 1 / cvar("cl_capturevideo_fps"); // make capturevideo work smoothly
+ dprint_load();
+ gamestatus = 0;
+ if(isserver())
+ gamestatus = gamestatus | GAME_ISSERVER;
+ if(clientstate() == CS_CONNECTED)
+ gamestatus = gamestatus | GAME_CONNECTED;
+ if(cvar("developer"))
+ gamestatus = gamestatus | GAME_DEVELOPER;
+
prevMenuAlpha = menuAlpha;
if(Menu_Active)
{
@@ -164,11 +173,14 @@
else
{
menuAlpha = min(1, menuAlpha + frametime * 5);
- menuLogoAlpha = 3;
+ menuLogoAlpha = 2;
}
}
else
+ {
menuAlpha = max(0, menuAlpha - frametime * 5);
+ menuLogoAlpha = 2;
+ }
draw_reset();
@@ -202,15 +214,6 @@
return;
}
- dprint_load();
- gamestatus = 0;
- if(isserver())
- gamestatus = gamestatus | GAME_ISSERVER;
- if(clientstate() == CS_CONNECTED)
- gamestatus = gamestatus | GAME_CONNECTED;
- if(cvar("developer"))
- gamestatus = gamestatus | GAME_DEVELOPER;
-
draw_alpha *= menuAlpha;
if(frametime > 0)
More information about the nexuiz-commits
mailing list