Merge branch 'server' into 2pick

bc641325 · nanahira · c2abca64 · 8ed61b0e · bc641325 · 039a96d4
Commit bc641325 authored Apr 22, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

gframe/game.cpp gframe/game.cpp +1 -1

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -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);

--- a/script @ 039a96d4
+++ b/script @ 039a96d4
-Subproject commit 63aa6c77dae13e742d43f92528ca7a84ec80b7d8
+Subproject commit 039a96d469d0c4a2b115cf51cdad35030abc861c