Commit ce8a6275 authored by nanahira's avatar nanahira

Merge branch 'skin_fh' into skin

parents 76f35e26 d8b77ec1
...@@ -36,14 +36,20 @@ bool Game::Initialize() { ...@@ -36,14 +36,20 @@ bool Game::Initialize() {
if(!device) if(!device)
return false; return false;
// Apply skin // Apply skin
if(gameConf.skin_index >= 0) { if(gameConf.skin_index) {
wchar_t skin_dir[16]; wchar_t skin_dir[16];
myswprintf(skin_dir, L"skin"); myswprintf(skin_dir, L"skin");
skinSystem = new CGUISkinSystem(skin_dir, device); skinSystem = new CGUISkinSystem(skin_dir, device);
core::array<core::stringw> skins = skinSystem->listSkins(); core::array<core::stringw> skins = skinSystem->listSkins();
if((size_t)gameConf.skin_index < skins.size()) { size_t count = skins.size();
int index = skins.size() - gameConf.skin_index - 1; // reverse index if(count > 0) {
skinSystem->applySkin(skins[index].c_str()); 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());
} }
} }
linePatternD3D = 0; linePatternD3D = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment