From b8da484ad41b24635d5f1dba60775113cdb149e6 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 18 Dec 2009 10:34:31 +0000
Subject: [PATCH] also new: SKINCOLOR_BACKGROUND

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8403 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/menu/menu.qc                | 3 +--
 data/qcsrc/menu/nexuiz/cvarlist.c      | 6 ++++++
 data/qcsrc/menu/nexuiz/skinlist.c      | 1 +
 data/qcsrc/menu/skin-customizables.inc | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/qcsrc/menu/menu.qc b/data/qcsrc/menu/menu.qc
index 4dc92b2bc..5abc84804 100644
--- a/data/qcsrc/menu/menu.qc
+++ b/data/qcsrc/menu/menu.qc
@@ -234,8 +234,6 @@ void(string img, float a, string algn, float force1) drawBackground =
 	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 @@ void() m_draw =
 		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)
diff --git a/data/qcsrc/menu/nexuiz/cvarlist.c b/data/qcsrc/menu/nexuiz/cvarlist.c
index f2ca75dd3..885b044c2 100644
--- a/data/qcsrc/menu/nexuiz/cvarlist.c
+++ b/data/qcsrc/menu/nexuiz/cvarlist.c
@@ -6,6 +6,8 @@ CLASS(NexuizCvarList) EXTENDS(NexuizListBox)
 	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 @@ void configureNexuizCvarListNexuizCvarList(entity me)
 	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;
diff --git a/data/qcsrc/menu/nexuiz/skinlist.c b/data/qcsrc/menu/nexuiz/skinlist.c
index c88fabc3c..8ce8fabde 100644
--- a/data/qcsrc/menu/nexuiz/skinlist.c
+++ b/data/qcsrc/menu/nexuiz/skinlist.c
@@ -119,6 +119,7 @@ void getSkinsNexuizSkinList(entity me)
 			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);
diff --git a/data/qcsrc/menu/skin-customizables.inc b/data/qcsrc/menu/skin-customizables.inc
index 39828f028..c3320e503 100644
--- a/data/qcsrc/menu/skin-customizables.inc
+++ b/data/qcsrc/menu/skin-customizables.inc
@@ -81,6 +81,7 @@ SKINBEGIN
 	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
-- 
2.39.2