Merge branch 'server' into fullview

gframe/config.h

@@ -73,12 +73,12 @@ extern char** environ;
 #include "../ocgcore/ocgapi.h"
 
 template<size_t N, typename... TR>
-inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR&&... args) {
-	return std::swprintf(buf, N, fmt, std::forward<TR>(args)...);
+inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
+	return std::swprintf(buf, N, fmt, args...);
 }
 template<size_t N, typename... TR>
-inline int mysnprintf(char(&buf)[N], const char* fmt, TR&&... args) {
-	return std::snprintf(buf, N, fmt, std::forward<TR>(args)...);
+inline int mysnprintf(char(&buf)[N], const char* fmt, TR... args) {
+	return std::snprintf(buf, N, fmt, args...);
 }
 
 inline FILE* mywfopen(const wchar_t* filename, const char* mode) {

gframe/deck_con.cpp

@@ -1954,15 +1954,17 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
 		}
 		return valid;
 	};
+	auto limitcode_has_credit = filterList->credits.find(limitcode) != filterList->credits.end();
 	auto handle_card = [&](ygo::code_pointer& card) {
 		if (card->first == limitcode || card->second.alias == limitcode) {
 			limit--;
-			if(limit <= 0)
+			if(limit < 0)
 				return false;
 		}
-		auto code = card->second.alias ? card->second.alias : card->first;
-		spend_credit(code);
+		if(!limitcode_has_credit)
 			return true;
+		auto code = card->second.alias ? card->second.alias : card->first;
+		return spend_credit(code);
 	};
 	for (auto& card : deckManager.current_deck.main) {
 		if(!handle_card(card))
@@ -1976,6 +1978,6 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
 		if(!handle_card(card))
 			return false;
 	}
-	return spend_credit(limitcode);
+	return handle_card(pointer);
 }
 }

gframe/game.cpp

@@ -271,7 +271,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Synthetic", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Loschen", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
 	wMainMenu = env->addWindow(irr::core::rect<irr::s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(irr::core::rect<irr::s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

script @ 58c4a82d

-Subproject commit ca9b8af4c90cf1422b903594b086ce5e2dfd0e93
+Subproject commit 58c4a82d7944f07cc9fd58f6386f63848686d924

strings.conf

@@ -1286,3 +1286,4 @@
 !setname 0x1d7 艾克莉西娅	エクレシア
 !setname 0x1d8 耀圣	エルフェンノーツ
 !setname 0x1d9 磁力	マグネット
+!setname 0x1da 世界末日	エンド・オブ・ザ・ワールド