Merge branch 'master' of https://github.com/Fluorohydride/ygopro into link

gframe/data_manager.cpp

@@ -301,6 +301,42 @@ const wchar_t* DataManager::FormatSetName(unsigned long long setcode) {
 		return unknown_string;
 	return scBuffer;
 }
+const wchar_t* DataManager::FormatLinkMarker(int link_marker) {
+	wchar_t* p = lmBuffer;
+	if(link_marker & LINK_MARKER_TOP_LEFT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2196;
+	}
+	if(link_marker & LINK_MARKER_TOP) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2191;
+	}
+	if(link_marker & LINK_MARKER_TOP_RIGHT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2197;
+	}
+	if(link_marker & LINK_MARKER_LEFT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2190;
+	}
+	if(link_marker & LINK_MARKER_RIGHT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2192;
+	}
+	if(link_marker & LINK_MARKER_BOTTOM_LEFT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2199;
+	}
+	if(link_marker & LINK_MARKER_BOTTOM) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2193;
+	}
+	if(link_marker & LINK_MARKER_BOTTOM_RIGHT) {
+		BufferIO::CopyWStrRef(L"[ ]", p, 4);
+		*(p - 2) = 0x2198;
+	}
+	return lmBuffer;
+}
 int DataManager::CardReader(int code, void* pData) {
 	if(!dataManager.GetData(code, (CardData*)pData))
 		memset(pData, 0, sizeof(CardData));

gframe/data_manager.h

@@ -31,6 +31,7 @@ public:
 	const wchar_t* FormatRace(int race);
 	const wchar_t* FormatType(int type);
 	const wchar_t* FormatSetName(unsigned long long setcode);
+	const wchar_t* FormatLinkMarker(int link_marker);
 
 	std::unordered_map<unsigned int, CardDataC> _datas;
 	std::unordered_map<unsigned int, CardString> _strings;
@@ -45,6 +46,7 @@ public:
 	wchar_t racBuffer[128];
 	wchar_t tpBuffer[128];
 	wchar_t scBuffer[128];
+	wchar_t lmBuffer[32];
 
 	static wchar_t strBuffer[4096];
 	static const wchar_t* unknown_string;

gframe/game.cpp

@@ -1043,10 +1043,11 @@ void Game::ShowCardInfo(int code) {
 			myswprintf(formatBuffer, L"[LINK-%d] ", cd.level);
 			wchar_t adBuffer[16];
 			if(cd.attack < 0)
-				myswprintf(adBuffer, L"?/-");
+				myswprintf(adBuffer, L"?/-   ");
 			else
-				myswprintf(adBuffer, L"%d/-", cd.attack);
+				myswprintf(adBuffer, L"%d/-   ", cd.attack);
 			wcscat(formatBuffer, adBuffer);
+			wcscat(formatBuffer, dataManager.FormatLinkMarker(cd.link_marker));
 		}
 		if(cd.type & TYPE_PENDULUM) {
 			wchar_t scaleBuffer[16];

gframe/single_mode.cpp

@@ -11,7 +11,7 @@ long SingleMode::pduel = 0;
 bool SingleMode::is_closing = false;
 bool SingleMode::is_continuing = false;
 
-byte buffer[0x10000];
+static byte buffer[0x20000];
 
 bool SingleMode::StartPlay() {
 	Thread::NewThread(SinglePlayThread, 0);
@@ -813,7 +813,7 @@ byte* SingleMode::ScriptReader(const char* script_name, int* slen) {
 		return 0;
 	fseek(fp, 0, SEEK_END);
 	unsigned int len = ftell(fp);
-	if(len > 0x10000) {
+	if(len > sizeof(buffer)) {
 		fclose(fp);
 		return 0;
 	}

strings.conf

@@ -184,6 +184,7 @@
 !system 1073 超量
 !system 1074 灵摆
 !system 1075 特殊召唤
+!system 1076 连接
 !system 1080 (N/A)
 #GUI
 !system 1100 魔陷破坏