Merge pull request #2981 from mercury233/patch-copilot-fix-1

gframe/CGUITTFont.cpp

@@ -834,6 +834,7 @@ video::IImage* CGUITTFont::createTextureFromChar(const uchar32_t& ch) {
 	core::dimension2du glyph_size(glyph.source_rect.getSize());
 	video::IImage* image = Driver->createImage(format, glyph_size);
 	pageholder->copyTo(image, irr::core::vector2di(0, 0), glyph.source_rect);
+	pageholder->drop();
 
 	tex->unlock();
 	return image;

gframe/deck_con.cpp

@@ -163,6 +163,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				return true;
 				break;
 			}
+			break;
 		}
 		case irr::gui::EGET_BUTTON_CLICKED: {
 			soundManager.PlaySoundEffect(SOUND_BUTTON);
@@ -1011,6 +1012,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				InstantSearch();
 				break;
 			}
+			break;
 		}
 		case irr::gui::EGET_LISTBOX_CHANGED: {
 			switch(id) {

gframe/event_handler.cpp

@@ -907,8 +907,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					} else {
 						if (select_continuous)
 							myswprintf(formatBuffer, L"%ls", dataManager.unknown_string);
-						else if (cant_check_grave && selectable_cards[i]->location == LOCATION_GRAVE)
-							myswprintf(formatBuffer, L"%ls", dataManager.FormatLocation(selectable_cards[i]->location, 0));
+						else if (cant_check_grave && selectable_cards[i + pos]->location == LOCATION_GRAVE)
+							myswprintf(formatBuffer, L"%ls", dataManager.FormatLocation(selectable_cards[i + pos]->location, 0));
 						else if (selectable_cards[i + pos]->location == LOCATION_OVERLAY)
 							myswprintf(formatBuffer, L"%ls[%d](%d)",
 								dataManager.FormatLocation(selectable_cards[i + pos]->overlayTarget), selectable_cards[i + pos]->overlayTarget->sequence + 1, selectable_cards[i + pos]->sequence + 1);

gframe/irrUString.h

@@ -197,7 +197,7 @@ public:
 		//! \return Myself.
 		_Iter& operator-=(const difference_type v) {
 			if(v == 0) return *this;
-			if(v > 0) return operator+=(v * -1);
+			if(v < 0) return operator+=(-v);
 
 			if(pos == 0)
 				return *this;

gframe/myfilesystem.h

@@ -18,6 +18,7 @@
 
 #define NOMINMAX
 #include <Windows.h>
+#include <shellapi.h>
 
 class FileSystem {
 public:
@@ -71,13 +72,18 @@ public:
 	}
 
 	static bool DeleteDir(const wchar_t* wdir) {
-		wchar_t pdir[256];
+		size_t len = std::wcslen(wdir);
+		wchar_t pdir[1024 + 1]{};
+		if(len >= 1024)
+			return false;
 		BufferIO::CopyWideString(wdir, pdir);
+		// pFrom must be double-null terminated for SHFileOperationW
+		// pdir[len] is already '\0' and pdir[len+1] is '\0' due to zero-init
 		SHFILEOPSTRUCTW lpFileOp{};
 		lpFileOp.hwnd = nullptr;
 		lpFileOp.wFunc = FO_DELETE;
 		lpFileOp.pFrom = pdir;
-		lpFileOp.pTo = 0;
+		lpFileOp.pTo = nullptr;
 		lpFileOp.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
 		return SHFileOperationW(&lpFileOp) == 0;
 	}

gframe/single_duel.h

@@ -17,7 +17,7 @@ public:
 	void LeaveGame(DuelPlayer* dp) override;
 	void ToDuelist(DuelPlayer* dp) override;
 	void ToObserver(DuelPlayer* dp) override;
-	void PlayerReady(DuelPlayer* dp, bool ready) override;
+	void PlayerReady(DuelPlayer* dp, bool is_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;

gframe/sound_manager.cpp

@@ -257,7 +257,7 @@ bool SoundManager::IsPlayingMusic(wchar_t* music) {
 	if(music) {
 		return !mywcsncasecmp(currentPlayingMusic, music, 1024) && ma_sound_is_playing(&soundBGM);
 	} else {
-		return ma_sound_is_playing(&soundBGM);
+		return currentPlayingMusic[0] && ma_sound_is_playing(&soundBGM);
 	}
 #endif
 #ifdef YGOPRO_USE_IRRKLANG

gframe/tag_duel.cpp

@@ -143,7 +143,6 @@ void TagDuel::LeaveGame(DuelPlayer* dp) {
 					NetServer::SendPacketToPlayer(players[i], STOC_HS_PLAYER_CHANGE, scpc);
 			for(auto pit = observers.begin(); pit != observers.end(); ++pit)
 				NetServer::SendPacketToPlayer(*pit, STOC_HS_PLAYER_CHANGE, scpc);
-			NetServer::DisconnectPlayer(dp);
 		} else if(duel_stage != DUEL_STAGE_END) {
 			EndDuel();
 			DuelEndProc();
@@ -228,7 +227,7 @@ void TagDuel::PlayerReady(DuelPlayer* dp, bool is_ready) {
 		unsigned int deckerror = 0;
 		if(!host_info.no_check_deck) {
 			if(deck_error[dp->type]) {
-				deckerror = (DECKERROR_UNKNOWNCARD << 28) + deck_error[dp->type];
+				deckerror = (DECKERROR_UNKNOWNCARD << 28) | deck_error[dp->type];
 			} else {
 				deckerror = deckManager.CheckDeck(pdeck[dp->type], host_info.lflist, host_info.rule);
 			}

gframe/tag_duel.h

@@ -17,7 +17,7 @@ public:
 	void LeaveGame(DuelPlayer* dp) override;
 	void ToDuelist(DuelPlayer* dp) override;
 	void ToObserver(DuelPlayer* dp) override;
-	void PlayerReady(DuelPlayer* dp, bool ready) override;
+	void PlayerReady(DuelPlayer* dp, bool is_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;