Skip to content

Y
ygopro
Commit 15cedd84 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into another

parents 222bb5b0 d419e6c7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
gframe/client_card.cpp
View file @ 15cedd84
...@@ -125,6 +125,8 @@ void ClientCard::UpdateInfo(char* buf) { ...@@ -125,6 +125,8 @@ void ClientCard::UpdateInfo(char* buf) {
base_defense = BufferIO::ReadInt32(buf); base_defense = BufferIO::ReadInt32(buf);
if(flag & QUERY_REASON) if(flag & QUERY_REASON)
reason = BufferIO::ReadInt32(buf); reason = BufferIO::ReadInt32(buf);
if(flag & QUERY_REASON_CARD)
BufferIO::ReadInt32(buf);
if(flag & QUERY_EQUIP_CARD) { if(flag & QUERY_EQUIP_CARD) {
int c = BufferIO::ReadInt8(buf); int c = BufferIO::ReadInt8(buf);
int l = BufferIO::ReadInt8(buf); int l = BufferIO::ReadInt8(buf);
......
gframe/game.cpp
View file @ 15cedd84
...@@ -1015,7 +1015,6 @@ void Game::RefreshSingleplay() { ...@@ -1015,7 +1015,6 @@ void Game::RefreshSingleplay() {
void Game::RefreshLocales() { void Game::RefreshLocales() {
cbLocale->clear(); cbLocale->clear();
cbLocale->addItem(L"default"); cbLocale->addItem(L"default");
cbLocale->clear();
FileSystem::TraversalDir(L"./locales", [this](const wchar_t* name, bool isdir) { FileSystem::TraversalDir(L"./locales", [this](const wchar_t* name, bool isdir) {
if(isdir && wcscmp(name, L".") && wcscmp(name, L"..")) if(isdir && wcscmp(name, L".") && wcscmp(name, L".."))
cbLocale->addItem(name); cbLocale->addItem(name);
......
script @ beb61ff9
Subproject commit aaef0a01369bd09bf0e4dd812483df1d0f856f3a Subproject commit beb61ff9ab0e46a62e6d88cd6d23da7aa55ad8e1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment