Commit 3f787954 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 4a42ccf1 c2d4164e
......@@ -98,7 +98,7 @@ bool Game::Initialize() {
if(!device)
return false;
// Apply skin
if(gameConf.skin_index) {
if(gameConf.skin_index && gameConf.use_d3d) {
wchar_t skin_dir[16];
myswprintf(skin_dir, L"skin");
skinSystem = new CGUISkinSystem(skin_dir, device);
......
Subproject commit 45fa3f0610504b48bcf1cd299ecd88d7d2393d9b
Subproject commit 803af5d691b39a4a36661150dc4f957ba8f20187
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