From 9ef56393ec31de055638382f649d1519ce75f98f Mon Sep 17 00:00:00 2001 From: yybbwc <1185538857@qq.com> Date: Thu, 20 Feb 2025 12:17:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gframe/CGUITTFont.cpp | 2 +- gframe/client_field.cpp | 16 ++++---- gframe/config.h | 2 +- gframe/deck_con.cpp | 4 +- gframe/deck_manager.cpp | 2 +- gframe/drawing.cpp | 10 +++-- gframe/duelclient.cpp | 86 ++++++++++++++++++++-------------------- gframe/event_handler.cpp | 2 +- gframe/game.cpp | 2 +- gframe/gframe.cpp | 6 +-- gframe/image_manager.cpp | 10 +++-- gframe/menu_handler.cpp | 2 +- gframe/netserver.cpp | 4 +- gframe/replay.cpp | 4 +- gframe/replay_mode.cpp | 2 +- gframe/single_duel.cpp | 8 ++-- gframe/single_mode.cpp | 4 +- gframe/tag_duel.cpp | 8 ++-- 18 files changed, 90 insertions(+), 84 deletions(-) diff --git a/gframe/CGUITTFont.cpp b/gframe/CGUITTFont.cpp index 56a8d74bdb..c0419f92ae 100644 --- a/gframe/CGUITTFont.cpp +++ b/gframe/CGUITTFont.cpp @@ -522,7 +522,7 @@ void CGUITTFont::drawUstring(const core::ustring& utext, const core::rect&p core::map Render_Map; // Start parsing characters. - u32 n; + u32 n = 0; uchar32_t previousChar = 0; core::ustring::const_iterator iter(utext); while (!iter.atEnd()) { diff --git a/gframe/client_field.cpp b/gframe/client_field.cpp index 97e17ee4f0..4570b75fe3 100644 --- a/gframe/client_field.cpp +++ b/gframe/client_field.cpp @@ -121,7 +121,7 @@ void ClientField::Clear() { tag_teammate_surrender = false; } void ClientField::Initial(int player, int deckc, int extrac) { - ClientCard* pcard; + ClientCard* pcard = nullptr; for(int i = 0; i < deckc; ++i) { pcard = new ClientCard; deck[player].push_back(pcard); @@ -360,7 +360,7 @@ void ClientField::UpdateFieldCard(int controler, int location, unsigned char* da } if(!lst) return; - int len; + int len = 0; for(auto cit = lst->begin(); cit != lst->end(); ++cit) { len = BufferIO::ReadInt32(data); if(len > LEN_HEADER) @@ -438,8 +438,8 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) { rnd.shuffle_vector(selectable_cards); } } - int startpos; - int ct; + int startpos = 0; + int ct = 0; if(selectable_cards.size() <= 5) { startpos = 30 + 125 * (5 - selectable_cards.size()) / 2; ct = selectable_cards.size(); @@ -530,8 +530,8 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) { mainGame->PopupElement(mainGame->wCardSelect); } void ClientField::ShowChainCard() { - int startpos; - int ct; + int startpos = 0; + int ct = 0; if(selectable_cards.size() <= 5) { startpos = 30 + 125 * (5 - selectable_cards.size()) / 2; ct = selectable_cards.size(); @@ -584,8 +584,8 @@ void ClientField::ShowChainCard() { mainGame->PopupElement(mainGame->wCardSelect); } void ClientField::ShowLocationCard() { - int startpos; - int ct; + int startpos = 0; + int ct = 0; if(display_cards.size() <= 5) { startpos = 30 + 125 * (5 - display_cards.size()) / 2; ct = display_cards.size(); diff --git a/gframe/config.h b/gframe/config.h index 9bc83e7d3e..3e460c2ffd 100644 --- a/gframe/config.h +++ b/gframe/config.h @@ -10,7 +10,7 @@ #include #include -#ifdef _MSC_VER +#if defined(_MSC_VER) or defined(__GNUC__) #define mywcsncasecmp _wcsnicmp #define mystrncasecmp _strnicmp #else diff --git a/gframe/deck_con.cpp b/gframe/deck_con.cpp index 1fe42be596..99105c2a80 100644 --- a/gframe/deck_con.cpp +++ b/gframe/deck_con.cpp @@ -1232,7 +1232,7 @@ void DeckBuilder::GetHoveredCard() { lx = 12; if(mainsize > 60) dy = 66; - int px; + int px = 0; int py = (y - 164) / dy; hovered_pos = 1; if(x >= 750) @@ -1248,7 +1248,7 @@ void DeckBuilder::GetHoveredCard() { } } } else if(y >= 164 && y <= 435) { - int lx = 10, px, py = (y - 164) / 68; + int lx = 10, px = 0, py = (y - 164) / 68; hovered_pos = 1; if(deckManager.current_deck.main.size() > DECK_MIN_SIZE) lx = (deckManager.current_deck.main.size() - 41) / 4 + 11; diff --git a/gframe/deck_manager.cpp b/gframe/deck_manager.cpp index bee024a147..317f2e93b2 100644 --- a/gframe/deck_manager.cpp +++ b/gframe/deck_manager.cpp @@ -146,7 +146,7 @@ unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) { } int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist) { deck.clear(); - int code; + int code = 0; int errorcode = 0; CardData cd; for(int i = 0; i < mainc; ++i) { diff --git a/gframe/drawing.cpp b/gframe/drawing.cpp index d31825d27e..a0faea3902 100644 --- a/gframe/drawing.cpp +++ b/gframe/drawing.cpp @@ -1,3 +1,5 @@ +#include + #include "game.h" #include "client_card.h" #include "materials.h" @@ -220,7 +222,7 @@ void Game::DrawBackGround() { } void Game::DrawLinkedZones(ClientCard* pcard) { auto mark = pcard->link_marker; - ClientCard* pcard2; + ClientCard* pcard2 = nullptr; if (dField.hovered_sequence < 5) { if (mark & LINK_MARKER_LEFT && dField.hovered_sequence > 0) { pcard2 = dField.mzone[dField.hovered_controler][dField.hovered_sequence - 1]; @@ -601,7 +603,7 @@ void Game::DrawMisc() { driver->draw2DRectangle(Resize(632, 10, 688, 30), 0x00000000, 0x00000000, 0xffffffff, 0xffffffff); driver->draw2DRectangle(Resize(632, 30, 688, 50), 0xffffffff, 0xffffffff, 0x00000000, 0x00000000); DrawShadowText(lpcFont, dataManager.GetNumString(dInfo.turn), Resize(635, 5, 687, 40), Resize(0, 0, 2, 0), 0x8000ffff, 0x80000000, true, false, 0); - ClientCard* pcard; + ClientCard* pcard = nullptr; for(int i = 0; i < 5; ++i) { pcard = dField.mzone[0][i]; if(pcard && pcard->code != 0) @@ -1195,9 +1197,9 @@ void Game::DrawDeckBd() { DrawShadowText(numFont, dataManager.GetNumString(mainsize), Resize(380, 138, 440, 158), Resize(1, 1, 1, 1), 0xffffffff, 0xff000000, false, true); driver->draw2DRectangle(Resize(310, 160, 797, deckBuilder.showing_pack ? 630 : 436), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000); driver->draw2DRectangleOutline(Resize(309, 159, 797, deckBuilder.showing_pack ? 630 : 436)); - int lx; + int lx = 0; int dy = 68; - float dx; + float dx = NAN; if(mainsize <= 40) { dx = 436.0f / 9; lx = 10; diff --git a/gframe/duelclient.cpp b/gframe/duelclient.cpp index 142220c12d..4bb65dd141 100644 --- a/gframe/duelclient.cpp +++ b/gframe/duelclient.cpp @@ -1,5 +1,7 @@ #include "config.h" #include "duelclient.h" + +#include #include "client_card.h" #include "materials.h" #include "image_manager.h" @@ -724,7 +726,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) { auto prep = pdata; Replay new_replay; std::memcpy(&new_replay.pheader, prep, sizeof(new_replay.pheader)); - time_t starttime; + time_t starttime = 0; if (new_replay.pheader.flag & REPLAY_UNIFORM) starttime = new_replay.pheader.start_time; else @@ -1299,9 +1301,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { } case MSG_SELECT_BATTLECMD: { /*int selecting_player = */BufferIO::ReadUInt8(pbuf); - int desc, count, con, seq/*, diratt*/; - unsigned int code, loc; - ClientCard* pcard; + int desc = 0, count = 0, con = 0, seq = 0/*, diratt*/; + unsigned int code = 0, loc = 0; + ClientCard* pcard = nullptr; mainGame->dField.activatable_cards.clear(); mainGame->dField.activatable_descs.clear(); mainGame->dField.conti_cards.clear(); @@ -1364,9 +1366,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { } case MSG_SELECT_IDLECMD: { /*int selecting_player = */BufferIO::ReadUInt8(pbuf); - int desc, count, con, seq; - unsigned int code, loc; - ClientCard* pcard; + int desc = 0, count = 0, con = 0, seq = 0; + unsigned int code = 0, loc = 0; + ClientCard* pcard = nullptr; mainGame->dField.summonable_cards.clear(); count = BufferIO::ReadUInt8(pbuf); for (int i = 0; i < count; ++i) { @@ -1549,15 +1551,15 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { int count = BufferIO::ReadUInt8(pbuf); mainGame->dField.selectable_cards.clear(); mainGame->dField.selected_cards.clear(); - int c, s, ss; - unsigned int l; - unsigned int code; + int c = 0, s = 0, ss = 0; + unsigned int l = 0; + unsigned int code = 0; bool panelmode = false; size_t hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() }; int select_count_in_hand[2] = { 0, 0 }; bool select_ready = mainGame->dField.select_min == 0; mainGame->dField.select_ready = select_ready; - ClientCard* pcard; + ClientCard* pcard = nullptr; for (int i = 0; i < count; ++i) { code = BufferIO::ReadInt32(pbuf); c = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); @@ -1615,14 +1617,14 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { int count1 = BufferIO::ReadUInt8(pbuf); mainGame->dField.selectable_cards.clear(); mainGame->dField.selected_cards.clear(); - int c, s, ss; - unsigned int l; - unsigned int code; + int c = 0, s = 0, ss = 0; + unsigned int l = 0; + unsigned int code = 0; bool panelmode = false; size_t hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() }; int select_count_in_hand[2] = { 0, 0 }; mainGame->dField.select_ready = false; - ClientCard* pcard; + ClientCard* pcard = nullptr; for (int i = 0; i < count1; ++i) { code = (unsigned int)BufferIO::ReadInt32(pbuf); c = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); @@ -1707,9 +1709,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { int forced = BufferIO::ReadUInt8(pbuf); /*int hint0 = */BufferIO::ReadInt32(pbuf); /*int hint1 = */BufferIO::ReadInt32(pbuf); - int c, s, ss, desc; - unsigned int code,l; - ClientCard* pcard; + int c = 0, s = 0, ss = 0, desc = 0; + unsigned int code = 0,l = 0; + ClientCard* pcard = nullptr; bool panelmode = false; bool conti_exist = false; bool select_trigger = (specount == 0x7f); @@ -1826,7 +1828,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { if (mainGame->dInfo.curMsg == MSG_SELECT_PLACE && ( (mainGame->chkMAutoPos->isChecked() && mainGame->dField.selectable_field & 0x7f007f) || (mainGame->chkSTAutoPos->isChecked() && !(mainGame->dField.selectable_field & 0x7f007f)))) { - unsigned int filter; + unsigned int filter = 0; if (mainGame->dField.selectable_field & 0x7f) { respbuf[0] = mainGame->LocalPlayer(0); respbuf[1] = LOCATION_MZONE; @@ -1890,7 +1892,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { SetResponseI(positions); return true; } - int count = 0, filter = 0x1, startpos; + int count = 0, filter = 0x1, startpos = 0; while(filter != 0x10) { if(positions & filter) count++; filter <<= 1; @@ -1936,9 +1938,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { mainGame->dField.selectsum_all.clear(); mainGame->dField.selectsum_cards.clear(); mainGame->dField.select_panalmode = false; - int c, s, t; - unsigned int code, l; - ClientCard* pcard; + int c = 0, s = 0, t = 0; + unsigned int code = 0, l = 0; + ClientCard* pcard = nullptr; mainGame->dField.select_ready = false; for (int i = 0; i < count; ++i) { code = (unsigned int)BufferIO::ReadInt32(pbuf); @@ -1976,9 +1978,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { mainGame->dField.select_counter_count = BufferIO::ReadInt16(pbuf); int count = BufferIO::ReadUInt8(pbuf); mainGame->dField.selectable_cards.clear(); - int c, s, t/*, code*/; - unsigned int l; - ClientCard* pcard; + int c = 0, s = 0, t = 0/*, code*/; + unsigned int l = 0; + ClientCard* pcard = nullptr; for (int i = 0; i < count; ++i) { /*code = */BufferIO::ReadInt32(pbuf); c = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); @@ -2046,9 +2048,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { mainGame->dField.selectable_cards.clear(); mainGame->dField.selected_cards.clear(); mainGame->dField.sort_list.clear(); - int c, s; - unsigned int code, l; - ClientCard* pcard; + int c = 0, s = 0; + unsigned int code = 0, l = 0; + ClientCard* pcard = nullptr; for (int i = 0; i < count; ++i) { code = (unsigned int)BufferIO::ReadInt32(pbuf); c = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); @@ -2069,8 +2071,8 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { case MSG_CONFIRM_DECKTOP: { int player = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); int count = BufferIO::ReadUInt8(pbuf); - unsigned int code; - ClientCard* pcard; + unsigned int code = 0; + ClientCard* pcard = nullptr; mainGame->dField.selectable_cards.clear(); for (int i = 0; i < count; ++i) { code = BufferIO::ReadInt32(pbuf); @@ -2107,8 +2109,8 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { case MSG_CONFIRM_EXTRATOP: { int player = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); int count = BufferIO::ReadUInt8(pbuf); - unsigned int code; - ClientCard* pcard; + unsigned int code = 0; + ClientCard* pcard = nullptr; mainGame->dField.selectable_cards.clear(); for (int i = 0; i < count; ++i) { code = BufferIO::ReadInt32(pbuf); @@ -2144,11 +2146,11 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { case MSG_CONFIRM_CARDS: { /*int player = */mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); int count = BufferIO::ReadUInt8(pbuf); - int c, s; - unsigned int code, l; + int c = 0, s = 0; + unsigned int code = 0, l = 0; std::vector field_confirm; std::vector panel_confirm; - ClientCard* pcard; + ClientCard* pcard = nullptr; if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) { pbuf += count * 7; return true; @@ -2433,9 +2435,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { else lst = mainGame->dField.szone; ClientCard* mc[5]{ nullptr }; - ClientCard* swp; - int c, s, ps; - unsigned int l; + ClientCard* swp = nullptr; + int c = 0, s = 0, ps = 0; + unsigned int l = 0; for (int i = 0; i < count; ++i) { c = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); l = BufferIO::ReadUInt8(pbuf); @@ -3116,7 +3118,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { case MSG_DRAW: { int player = mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf)); int count = BufferIO::ReadUInt8(pbuf); - ClientCard* pcard; + ClientCard* pcard = nullptr; for (int i = 0; i < count; ++i) { unsigned int code = BufferIO::ReadInt32(pbuf); pcard = mainGame->dField.GetCard(player, LOCATION_DECK, mainGame->dField.deck[player].size() - 1 - i); @@ -3417,7 +3419,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { BufferIO::ReadUInt8(pbuf); if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) return true; - float sy; + float sy = NAN; if (ld != 0) { soundManager.PlaySoundEffect(SOUND_ATTACK); mainGame->dField.attack_target = mainGame->dField.GetCard(cd, ld, sd); @@ -4092,7 +4094,7 @@ void DuelClient::BeginRefreshHost() { } int DuelClient::RefreshThread(event_base* broadev) { event_base_dispatch(broadev); - evutil_socket_t fd; + evutil_socket_t fd = 0; event_get_assignment(resp_event, 0, &fd, 0, 0, 0); evutil_closesocket(fd); event_free(resp_event); diff --git a/gframe/event_handler.cpp b/gframe/event_handler.cpp index d8eea2dc1c..7c8dfe1afe 100644 --- a/gframe/event_handler.cpp +++ b/gframe/event_handler.cpp @@ -1650,7 +1650,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { } if(mplayer != hovered_player) { if(mplayer >= 0) { - const wchar_t* player_name; + const wchar_t* player_name = nullptr; if(mplayer == 0) { if(!mainGame->dInfo.isTag || !mainGame->dInfo.tag_player[0]) player_name = mainGame->dInfo.hostname; diff --git a/gframe/game.cpp b/gframe/game.cpp index 21b62c74a1..0b74418a72 100644 --- a/gframe/game.cpp +++ b/gframe/game.cpp @@ -1805,7 +1805,7 @@ int Game::OppositePlayer(int player) { int Game::ChatLocalPlayer(int player) { if(player > 3) return player; - bool is_self; + bool is_self = false; if(dInfo.isStarted || is_siding) { if(dInfo.isInDuel) // when in duel diff --git a/gframe/gframe.cpp b/gframe/gframe.cpp index 744908d91e..da3ab157dc 100644 --- a/gframe/gframe.cpp +++ b/gframe/gframe.cpp @@ -37,7 +37,7 @@ int main(int argc, char* argv[]) { #endif //__APPLE__ #ifdef _WIN32 #ifndef _DEBUG - char* pstrext; + char* pstrext = nullptr; if(argc == 2 && (pstrext = std::strrchr(argv[1], '.')) && (!mystrncasecmp(pstrext, ".ydk", 4) || !mystrncasecmp(pstrext, ".yrp", 4))) { wchar_t exepath[MAX_PATH]; @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) { #endif //_DEBUG #endif //_WIN32 #ifdef _WIN32 - WORD wVersionRequested; + WORD wVersionRequested = 0; WSADATA wsaData; wVersionRequested = MAKEWORD(2, 2); WSAStartup(wVersionRequested, &wsaData); @@ -63,7 +63,7 @@ int main(int argc, char* argv[]) { return 0; #ifdef _WIN32 - int wargc; + int wargc = 0; std::unique_ptr wargv(CommandLineToArgvW(GetCommandLineW(), &wargc), [](wchar_t** wargv) { LocalFree(wargv); }); diff --git a/gframe/image_manager.cpp b/gframe/image_manager.cpp index ad3a0517e6..c2362ecf3c 100644 --- a/gframe/image_manager.cpp +++ b/gframe/image_manager.cpp @@ -1,4 +1,6 @@ #include "image_manager.h" + +#include #include "game.h" #include @@ -128,8 +130,8 @@ void ImageManager::ResizeTexture() { } // function by Warr1024, from https://github.com/minetest/minetest/issues/2419 , modified void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) { - double sx, sy, minsx, maxsx, minsy, maxsy, area, ra, ga, ba, aa, pw, ph, pa; - u32 dy, dx; + double sx = NAN, sy = NAN, minsx = NAN, maxsx = NAN, minsy = NAN, maxsy = NAN, area = NAN, ra = NAN, ga = NAN, ba = NAN, aa = NAN, pw = NAN, ph = NAN, pa = NAN; + u32 dy = 0, dx = 0; irr::video::SColor pxl; // Cache rectsngle boundaries. @@ -201,7 +203,7 @@ void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) { } irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, s32 width, s32 height) { if(mainGame->gameConf.use_image_scale) { - irr::video::ITexture* texture; + irr::video::ITexture* texture = nullptr; irr::video::IImage* srcimg = driver->createImageFromFile(file); if(srcimg == nullptr) return nullptr; @@ -259,7 +261,7 @@ irr::video::ITexture* ImageManager::GetBigPicture(int code, float zoom) { driver->removeTexture(tBigPicture); tBigPicture = nullptr; } - irr::video::ITexture* texture; + irr::video::ITexture* texture = nullptr; char file[256]; snprintf(file, sizeof file, "expansions/pics/%d.jpg", code); irr::video::IImage* srcimg = driver->createImageFromFile(file); diff --git a/gframe/menu_handler.cpp b/gframe/menu_handler.cpp index c7a4b2eade..17dede0eec 100644 --- a/gframe/menu_handler.cpp +++ b/gframe/menu_handler.cpp @@ -551,7 +551,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { } wchar_t infobuf[256]{}; std::wstring repinfo; - time_t curtime; + time_t curtime = 0; if(ReplayMode::cur_replay.pheader.flag & REPLAY_UNIFORM) curtime = ReplayMode::cur_replay.pheader.start_time; else diff --git a/gframe/netserver.cpp b/gframe/netserver.cpp index db0f9a4ec4..e52816a305 100644 --- a/gframe/netserver.cpp +++ b/gframe/netserver.cpp @@ -69,7 +69,7 @@ void NetServer::StopBroadcast() { if(!net_evbase || !broadcast_ev) return; event_del(broadcast_ev); - evutil_socket_t fd; + evutil_socket_t fd = 0; event_get_assignment(broadcast_ev, 0, &fd, 0, 0, 0); evutil_closesocket(fd); event_free(broadcast_ev); @@ -159,7 +159,7 @@ int NetServer::ServerThread() { evconnlistener_free(listener); listener = 0; if(broadcast_ev) { - evutil_socket_t fd; + evutil_socket_t fd = 0; event_get_assignment(broadcast_ev, 0, &fd, 0, 0, 0); evutil_closesocket(fd); event_free(broadcast_ev); diff --git a/gframe/replay.cpp b/gframe/replay.cpp index 6b7c1ffad0..a3e27a67ac 100644 --- a/gframe/replay.cpp +++ b/gframe/replay.cpp @@ -36,7 +36,7 @@ void Replay::BeginRecord() { void Replay::WriteHeader(ReplayHeader& header) { pheader = header; #ifdef _WIN32 - DWORD size; + DWORD size = 0; WriteFile(recording_fp, &header, sizeof(header), &size, nullptr); #else fwrite(&header, sizeof(header), 1, fp); @@ -51,7 +51,7 @@ void Replay::WriteData(const void* data, size_t length, bool flush) { std::memcpy(replay_data + replay_size, data, length); replay_size += length; #ifdef _WIN32 - DWORD size; + DWORD size = 0; WriteFile(recording_fp, data, length, &size, nullptr); #else fwrite(data, length, 1, fp); diff --git a/gframe/replay_mode.cpp b/gframe/replay_mode.cpp index e0815f9dfe..644b11c87b 100644 --- a/gframe/replay_mode.cpp +++ b/gframe/replay_mode.cpp @@ -306,7 +306,7 @@ void ReplayMode::Undo() { } bool ReplayMode::ReplayAnalyze(unsigned char* msg, unsigned int len) { unsigned char* pbuf = msg; - int player, count; + int player = 0, count = 0; is_restarting = false; while (pbuf - msg < (int)len) { if(is_closing) diff --git a/gframe/single_duel.cpp b/gframe/single_duel.cpp index 98f6522f0a..45aab6de6e 100644 --- a/gframe/single_duel.cpp +++ b/gframe/single_duel.cpp @@ -575,8 +575,8 @@ void SingleDuel::Surrender(DuelPlayer* dp) { } // Analyze ocgcore message int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { - unsigned char* offset, *pbufw, *pbuf = msgbuffer; - int player, count, type; + unsigned char* offset = nullptr, *pbufw = nullptr, *pbuf = msgbuffer; + int player = 0, count = 0, type = 0; while (pbuf - msgbuffer < (int)len) { offset = pbuf; unsigned char engType = BufferIO::ReadUInt8(pbuf); @@ -706,7 +706,7 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { player = BufferIO::ReadUInt8(pbuf); pbuf += 3; count = BufferIO::ReadUInt8(pbuf); - int c/*, l, s, ss, code*/; + int c = 0/*, l, s, ss, code*/; for (int i = 0; i < count; ++i) { pbufw = pbuf; /*code = */BufferIO::ReadInt32(pbuf); @@ -724,7 +724,7 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { player = BufferIO::ReadUInt8(pbuf); pbuf += 4; count = BufferIO::ReadUInt8(pbuf); - int c/*, l, s, ss, code*/; + int c = 0/*, l, s, ss, code*/; for (int i = 0; i < count; ++i) { pbufw = pbuf; /*code = */BufferIO::ReadInt32(pbuf); diff --git a/gframe/single_mode.cpp b/gframe/single_mode.cpp index edbd6182aa..9b0e80f432 100644 --- a/gframe/single_mode.cpp +++ b/gframe/single_mode.cpp @@ -178,8 +178,8 @@ int SingleMode::SinglePlayThread() { return 0; } bool SingleMode::SinglePlayAnalyze(unsigned char* msg, unsigned int len) { - unsigned char* offset, * pbuf = msg; - int player, count; + unsigned char* offset = nullptr, * pbuf = msg; + int player = 0, count = 0; while (pbuf - msg < (int)len) { if(is_closing || !is_continuing) return false; diff --git a/gframe/tag_duel.cpp b/gframe/tag_duel.cpp index 47fcfce284..180f9a1364 100644 --- a/gframe/tag_duel.cpp +++ b/gframe/tag_duel.cpp @@ -537,8 +537,8 @@ void TagDuel::Surrender(DuelPlayer* dp) { event_del(etimer); } int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { - unsigned char* offset, *pbufw, *pbuf = msgbuffer; - int player, count, type; + unsigned char* offset = nullptr, *pbufw = nullptr, *pbuf = msgbuffer; + int player = 0, count = 0, type = 0; while (pbuf - msgbuffer < (int)len) { offset = pbuf; unsigned char engType = BufferIO::ReadUInt8(pbuf); @@ -662,7 +662,7 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { player = BufferIO::ReadUInt8(pbuf); pbuf += 3; count = BufferIO::ReadUInt8(pbuf); - int c/*, l, s, ss, code*/; + int c = 0/*, l, s, ss, code*/; for (int i = 0; i < count; ++i) { pbufw = pbuf; /*code = */BufferIO::ReadInt32(pbuf); @@ -680,7 +680,7 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { player = BufferIO::ReadUInt8(pbuf); pbuf += 4; count = BufferIO::ReadUInt8(pbuf); - int c/*, l, s, ss, code*/; + int c = 0/*, l, s, ss, code*/; for (int i = 0; i < count; ++i) { pbufw = pbuf; /*code = */BufferIO::ReadInt32(pbuf); From 6d6730f990938b6ae730ece0f2331e815bbd1ccf Mon Sep 17 00:00:00 2001 From: yybbwc <1185538857@qq.com> Date: Thu, 20 Feb 2025 14:18:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=A2=E7=94=A8=E5=8F=A6=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gframe/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gframe/config.h b/gframe/config.h index 3e460c2ffd..00708bfcbc 100644 --- a/gframe/config.h +++ b/gframe/config.h @@ -10,7 +10,7 @@ #include #include -#if defined(_MSC_VER) or defined(__GNUC__) +#if defined(_MSC_VER) or defined(__MINGW64__) #define mywcsncasecmp _wcsnicmp #define mystrncasecmp _strnicmp #else