Merge branch 'server' of https://github.com/purerosefallen/ygopro

gframe/CGUITTFont.cpp

@@ -153,10 +153,12 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri
 	}
 
 	glyph_page = parent->getLastGlyphPageIndex();
-	u32 texture_side_length = page->texture_size.Width;
+	u32 texture_side_length = page->texture_size.Width - font_size;
+	u32 margin = font_size * 0.5;
+	u32 sprite_size = font_size * 1.5;
 	core::vector2di page_position(
-	    (page->used_slots % (texture_side_length / font_size)) * font_size,
-	    (page->used_slots / (texture_side_length / font_size)) * font_size
+		(s32)(page->used_slots % (s32)(texture_side_length / sprite_size)) * sprite_size + margin,
+		(s32)(page->used_slots / (s32)(texture_side_length / sprite_size)) * sprite_size + margin
 	);
 	source_rect.UpperLeftCorner = page_position;
 	source_rect.LowerRightCorner = core::vector2di(page_position.X + bits.width, page_position.Y + bits.rows);
@@ -466,7 +468,7 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
 
 	if (page) {
 		// Determine the number of glyph slots on the page and add it to the list of pages.
-		page->available_slots = (page_texture_size.Width / size) * (page_texture_size.Height / size);
+		page->available_slots = (u32)((page_texture_size.Width - size) / (u32)(size * 1.5)) * (u32)((page_texture_size.Height - size) / (u32)(size * 1.5));
 		Glyph_Pages.push_back(page);
 	}
 	return page;

gframe/deck_manager.cpp

@@ -81,9 +81,9 @@ int DeckManager::CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tc
 #ifdef YGOPRO_SERVER_MODE
 	if(deck.main.size() < DECKCOUNT_MAIN_MIN || deck.main.size() > DECKCOUNT_MAIN_MAX)
 		return (DECKERROR_MAINCOUNT << 28) + deck.main.size();
-	if(deck.extra.size() > DECKCOUNT_SIDE)
+	if(deck.extra.size() > DECKCOUNT_EXTRA)
 		return (DECKERROR_EXTRACOUNT << 28) + deck.extra.size();
-	if(deck.side.size() > DECKCOUNT_EXTRA)
+	if(deck.side.size() > DECKCOUNT_SIDE)
 		return (DECKERROR_SIDECOUNT << 28) + deck.side.size();
 #else
 	if(deck.main.size() < 40 || deck.main.size() > 60)

gframe/drawing.cpp

@@ -1069,6 +1069,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
 			btnCardDisplay[i]->setDrawImage(false);
 	}
 	win->setRelativePosition(irr::core::recti(center.X, center.Y, 0, 0));
+	win->setVisible(true);
 	fadingList.push_back(fu);
 }
 void Game::HideElement(irr::gui::IGUIElement * win, bool set_action) {

gframe/game.cpp

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

strings.conf

@@ -657,6 +657,7 @@
 !setname 0x12 青蛙	ガエル
 !setname 0x13 机皇	機皇
 !setname 0x3013 机皇帝	機皇帝
+!setname 0x5013 机皇神	機皇神
 !setname 0x6013 机皇兵	機皇兵
 #setname 0x14 N/A
 !setname 0x15 巨大战舰	巨大戦艦