Merge remote-tracking branch 'upstream/master'

libdebug.cpp

@@ -14,6 +14,7 @@
 #include "ocgapi.h"
 
 int32_t scriptlib::debug_message(lua_State *L) {
+	check_param_count(L, 1);
 	duel* pduel = interpreter::get_duel_info(L);
 	lua_getglobal(L, "tostring");
 	lua_pushvalue(L, -2);

ocgapi.h

@@ -10,7 +10,7 @@
 
 #include "common.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define DECL_DLLEXPORT __declspec(dllexport)
 #else
 #define DECL_DLLEXPORT

operations.cpp

@@ -1299,9 +1299,9 @@ int32_t field::trap_monster_adjust(uint16_t step) {
 		if(fcount <= 0) {
 			for(auto& pcard : core.trap_monster_adjust_set[check_player]) {
 				to_grave_set->insert(pcard);
-				core.units.begin()->step = 2;
 			}
 			core.trap_monster_adjust_set[check_player].clear();
+			core.units.begin()->step = 2;
 		} else if((int32_t)core.trap_monster_adjust_set[check_player].size() > fcount) {
 			uint32_t ct = (uint32_t)core.trap_monster_adjust_set[check_player].size() - fcount;
 			core.select_cards.clear();

premake/dll.lua

@@ -31,7 +31,6 @@ workspace "ocgcoredll"
         defines "_DEBUG"
 
     filter "system:windows"
-        defines { "WIN32", "_WIN32" }
         systemversion "latest"
         startproject "ocgcore"
 
@@ -50,9 +49,6 @@ workspace "ocgcoredll"
         buildoptions { "/utf-8" }
         defines { "_CRT_SECURE_NO_WARNINGS" }
 
-    filter "not action:vs*"
-        buildoptions { }
-
     filter "system:bsd"
         defines { "LUA_USE_POSIX" }
 
@@ -61,7 +57,7 @@ workspace "ocgcoredll"
 
     filter "system:linux"
         defines { "LUA_USE_LINUX" }
-        buildoptions { "-fPIC" }
+        pic "On"
 
 filter {}
 

premake/lua.lua

@@ -16,4 +16,3 @@ project "lua"
 
     filter "system:linux"
         defines { "LUA_USE_LINUX" }
-        buildoptions { "-fPIC" }

premake5.lua

@@ -12,9 +12,6 @@ project "ocgcore"
         libdirs { LUA_LIB_DIR }
     end
 
-    filter "not action:vs*"
-        buildoptions { }
-
     filter "system:bsd"
         defines { "LUA_USE_POSIX" }