sync ocgcore&strings

Classes/ocgcore/card.cpp

@@ -12,7 +12,6 @@
 #include "group.h"
 #include "interpreter.h"
 #include "ocgapi.h"
-#include <memory.h>
 #include <iostream>
 #include <algorithm>
 
@@ -84,13 +83,13 @@ card::card(duel* pd) {
 	direct_attackable = 0;
 	summon_info = 0;
 	status = 0;
-	memset(&q_cache, 0xff, sizeof(query_cache));
+	std::memset(&q_cache, 0xff, sizeof(query_cache));
 	equiping_target = 0;
 	pre_equip_target = 0;
 	overlay_target = 0;
-	memset(&current, 0, sizeof(card_state));
-	memset(&previous, 0, sizeof(card_state));
-	memset(&temp, 0xff, sizeof(card_state));
+	std::memset(&current, 0, sizeof(card_state));
+	std::memset(&previous, 0, sizeof(card_state));
+	std::memset(&temp, 0xff, sizeof(card_state));
 	unique_pos[0] = unique_pos[1] = 0;
 	spsummon_counter[0] = spsummon_counter[1] = 0;
 	spsummon_counter_rst[0] = spsummon_counter_rst[1] = 0;

Classes/ocgcore/duel.cpp

@@ -12,7 +12,6 @@
 #include "effect.h"
 #include "group.h"
 #include "ocgapi.h"
-#include <memory.h>
 
 duel::duel() {
 	lua = new interpreter(this);
@@ -96,7 +95,7 @@ void duel::delete_effect(effect* peffect) {
 	delete peffect;
 }
 int32 duel::read_buffer(byte* buf) {
-	memcpy(buf, buffer, bufferlen);
+	std::memcpy(buf, buffer, bufferlen);
 	return bufferlen;
 }
 void duel::release_script_group() {
@@ -138,7 +137,7 @@ void duel::set_responsei(uint32 resp) {
 	game_field->returns.ivalue[0] = resp;
 }
 void duel::set_responseb(byte* resp) {
-	memcpy(game_field->returns.bvalue, resp, 64);
+	std::memcpy(game_field->returns.bvalue, resp, 64);
 }
 int32 duel::get_next_integer(int32 l, int32 h) {
 	return (int32) (random.real() * (h - l + 1)) + l;

Classes/ocgcore/field.h

@@ -8,7 +8,6 @@
 #ifndef FIELD_H_
 #define FIELD_H_
 
-#include "memory.h"
 #include "common.h"
 #include "effectset.h"
 #include <vector>
@@ -19,7 +18,6 @@
 #include <functional>
 #include <unordered_map>
 #include <unordered_set>
-#include <cmath>
 
 class card;
 struct card_data;
@@ -206,7 +204,6 @@ struct processor {
 	chain_list new_ochain_b;
 	chain_list new_ochain_h;
 	chain_list new_chains;
-	chain_list tmp_chain;
 	delayed_effect_collection delayed_quick_tmp;
 	delayed_effect_collection delayed_quick_break;
 	delayed_effect_collection delayed_quick;

Classes/ocgcore/interpreter.cpp

@@ -832,7 +832,7 @@ int32 interpreter::call_function(int32 f, uint32 param_count, int32 ret_count) {
 		return OPERATION_FAIL;
 	}
 	if (param_count != params.size()) {
-		sprintf(pduel->strbuffer, "\"CallFunction\": incorrect parameter count (%d expected, %ud pushed)", param_count, params.size());
+		sprintf(pduel->strbuffer, "\"CallFunction\": incorrect parameter count (%d expected, %zu pushed)", param_count, params.size());
 		handle_message(pduel, 1);
 		params.clear();
 		return OPERATION_FAIL;
@@ -1029,7 +1029,7 @@ int32 interpreter::get_operation_value(card* pcard, int32 findex, int32 extraarg
 		}
 		return OPERATION_FAIL;
 	}
-	result = round(lua_tonumber(current_state, -1));
+	result = std::round(lua_tonumber(current_state, -1));
 	lua_pop(current_state, 1);
 	no_action--;
 	call_depth--;
@@ -1051,7 +1051,7 @@ int32 interpreter::get_function_value(int32 f, uint32 param_count) {
 		if (lua_isboolean(current_state, -1))
 			result = lua_toboolean(current_state, -1);
 		else
-			result = round(lua_tonumber(current_state, -1));
+			result = std::round(lua_tonumber(current_state, -1));
 		lua_pop(current_state, 1);
 		no_action--;
 		call_depth--;
@@ -1085,7 +1085,7 @@ int32 interpreter::get_function_value(int32 f, uint32 param_count, std::vector<i
 			if (lua_isboolean(current_state, index))
 				return_value = lua_toboolean(current_state, index);
 			else
-				return_value = round(lua_tonumber(current_state, index));
+				return_value = std::round(lua_tonumber(current_state, index));
 			result->push_back(return_value);
 		}
 		lua_settop(current_state, stack_top);
@@ -1146,7 +1146,7 @@ int32 interpreter::call_coroutine(int32 f, uint32 param_count, uint32 * yield_va
 	if (result == 0) {
 		coroutines.erase(f);
 		if(yield_value)
-			*yield_value = lua_isboolean(rthread, -1) ? lua_toboolean(rthread, -1) : round(lua_tonumber(rthread, -1));
+			*yield_value = lua_isboolean(rthread, -1) ? lua_toboolean(rthread, -1) : lua_tointeger(rthread, -1);
 		current_state = lua_state;
 		call_depth--;
 		if(call_depth == 0) {

Classes/ocgcore/interpreter.h

@@ -24,6 +24,7 @@ extern "C" {
 #include <list>
 #include <vector>
 #include <cstring>
+#include <cmath>
 
 class card;
 class effect;

Classes/ocgcore/libduel.cpp

@@ -33,7 +33,7 @@ int32 scriptlib::duel_get_lp(lua_State *L) {
 int32 scriptlib::duel_set_lp(lua_State *L) {
 	check_param_count(L, 2);
 	int32 p = lua_tointeger(L, 1);
-	int32 lp = round(lua_tonumber(L, 2));
+	int32 lp = std::round(lua_tonumber(L, 2));
 	if(lp < 0) lp = 0;
 	if(p != 0 && p != 1)
 		return 0;

Classes/ocgcore/libeffect.cpp

@@ -264,7 +264,7 @@ int32 scriptlib::effect_set_value(lua_State *L) {
 		if(lua_isboolean(L, 2))
 			peffect->value = lua_toboolean(L, 2);
 		else
-			peffect->value = round(lua_tonumber(L, 2));
+			peffect->value = std::round(lua_tonumber(L, 2));
 	}
 	return 0;
 }

Classes/ocgcore/playerop.cpp

@@ -11,7 +11,6 @@
 #include "card.h"
 #include "ocgapi.h"
 
-#include <memory.h>
 #include <algorithm>
 #include <stack>
 
@@ -263,15 +262,14 @@ int32 field::select_card(uint16 step, uint8 playerid, uint8 cancelable, uint8 mi
 	} else {
 		if(cancelable && returns.ivalue[0] == -1)
 			return TRUE;
-		byte c[64];
-		memset(c, 0, 64);
 		if(returns.bvalue[0] < min || returns.bvalue[0] > max) {
 			pduel->write_buffer8(MSG_RETRY);
 			return FALSE;
 		}
-		uint8 m = core.select_cards.size(), v = 0;
+		byte c[64] = {};
+		uint8 m = core.select_cards.size();
 		for(int32 i = 0; i < returns.bvalue[0]; ++i) {
-			v = returns.bvalue[i + 1];
+			uint8 v = returns.bvalue[i + 1];
 			if(v < 0 || v >= m || v >= 63 || c[v]) {
 				pduel->write_buffer8(MSG_RETRY);
 				return FALSE;
@@ -442,11 +440,11 @@ int32 field::select_place(uint16 step, uint8 playerid, uint32 flag, uint8 count)
 		returns.bvalue[0] = 0;
 		return FALSE;
 	} else {
-		uint8 pt = 0, p, l, s;
+		uint8 pt = 0;
 		for(int8 i = 0; i < count; ++i) {
-			p = returns.bvalue[pt];
-			l = returns.bvalue[pt + 1];
-			s = returns.bvalue[pt + 2];
+			uint8 p = returns.bvalue[pt];
+			uint8 l = returns.bvalue[pt + 1];
+			uint8 s = returns.bvalue[pt + 2];
 			if((p != 0 && p != 1)
 					|| ((l != LOCATION_MZONE) && (l != LOCATION_SZONE))
 					|| ((0x1u << s) & (flag >> (((p == playerid) ? 0 : 16) + ((l == LOCATION_MZONE) ? 0 : 8))))) {
@@ -516,10 +514,9 @@ int32 field::select_tribute(uint16 step, uint8 playerid, uint8 cancelable, uint8
 		pduel->write_buffer8(min);
 		pduel->write_buffer8(max);
 		pduel->write_buffer8(core.select_cards.size());
-		card* pcard;
 		std::sort(core.select_cards.begin(), core.select_cards.end(), card::card_operation_sort);
 		for(uint32 i = 0; i < core.select_cards.size(); ++i) {
-			pcard = core.select_cards[i];
+			card* pcard = core.select_cards[i];
 			pduel->write_buffer32(pcard->data.code);
 			pduel->write_buffer8(pcard->current.controler);
 			pduel->write_buffer8(pcard->current.location);
@@ -530,12 +527,11 @@ int32 field::select_tribute(uint16 step, uint8 playerid, uint8 cancelable, uint8
 	} else {
 		if(cancelable && returns.ivalue[0] == -1)
 			return TRUE;
-		byte c[64];
-		memset(c, 0, 64);
 		if(returns.bvalue[0] > max) {
 			pduel->write_buffer8(MSG_RETRY);
 			return FALSE;
 		}
+		byte c[64] = {};
 		uint8 m = core.select_cards.size(), tt = 0;
 		for(int32 i = 0; i < returns.bvalue[0]; ++i) {
 			int8 v = returns.bvalue[i + 1];
@@ -663,8 +659,7 @@ int32 field::select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32
 		}
 		return FALSE;
 	} else {
-		byte c[64];
-		memset(c, 0, 64);
+		byte c[64] = {};
 		if(max) {
 			int32 oparam[16];
 			int32 mcount = core.must_select_cards.size();
@@ -752,16 +747,17 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
 		}
 		return FALSE;
 	} else {
-		if(returns.bvalue[0] == -1)
+		if(returns.ivalue[0] == -1)
 			return TRUE;
-		uint8 seq[64];
-		memset(seq, 0, 64);
-		for(uint32 i = 0; i < core.select_cards.size(); ++i) {
-			if(returns.bvalue[i] < 0 || returns.bvalue[i] >= (int32)core.select_cards.size() || seq[(int32)returns.bvalue[i]]) {
+		byte c[64] = {};
+		uint8 m = core.select_cards.size();
+		for(uint8 i = 0; i < m; ++i) {
+			uint8 v = returns.bvalue[i];
+			if(v < 0 || v >= m || c[v]) {
 				pduel->write_buffer8(MSG_RETRY);
 				return FALSE;
 			}
-			seq[(int32)returns.bvalue[i]] = 1;
+			c[v] = 1;
 		}
 		return TRUE;
 	}

mobile/assets/data/conf/strings.conf

@@ -48,7 +48,7 @@
 !system 94 是否现在使用这张卡的效果？
 !system 95 是否使用[%ls]的效果？
 !system 96 是否使用[%ls]的效果代替破坏？
-!system 97 是否把[%ls]在魔法与陷阱区域放置？
+!system 97 是否把[%ls]在魔法与陷阱区域盖放？
 !system 98 是否要解放对方怪兽？
 !system 100 先攻
 !system 101 后攻
@@ -95,7 +95,7 @@
 !system 524 请选择里侧攻击表示的怪兽
 !system 525 请选择里侧守备表示的怪兽
 !system 526 请选择给对方确认的卡
-!system 527 请选择要放置到场上的卡
+!system 527 请选择要盖放到场上的卡
 !system 528 请选择要改变表示形式的怪兽
 !system 529 请选择自己的卡
 !system 530 请选择对方的卡
@@ -229,13 +229,13 @@
 !system 1150 发动
 !system 1151 召唤
 !system 1152 特殊召唤
-!system 1153 放置
+!system 1153 盖放
 !system 1154 反转召唤
 !system 1155 守备表示
 !system 1156 攻击表示
 !system 1157 攻击
 !system 1158 查看列表
-!system 1159 当魔法卡放置
+!system 1159 当魔法卡盖放
 !system 1160 在灵摆区域发动
 !system 1161 效果结算
 !system 1162 效果重置
@@ -912,3 +912,4 @@
 !setname 0x11f 奈芙提斯	ネフティス
 !setname 0x120 调皮宝贝	プランキッズ
 !setname 0x121 魔妖
+!setname 0x122 女武神	Valkyrie