Merge branch 'skin_fh' into skin

gframe/game.cpp

@@ -36,13 +36,19 @@ bool Game::Initialize() {
 	if(!device)
 		return false;
 	// Apply skin
-	if(gameConf.skin_index >= 0) {
+	if(gameConf.skin_index) {
 		wchar_t skin_dir[16];
 		myswprintf(skin_dir, L"skin");
 		skinSystem = new CGUISkinSystem(skin_dir, device);
 		core::array<core::stringw> skins = skinSystem->listSkins();
-		if((size_t)gameConf.skin_index < skins.size()) {
-			int index = skins.size() - gameConf.skin_index - 1; // reverse index
+		size_t count = skins.size();
+		if(count > 0) {
+			int index = 0;
+			if(gameConf.skin_index < 0)
+				index = rand() % count;
+			else if((size_t)gameConf.skin_index <= skins.size())
+				index = skins.size() - gameConf.skin_index;
+			if(index)
 				skinSystem->applySkin(skins[index].c_str());
 		}
 	}