[nexuiz-commits] r8403 - in trunk/data/qcsrc/menu: . nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-18 05:34:31 -0500 (Fri, 18 Dec 2009)
New Revision: 8403

Modified:
   trunk/data/qcsrc/menu/menu.qc
   trunk/data/qcsrc/menu/nexuiz/cvarlist.c
   trunk/data/qcsrc/menu/nexuiz/skinlist.c
   trunk/data/qcsrc/menu/skin-customizables.inc
Log:
also new: SKINCOLOR_BACKGROUND


Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc	2009-12-18 10:26:12 UTC (rev 8402)
+++ trunk/data/qcsrc/menu/menu.qc	2009-12-18 10:34:31 UTC (rev 8403)
@@ -234,8 +234,6 @@
 	vector isz_h;
 	vector tl, ce, br, isz;
 	vector v;
-	string s;
-	string mode;
 	float i, l;
 	string c;
 	sz = draw_PictureSize(img);
@@ -617,6 +615,7 @@
 		if(menuLogoAlpha > 0)
 		{
 			draw_reset_full();
+			draw_Fill('0 0 0', '1 1 0', SKINCOLOR_BACKGROUND, 1);
 			drawBackground(SKINGFX_BACKGROUND, bound(0, menuLogoAlpha, 1), SKINALIGN_BACKGROUND, TRUE);
 			draw_reset_cropped();
 			if(menuAlpha <= 0 && SKINALPHA_CURSOR_INTRO > 0)

Modified: trunk/data/qcsrc/menu/nexuiz/cvarlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/cvarlist.c	2009-12-18 10:26:12 UTC (rev 8402)
+++ trunk/data/qcsrc/menu/nexuiz/cvarlist.c	2009-12-18 10:34:31 UTC (rev 8403)
@@ -6,6 +6,8 @@
 	METHOD(NexuizCvarList, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(NexuizCvarList, keyDown, float(entity, float, float, float))
 
+	METHOD(NexuizCvarList, destroy, void(entity))
+
 	ATTRIB(NexuizCvarList, realFontSize, vector, '0 0 0')
 	ATTRIB(NexuizCvarList, realUpperMargin, float, 0)
 	ATTRIB(NexuizCvarList, columnNameOrigin, float, 0)
@@ -49,6 +51,10 @@
 	buf_cvarlist(me.handle, "", "_");
 	me.nItems = buf_getsize(me.handle);
 }
+void destroyNexuizCvarList(entity me)
+{
+	buf_del(me.handle);
+}
 void setSelectedNexuizCvarList(entity me, float i)
 {
 	string s;

Modified: trunk/data/qcsrc/menu/nexuiz/skinlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/skinlist.c	2009-12-18 10:26:12 UTC (rev 8402)
+++ trunk/data/qcsrc/menu/nexuiz/skinlist.c	2009-12-18 10:34:31 UTC (rev 8403)
@@ -119,6 +119,7 @@
 			else if(substring(s, 0, 7) == "author ")
 				bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, substring(s, 7, strlen(s) - 7));
 		}
+		fclose(fh);
 	}
 
 	search_end(glob);

Modified: trunk/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu/skin-customizables.inc	2009-12-18 10:26:12 UTC (rev 8402)
+++ trunk/data/qcsrc/menu/skin-customizables.inc	2009-12-18 10:34:31 UTC (rev 8403)
@@ -81,6 +81,7 @@
 	SKINFLOAT(ALPHA_CURSOR_INTRO, 0);
 
 	// general
+	SKINVECTOR(COLOR_BACKGROUND, '0 0 0');
 	SKINSTRING(GFX_BACKGROUND, "background");
 	SKINSTRING(GFX_BACKGROUND_INGAME, "background_ingame");
 	// alignment string of num keys for orientations, or l = letterbox, c = crop, h = height, w = width, s = scale