r3175 - in trunk/data/qcsrc/menu-div0test: . nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-18 15:42:56 -0500 (Fri, 18 Jan 2008)
New Revision: 3175

Modified:
   trunk/data/qcsrc/menu-div0test/menu.qc
   trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
Log:
Info screen while mapinfo are generated


Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-18 20:31:45 UTC (rev 3174)
+++ trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-18 20:42:56 UTC (rev 3175)
@@ -51,7 +51,7 @@
 
 void() m_init_delayed =
 {
-	float fh;
+	float fh, glob, n, i;
 	string s;
 
 	dprint_load();
@@ -79,6 +79,15 @@
 			Skin_ApplySetting(argv(0), argv(1));
 	fclose(fh);
 
+	glob = search_begin(strcat(draw_currentSkin, "/*.tga"), TRUE, TRUE);
+	if(glob >= 0)
+	{
+		n = search_getsize(glob);
+		for(i = 0; i < n; ++i)
+			precache_pic(search_getfilename(glob, i));
+		search_end(glob);
+	}
+
 	draw_setMousePointer(SKINGFX_CURSOR, SKINSIZE_CURSOR, SKINOFFSET_CURSOR);
 
 	conwidth = conheight = -1;
@@ -164,6 +173,12 @@
 	if(main)
 		UpdateConWidthHeight();
 
+	if(!menuInitialized)
+	{
+		// TODO draw an info image about this situation
+		m_init_delayed();
+		return;
+	}
 	if(!menuNotTheFirstFrame)
 	{
 		menuNotTheFirstFrame = 1;
@@ -174,12 +189,6 @@
 			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading
 		}
 	}
-	if(!menuInitialized)
-	{
-		// TODO draw an info image about this situation
-		m_init_delayed();
-		return;
-	}
 
 	t = gettime();
 	realFrametime = frametime = min(0.2, t - menuPrevTime);

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/util.qc	2008-01-18 20:31:45 UTC (rev 3174)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/util.qc	2008-01-18 20:42:56 UTC (rev 3175)
@@ -154,11 +154,22 @@
 
 // END OF EXTRESPONSE SYSTEM /////////////////////////////////////////////////
 
+float nMenuInitDots;
 float preMenuInit()
 {
+	string s;
+	float i;
+
 	MapInfo_Enumerate();
 	if(!MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 1))
+	{
+		nMenuInitDots = nMenuInitDots + 1;
+		s = "Generating mapinfo..";
+		for(i = 0; i < nMenuInitDots; ++i)
+			s = strcat(s, ".");
+		drawstring('0 0 0', s, '8 8 0', '1 1 1', 1, 0);
 		return FALSE;
+	}
 	return TRUE;
 }