From: Sfan5 <sfan5@live.de>
Date: Sun, 7 Jul 2013 17:54:38 +0000 (+0200)
Subject: Fix parseColor, change remaining colorkeys to new format, fix Contributor list
X-Git-Tag: 0.4.8~339
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7e73b7cae9faf203e369dc5cf2b85cff6e6efbad;p=oweals%2Fminetest.git

Fix parseColor, change remaining colorkeys to new format, fix Contributor list
---

diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua
index 12747c8c9..c3808e7b9 100644
--- a/builtin/mainmenu.lua
+++ b/builtin/mainmenu.lua
@@ -1063,7 +1063,7 @@ function tabbuilder.tab_credits()
 			"label[0.5,3.3;http://minetest.net]" .. 
 			"image[0.5,1;" .. menu.basetexturedir .. "logo.png]" ..
 			"textlist[3.5,-0.25;8.5,5.8;list_credits;" ..
-			"#YLWCore Developers," ..
+			"#FFFF00Core Developers," ..
 			"Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
 			"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
 			"PilzAdam <pilzadam@minetest.net>," ..
@@ -1074,17 +1074,17 @@ function tabbuilder.tab_credits()
 			"sfan5 <sfan5@live.de>,"..
 			"kahrl <kahrl@gmx.net>,"..
 			","..
-			"#YLWActive Contributors," ..
+			"#FFFF00Active Contributors," ..
 			"sapier,"..
 			"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
 			"Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
 			"Jeija <jeija@mesecons.net>,"..
 			"MirceaKitsune <mirceakitsune@gmail.com>,"..
-			"ShadowNinja"..
-			"dannydark <the_skeleton_of_a_child@yahoo.co.uk>"..
+			"ShadowNinja,"..
+			"dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
 			"0gb.us <0gb.us@0gb.us>,"..
 			"," ..
-			"#YLWPrevious Contributors," ..
+			"#FFFF00Previous Contributors," ..
 			"Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
 			"Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
 			"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
diff --git a/builtin/modmgr.lua b/builtin/modmgr.lua
index 1cb4b3922..045b52985 100644
--- a/builtin/modmgr.lua
+++ b/builtin/modmgr.lua
@@ -365,7 +365,7 @@ function modmgr.render_worldmodlist()
 		local parts = modmgr.global_mods[i]:split(DIR_DELIM)
 		local shortname = parts[#parts]
 		if modmgr.worldconfig.global_mods[shortname] then
-			retval = retval .. "#GRN" .. modmgr.global_mods[i] .. ","
+			retval = retval .. "#22F922" .. modmgr.global_mods[i] .. ","
 		else
 			retval = retval .. modmgr.global_mods[i] .. ","
 		end
@@ -379,7 +379,7 @@ function modmgr.render_gamemodlist()
 	local retval = ""
 	for i=1,#modmgr.worldconfig.game_mods,1 do
 		retval = retval ..
-			"#BLU" .. modmgr.worldconfig.game_mods[i] .. ","
+			"#0000FF" .. modmgr.worldconfig.game_mods[i] .. ","
 	end
 	
 	return retval
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 3a3a9433e..994730619 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -662,7 +662,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element) {
 					e->addItem(narrow_to_wide(items[i]).c_str() +1);
 				}
 				else {
-					std::wstring toadd = narrow_to_wide(items[i].c_str() + 4);
+					std::wstring toadd = narrow_to_wide(items[i].c_str() + 7);
 					std::string color = items[i].substr(1,6);
 
 					e->addItem(toadd.c_str());
@@ -2519,19 +2519,15 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 bool GUIFormSpecMenu::parseColor(std::string color, irr::video::SColor& outcolor) {
 	outcolor = irr::video::SColor(0,0,0,0);
 
-	if(color.size() != 6) return false;
-	if(!string_allowed(color, "0123456789abcdefABCDEF")) return false;
+	if(!string_allowed(color, "0123456789abcdefABCDEF"))
+		return false;
 
-	unsigned int r, g, b;
-	std::istringstream iss("");
-	iss.str(color.substr(0, 1));
-	iss >> std::hex >> r;
-	iss.str(color.substr(2, 1));
-	iss >> std::hex >> g;
-	iss.str(color.substr(4, 1));
-	iss >> std::hex >> b;
+	u32 color_value;
+	std::istringstream iss(color);
+	iss >> std::hex >> color_value;
+	outcolor = irr::video::SColor(color_value);
 
-	outcolor = irr::video::SColor(255,r,g,b);
+	outcolor.setAlpha(255);
 	return true;
 }