Merge branch 'server-develop' of git.mycard.moe:mycard/ygopro into server-develop

gframe/client_field.cpp

@@ -1572,10 +1572,10 @@ void ClientField::UpdateDeclarableList() {
 		if(ancard.size())
 			return;
 	}
-	for(auto cit = dataManager.strings_begin; cit != dataManager.strings_end; ++cit) {
+	for(auto cit = dataManager.strings_begin(); cit != dataManager.strings_end(); ++cit) {
 		if(cit->second.name.find(pname) != std::wstring::npos) {
 			auto cp = dataManager.GetCodePointer(cit->first);
-			if (cp == dataManager.datas_end)
+			if (cp == dataManager.datas_end())
 				continue;
 			//datas.alias can be double card names or alias
 			if(is_declarable(cp->second, declare_opcodes)) {

gframe/data_manager.h

@@ -2,12 +2,9 @@
 #define DATAMANAGER_H
 
 #include "config.h"
-#include "sqlite3.h"
-#if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
-#include "spmemvfs/spmemvfs.h"
-#endif
-#include "client_card.h"
 #include <unordered_map>
+#include <sqlite3.h>
+#include "client_card.h"
 
 namespace ygo {
 	constexpr int MAX_STRING_ID = 0x7ff;
@@ -16,31 +13,33 @@ namespace ygo {
 class DataManager {
 public:
 	DataManager();
+	bool ReadDB(sqlite3* pDB);
 	bool LoadDB(const wchar_t* wfile);
 	bool LoadStrings(const char* file);
 #ifndef YGOPRO_SERVER_MODE
 	bool LoadStrings(IReadFile* reader);
 #endif
 	void ReadStringConfLine(const char* linebuf);
-#if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
-	bool Error(spmemvfs_db_t* pDB, sqlite3_stmt* pStmt = 0);
-#else
-	bool Error(sqlite3* pDB, sqlite3_stmt* pStmt = 0);
-#endif //YGOPRO_SERVER_MODE
-	bool GetData(unsigned int code, CardData* pData);
+	bool Error(sqlite3* pDB, sqlite3_stmt* pStmt = nullptr);
+
 	code_pointer GetCodePointer(unsigned int code) const;
 	string_pointer GetStringPointer(unsigned int code) const;
-	bool GetString(unsigned int code, CardString* pStr);
-	const wchar_t* GetName(unsigned int code);
-	const wchar_t* GetText(unsigned int code);
-	const wchar_t* GetDesc(unsigned int strCode);
-	const wchar_t* GetSysString(int code);
-	const wchar_t* GetVictoryString(int code);
-	const wchar_t* GetCounterName(int code);
-	const wchar_t* GetSetName(int code);
-	std::vector<unsigned int> GetSetCodes(std::wstring setname);
+	code_pointer datas_begin();
+	code_pointer datas_end();
+	string_pointer strings_begin();
+	string_pointer strings_end();
+	bool GetData(unsigned int code, CardData* pData) const;
+	bool GetString(unsigned int code, CardString* pStr) const;
+	const wchar_t* GetName(unsigned int code) const;
+	const wchar_t* GetText(unsigned int code) const;
+	const wchar_t* GetDesc(unsigned int strCode) const;
+	const wchar_t* GetSysString(int code) const;
+	const wchar_t* GetVictoryString(int code) const;
+	const wchar_t* GetCounterName(int code) const;
+	const wchar_t* GetSetName(int code) const;
+	std::vector<unsigned int> GetSetCodes(std::wstring setname) const;
 	const wchar_t* GetNumString(int num, bool bracket = false);
-	const wchar_t* FormatLocation(int location, int sequence);
+	const wchar_t* FormatLocation(int location, int sequence) const;
 	const wchar_t* FormatAttribute(int attribute);
 	const wchar_t* FormatRace(int race);
 	const wchar_t* FormatType(int type);
@@ -51,10 +50,7 @@ public:
 	std::unordered_map<unsigned int, std::wstring> _victoryStrings;
 	std::unordered_map<unsigned int, std::wstring> _setnameStrings;
 	std::unordered_map<unsigned int, std::wstring> _sysStrings;
-	code_pointer datas_begin;
-	code_pointer datas_end;
-	string_pointer strings_begin;
-	string_pointer strings_end;
+	char errmsg[512]{};
 
 	wchar_t numStrings[301][4]{};
 	wchar_t numBuffer[6]{};

gframe/deck_con.cpp

@@ -1058,7 +1058,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			dragx = event.MouseInput.X;
 			dragy = event.MouseInput.Y;
 			draging_pointer = dataManager.GetCodePointer(hovered_code);
-			if(draging_pointer == dataManager.datas_end)
+			if(draging_pointer == dataManager.datas_end())
 				break;
 			if(hovered_pos == 4) {
 				if(!check_limit(draging_pointer))
@@ -1112,7 +1112,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				if(hovered_pos == 0 || hovered_seq == -1)
 					break;
 				auto pointer = dataManager.GetCodePointer(hovered_code);
-				if(pointer == dataManager.datas_end)
+				if(pointer == dataManager.datas_end())
 					break;
 				soundManager.PlaySoundEffect(SOUND_CARD_DROP);
 				if(hovered_pos == 1) {
@@ -1147,7 +1147,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					pop_side(hovered_seq);
 				} else {
 					auto pointer = dataManager.GetCodePointer(hovered_code);
-					if(pointer == dataManager.datas_end)
+					if(pointer == dataManager.datas_end())
 						break;
 					if(!check_limit(pointer))
 						break;
@@ -1182,7 +1182,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			if (is_draging)
 				break;
 			auto pointer = dataManager.GetCodePointer(hovered_code);
-			if (pointer == dataManager.datas_end)
+			if (pointer == dataManager.datas_end())
 				break;
 			if(!check_limit(pointer))
 				break;
@@ -1452,10 +1452,10 @@ void DeckBuilder::FilterCards() {
 			query_elements.push_back(element);
 		}
 	}
-	for(code_pointer ptr = dataManager.datas_begin; ptr != dataManager.datas_end; ++ptr) {
+	for(code_pointer ptr = dataManager.datas_begin(); ptr != dataManager.datas_end(); ++ptr) {
 		const CardDataC& data = ptr->second;
 		auto strpointer = dataManager.GetStringPointer(ptr->first);
-		if (strpointer == dataManager.strings_end)
+		if (strpointer == dataManager.strings_end())
 			continue;
 		const CardString& text = strpointer->second;
 		if(data.type & TYPE_TOKEN)

gframe/event_handler.cpp

@@ -2585,11 +2585,14 @@ void ClientField::ShowCardInfoInList(ClientCard* pcard, irr::gui::IGUIElement* e
 	}
 }
 void ClientField::SetResponseSelectedCards() const {
-	unsigned char respbuf[SIZE_RETURN_VALUE];
-	respbuf[0] = selected_cards.size();
-	for (size_t i = 0; i < selected_cards.size(); ++i)
+	unsigned char respbuf[SIZE_RETURN_VALUE]{};
+	int len = (int)selected_cards.size();
+	if (len > UINT8_MAX)
+		len = UINT8_MAX;
+	respbuf[0] = (unsigned char)len;
+	for (int i = 0; i < len; ++i)
 		respbuf[i + 1] = selected_cards[i]->select_seq;
-	DuelClient::SetResponseB(respbuf, selected_cards.size() + 1);
+	DuelClient::SetResponseB(respbuf, len + 1);
 }
 void ClientField::SetResponseSelectedOption() const {
 	if(mainGame->dInfo.curMsg == MSG_SELECT_OPTION) {

gframe/game.cpp

@@ -1893,7 +1893,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		return;
 	wchar_t formatBuffer[256];
 	auto cit = dataManager.GetCodePointer(code);
-	bool is_valid = (cit != dataManager.datas_end);
+	bool is_valid = (cit != dataManager.datas_end());
 	imgCard->setImage(imageManager.GetTexture(code, true));
 	if (is_valid) {
 		auto& cd = cit->second;
@@ -1910,7 +1910,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 	if (is_valid && !gameConf.hide_setname) {
 		auto& cd = cit->second;
 		auto target = cit;
-		if (cd.alias && dataManager.GetCodePointer(cd.alias) != dataManager.datas_end) {
+		if (cd.alias && dataManager.GetCodePointer(cd.alias) != dataManager.datas_end()) {
 			target = dataManager.GetCodePointer(cd.alias);
 		}
 		if (target->second.setcode[0]) {

gframe/network.h

@@ -208,31 +208,30 @@ inline unsigned int GetPosition(unsigned char* qbuf, int offset) {
 
 class DuelMode {
 public:
-	virtual ~DuelMode() {}
-	virtual void Chat(DuelPlayer* dp, unsigned char* pdata, int len) {}
-	virtual void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {}
-	virtual void LeaveGame(DuelPlayer* dp) {}
-	virtual void ToDuelist(DuelPlayer* dp) {}
-	virtual void ToObserver(DuelPlayer* dp) {}
-	virtual void PlayerReady(DuelPlayer* dp, bool is_ready) {}
-	virtual void PlayerKick(DuelPlayer* dp, unsigned char pos) {}
-	virtual void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {}
-	virtual void StartDuel(DuelPlayer* dp) {}
-	virtual void HandResult(DuelPlayer* dp, unsigned char res) {}
-	virtual void TPResult(DuelPlayer* dp, unsigned char tp) {}
-	virtual void Process() {}
-	virtual int Analyze(char* msgbuffer, unsigned int len) {
-		return 0;
-	}
-	virtual void Surrender(DuelPlayer* dp) {}
-	virtual void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) {}
-	virtual void TimeConfirm(DuelPlayer* dp) {}
+	DuelMode() = default;
+	virtual ~DuelMode() = default;
+	virtual void Chat(DuelPlayer* dp, unsigned char* pdata, int len) = 0;
+	virtual void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) = 0;
+	virtual void LeaveGame(DuelPlayer* dp) = 0;
+	virtual void ToDuelist(DuelPlayer* dp) = 0;
+	virtual void ToObserver(DuelPlayer* dp) = 0;
+	virtual void PlayerReady(DuelPlayer* dp, bool is_ready) = 0;
+	virtual void PlayerKick(DuelPlayer* dp, unsigned char pos) = 0;
+	virtual void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) = 0;
+	virtual void StartDuel(DuelPlayer* dp) = 0;
+	virtual void HandResult(DuelPlayer* dp, unsigned char res) = 0;
+	virtual void TPResult(DuelPlayer* dp, unsigned char tp) = 0;
+	virtual void Process() = 0;
+	virtual int Analyze(unsigned char* msgbuffer, unsigned int len) = 0;
+	virtual void Surrender(DuelPlayer* dp) = 0;
+	virtual void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) = 0;
+	virtual void TimeConfirm(DuelPlayer* dp) = 0;
 #ifdef YGOPRO_SERVER_MODE
-	virtual void RequestField(DuelPlayer* dp) {}
+	virtual void RequestField(DuelPlayer* dp) = 0;
 #endif
-	virtual void EndDuel() {}
+	virtual void EndDuel() = 0;
 #ifdef YGOPRO_SERVER_MODE
-	virtual void TestCard(int code) {}
+	virtual void TestCard(int code) = 0;
 #endif
 
 public:

gframe/replay_mode.cpp

@@ -236,7 +236,7 @@ bool ReplayMode::StartDuel() {
 		}
 		cur_replay.ReadData(filename, slen);
 		filename[slen] = 0;
-		if(!preload_script(pduel, filename, 0)) {
+		if(!preload_script(pduel, filename)) {
 			return false;
 		}
 	}

gframe/single_duel.cpp

@@ -576,8 +576,8 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	pduel = create_duel(duel_seed);
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
-	preload_script(pduel, "./script/special.lua", 0);
-	preload_script(pduel, "./script/init.lua", 0);
+	preload_script(pduel, "./script/special.lua");
+	preload_script(pduel, "./script/init.lua");
 	unsigned int opt = (unsigned int)host_info.duel_rule << 16;
 	if(host_info.no_shuffle_deck)
 		opt |= DUEL_PSEUDO_SHUFFLE;

gframe/single_duel.h

@@ -10,31 +10,31 @@ namespace ygo {
 class SingleDuel: public DuelMode {
 public:
 	SingleDuel(bool is_match);
-	virtual ~SingleDuel();
-	virtual void Chat(DuelPlayer* dp, unsigned char* pdata, int len);
-	virtual void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater);
-	virtual void LeaveGame(DuelPlayer* dp);
-	virtual void ToDuelist(DuelPlayer* dp);
-	virtual void ToObserver(DuelPlayer* dp);
-	virtual void PlayerReady(DuelPlayer* dp, bool ready);
-	virtual void PlayerKick(DuelPlayer* dp, unsigned char pos);
-	virtual void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len);
-	virtual void StartDuel(DuelPlayer* dp);
-	virtual void HandResult(DuelPlayer* dp, unsigned char res);
-	virtual void TPResult(DuelPlayer* dp, unsigned char tp);
-	virtual void Process();
-	virtual void Surrender(DuelPlayer* dp);
-	virtual int Analyze(unsigned char* msgbuffer, unsigned int len);
-	virtual void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len);
-	virtual void TimeConfirm(DuelPlayer* dp);
+	~SingleDuel() override;
+	void Chat(DuelPlayer* dp, unsigned char* pdata, int len) override;
+	void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) override;
+	void LeaveGame(DuelPlayer* dp) override;
+	void ToDuelist(DuelPlayer* dp) override;
+	void ToObserver(DuelPlayer* dp) override;
+	void PlayerReady(DuelPlayer* dp, bool ready) override;
+	void PlayerKick(DuelPlayer* dp, unsigned char pos) override;
+	void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) override;
+	void StartDuel(DuelPlayer* dp) override;
+	void HandResult(DuelPlayer* dp, unsigned char res) override;
+	void TPResult(DuelPlayer* dp, unsigned char tp) override;
+	void Process() override;
+	void Surrender(DuelPlayer* dp) override;
+	int Analyze(unsigned char* msgbuffer, unsigned int len) override;
+	void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) override;
+	void TimeConfirm(DuelPlayer* dp) override;
 #ifdef YGOPRO_SERVER_MODE
-	virtual void RequestField(DuelPlayer* dp);
+	void RequestField(DuelPlayer* dp) override;
 #endif
-	virtual void EndDuel();
+	void EndDuel() override;
 #ifdef YGOPRO_SERVER_MODE
-	virtual void TestCard(int code);
+	void TestCard(int code) override;
 #endif
-
+	
 	void DuelEndProc();
 	void WaitforResponse(int playerid);
 #ifdef YGOPRO_SERVER_MODE

gframe/single_mode.cpp

@@ -63,11 +63,11 @@ int SingleMode::SinglePlayThread() {
 	if(open_file) {
 		open_file = false;
 		slen = BufferIO::EncodeUTF8(open_file_name, filename);
-		if(!preload_script(pduel, filename, 0)) {
+		if(!preload_script(pduel, filename)) {
 			wchar_t fname[256];
 			myswprintf(fname, L"./single/%ls", open_file_name);
 			slen = BufferIO::EncodeUTF8(fname, filename);
-			if(!preload_script(pduel, filename, 0))
+			if(!preload_script(pduel, filename))
 				slen = 0;
 		}
 	} else {
@@ -75,7 +75,7 @@ int SingleMode::SinglePlayThread() {
 		wchar_t fname[256];
 		myswprintf(fname, L"./single/%ls", name);
 		slen = BufferIO::EncodeUTF8(fname, filename);
-		if(!preload_script(pduel, filename, 0))
+		if(!preload_script(pduel, filename))
 			slen = 0;
 	}
 	if(slen == 0) {

gframe/tag_duel.cpp

@@ -556,8 +556,8 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	pduel = create_duel(duel_seed);
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
-	preload_script(pduel, "./script/special.lua", 0);
-	preload_script(pduel, "./script/init.lua", 0);
+	preload_script(pduel, "./script/special.lua");
+	preload_script(pduel, "./script/init.lua");
 	unsigned int opt = (unsigned int)host_info.duel_rule << 16;
 	if(host_info.no_shuffle_deck)
 		opt |= DUEL_PSEUDO_SHUFFLE;

gframe/tag_duel.h

@@ -10,27 +10,27 @@ namespace ygo {
 class TagDuel: public DuelMode {
 public:
 	TagDuel();
-	virtual ~TagDuel();
-	virtual void Chat(DuelPlayer* dp, unsigned char* pdata, int len);
-	virtual void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater);
-	virtual void LeaveGame(DuelPlayer* dp);
-	virtual void ToDuelist(DuelPlayer* dp);
-	virtual void ToObserver(DuelPlayer* dp);
-	virtual void PlayerReady(DuelPlayer* dp, bool ready);
-	virtual void PlayerKick(DuelPlayer* dp, unsigned char pos);
-	virtual void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len);
-	virtual void StartDuel(DuelPlayer* dp);
-	virtual void HandResult(DuelPlayer* dp, unsigned char res);
-	virtual void TPResult(DuelPlayer* dp, unsigned char tp);
-	virtual void Process();
-	virtual void Surrender(DuelPlayer* dp);
-	virtual int Analyze(unsigned char* msgbuffer, unsigned int len);
-	virtual void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len);
-	virtual void TimeConfirm(DuelPlayer* dp);
+	~TagDuel() override;
+	void Chat(DuelPlayer* dp, unsigned char* pdata, int len) override;
+	void JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) override;
+	void LeaveGame(DuelPlayer* dp) override;
+	void ToDuelist(DuelPlayer* dp) override;
+	void ToObserver(DuelPlayer* dp) override;
+	void PlayerReady(DuelPlayer* dp, bool ready) override;
+	void PlayerKick(DuelPlayer* dp, unsigned char pos) override;
+	void UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) override;
+	void StartDuel(DuelPlayer* dp) override;
+	void HandResult(DuelPlayer* dp, unsigned char res) override;
+	void TPResult(DuelPlayer* dp, unsigned char tp) override;
+	void Process() override;
+	void Surrender(DuelPlayer* dp) override;
+	int Analyze(unsigned char* msgbuffer, unsigned int len) override;
+	void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) override;
+	void TimeConfirm(DuelPlayer* dp) override;
 #ifdef YGOPRO_SERVER_MODE
-	virtual void RequestField(DuelPlayer* dp);
+	void RequestField(DuelPlayer* dp) override;
 #endif
-	virtual void EndDuel();
+	void EndDuel() override;
 	
 	void DuelEndProc();
 	void WaitforResponse(int playerid);

lflist.conf

@@ -15644,4 +15644,4 @@
 29401950 2 --奈落の落とし穴
 15800838 2 --マインドクラッシュ
 62279055 2 --魔法の筒
-97077563 2 --リビングデッドの呼び声
+97077563 2 --リビングデッドの呼び声
\ No newline at end of file

ocgcore @ 36530db9

-Subproject commit 204eb0d8bdedd2ca0c0e473798a63735c8c8528d
+Subproject commit 36530db919a7d662da52efdbd5e6f16891bc15d9

script @ 7b08dcba

-Subproject commit 02cf811961c11c61f448e105c732a5369025f076
+Subproject commit 7b08dcba45ae59dfa25030b06d5e1414ad0e44c0