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

duel.cpp

@@ -33,8 +33,8 @@ duel::~duel() {
 		delete pgroup;
 	for(auto& peffect : effects)
 		delete peffect;
-	delete lua;
 	delete game_field;
+	delete lua;
 }
 void duel::clear() {
 	for(auto& pcard : cards)

interpreter.cpp

@@ -14,15 +14,11 @@
 #include "ocgapi.h"
 #include "interpreter.h"
 
-interpreter::interpreter(duel* pd, bool enable_unsafe_libraries): coroutines(256) {
+interpreter::interpreter(duel* pd, bool enable_unsafe_libraries) : coroutines(256), pduel(pd) {
 	mem_tracker = new LuaMemTracker(YGOPRO_LUA_MEMORY_SIZE);
 	lua_state = lua_newstate(LuaMemTracker::AllocThunk, mem_tracker);
 	current_state = lua_state;
-	pduel = pd;
 	std::memcpy(lua_getextraspace(lua_state), &pd, LUA_EXTRASPACE); //set_duel_info
-	no_action = 0;
-	call_depth = 0;
-	disable_action_check = 0;
 	//Initial
 #ifdef YGOPRO_NO_LUA_SAFE
 	luaL_openlibs(lua_state);

interpreter.h

@@ -34,17 +34,17 @@ public:
 	using param_list = std::list<std::pair<lua_param, LuaParamType>>;
 	
 	duel* pduel;
-	char msgbuf[64];
+	char msgbuf[64]{};
 	lua_State* lua_state;
 	lua_State* current_state;
 	LuaMemTracker* mem_tracker;
 	param_list params;
 	param_list resumes;
 	coroutine_map coroutines;
-	int32_t no_action;
-	int32_t call_depth;
-	int32_t disable_action_check;
-	int32_t preloaded;
+	int32_t no_action{};
+	int32_t call_depth{};
+	int32_t disable_action_check{};
+	int32_t preloaded{};
 
 	explicit interpreter(duel* pd, bool enable_unsafe_libraries);
 	~interpreter();

libduel.cpp

@@ -372,7 +372,7 @@ int32_t scriptlib::duel_clear_registry(lua_State *L) {
 
 int32_t scriptlib::duel_enable_global_flag(lua_State *L) {
 	check_param_count(L, 1);
-	int32_t flag = (int32_t)lua_tointeger(L, 1);
+	uint32_t flag = (uint32_t)lua_tointeger(L, 1);
 	duel* pduel = interpreter::get_duel_info(L);
 	pduel->game_field->core.global_flag |= flag;
 	return 0;