Merge branch 'server' into full-view

1ac16dae · nanahira · abb0ebbf · c40524d9 · 1ac16dae · 1ac16dae
Commit 1ac16dae authored Dec 15, 2021 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

premake5.lua premake5.lua +4 -0

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -33,8 +33,8 @@ HostInfo game_info;
 void Game::MainServerLoop() {
 	initUtils();
 	deckManager.LoadLFList();
-	LoadExpansions();
 	dataManager.LoadDB(L"cards.cdb");
+	LoadExpansions();
 	
 	aServerPort = NetServer::StartServer(aServerPort);
 	NetServer::InitDuel();

--- a/premake5.lua
+++ b/premake5.lua
@@ -39,6 +39,10 @@ solution "ygo"
        end
    end

+    if os.ishost("windows") then
+        BUILD_LUA=true
+    end
+
    configurations { "Release", "Debug" }
 if os.getenv("YGOPRO_NO_LUA_SAFE") then
    defines { "LUA_COMPAT_5_2", "YGOPRO_SERVER_MODE" }