Skip to content

Y
ygopro-core
Commit 9e0f7bdb authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro-core into develop

parents 8c8f4a9c e15beaab
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 12 deletions
libdebug.cpp
View file @ 9e0f7bdb
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
int32_t scriptlib::debug_message(lua_State *L) { int32_t scriptlib::debug_message(lua_State *L) {
#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_ENABLE_DEBUG_FUNC) #if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_ENABLE_DEBUG_FUNC)
check_param_count(L, 1);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
lua_getglobal(L, "tostring"); lua_getglobal(L, "tostring");
lua_pushvalue(L, -2); lua_pushvalue(L, -2);
......
ocgapi.h
View file @ 9e0f7bdb
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "common.h" #include "common.h"
#ifdef WIN32 #ifdef _WIN32
#define DECL_DLLEXPORT __declspec(dllexport) #define DECL_DLLEXPORT __declspec(dllexport)
#else #else
#define DECL_DLLEXPORT #define DECL_DLLEXPORT
......
operations.cpp
View file @ 9e0f7bdb
...@@ -1324,9 +1324,9 @@ int32_t field::trap_monster_adjust(uint16_t step) { ...@@ -1324,9 +1324,9 @@ int32_t field::trap_monster_adjust(uint16_t step) {
if(fcount <= 0) { if(fcount <= 0) {
for(auto& pcard : core.trap_monster_adjust_set[check_player]) { for(auto& pcard : core.trap_monster_adjust_set[check_player]) {
to_grave_set->insert(pcard); to_grave_set->insert(pcard);
core.units.begin()->step = 2;
} }
core.trap_monster_adjust_set[check_player].clear(); 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) { } 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; uint32_t ct = (uint32_t)core.trap_monster_adjust_set[check_player].size() - fcount;
core.select_cards.clear(); core.select_cards.clear();
......
premake/dll.lua
View file @ 9e0f7bdb
...@@ -44,7 +44,6 @@ workspace "ocgcoredll" ...@@ -44,7 +44,6 @@ workspace "ocgcoredll"
defines "_DEBUG" defines "_DEBUG"
filter "system:windows" filter "system:windows"
defines { "WIN32", "_WIN32" }
systemversion "latest" systemversion "latest"
startproject "ocgcore" startproject "ocgcore"
...@@ -63,9 +62,6 @@ workspace "ocgcoredll" ...@@ -63,9 +62,6 @@ workspace "ocgcoredll"
buildoptions { "/utf-8" } buildoptions { "/utf-8" }
defines { "_CRT_SECURE_NO_WARNINGS" } defines { "_CRT_SECURE_NO_WARNINGS" }
filter "not action:vs*"
buildoptions { }
filter "system:bsd" filter "system:bsd"
defines { "LUA_USE_POSIX" } defines { "LUA_USE_POSIX" }
...@@ -74,12 +70,12 @@ workspace "ocgcoredll" ...@@ -74,12 +70,12 @@ workspace "ocgcoredll"
filter "system:linux" filter "system:linux"
defines { "LUA_USE_LINUX" } defines { "LUA_USE_LINUX" }
buildoptions { "-fPIC" } pic "On"
linkoptions { "-static-libstdc++", "-static-libgcc" } linkoptions { "-static-libstdc++", "-static-libgcc" }
filter "system:emscripten" filter "system:emscripten"
defines { "LUA_USE_LONGJMP", "LUA_USE_C89" } defines { "LUA_USE_LONGJMP", "LUA_USE_C89" }
buildoptions { "-fPIC" } pic "On"
filter {} filter {}
......
premake/lua.lua
View file @ 9e0f7bdb
...@@ -23,4 +23,3 @@ project "lua" ...@@ -23,4 +23,3 @@ project "lua"
filter "system:linux" filter "system:linux"
defines { "LUA_USE_LINUX" } defines { "LUA_USE_LINUX" }
buildoptions { "-fPIC" }
premake5.lua
View file @ 9e0f7bdb
...@@ -12,9 +12,6 @@ project "ocgcore" ...@@ -12,9 +12,6 @@ project "ocgcore"
libdirs { LUA_LIB_DIR } libdirs { LUA_LIB_DIR }
end end
filter "not action:vs*"
buildoptions { }
filter "system:bsd" filter "system:bsd"
defines { "LUA_USE_POSIX" } defines { "LUA_USE_POSIX" }
......
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