Skip to content

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

Merge branch 'auto_watch_mode'

parents 8d671c2c 7bcccb33
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 9 deletions
gframe/config.h
View file @ 59235619
...@@ -88,6 +88,7 @@ using namespace gui; ...@@ -88,6 +88,7 @@ using namespace gui;
extern unsigned short PRO_VERSION; extern unsigned short PRO_VERSION;
extern int enable_log; extern int enable_log;
extern bool exit_on_return; extern bool exit_on_return;
extern bool auto_watch_mode;
extern bool open_file; extern bool open_file;
extern wchar_t open_file_name[256]; extern wchar_t open_file_name[256];
extern bool bot_mode; extern bool bot_mode;
......
gframe/duelclient.cpp
View file @ 59235619
...@@ -728,14 +728,16 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -728,14 +728,16 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame->dInfo.isReplaySkiping = false; mainGame->dInfo.isReplaySkiping = false;
mainGame->wSurrender->setVisible(false); mainGame->wSurrender->setVisible(false);
mainGame->stMessage->setText(dataManager.GetSysString(1500)); mainGame->stMessage->setText(dataManager.GetSysString(1500));
mainGame->PopupElement(mainGame->wMessage); if(!auto_watch_mode) {
mainGame->gMutex.Unlock(); mainGame->PopupElement(mainGame->wMessage);
mainGame->actionSignal.Reset(); mainGame->gMutex.Unlock();
mainGame->actionSignal.Wait(); mainGame->actionSignal.Reset();
mainGame->closeDoneSignal.Reset(); mainGame->actionSignal.Wait();
mainGame->closeSignal.Set(); mainGame->closeDoneSignal.Reset();
mainGame->closeDoneSignal.Wait(); mainGame->closeSignal.Set();
mainGame->gMutex.Lock(); mainGame->closeDoneSignal.Wait();
mainGame->gMutex.Lock();
}
mainGame->dInfo.isStarted = false; mainGame->dInfo.isStarted = false;
mainGame->dInfo.isFinished = true; mainGame->dInfo.isFinished = true;
mainGame->dInfo.announce_cache.clear(); mainGame->dInfo.announce_cache.clear();
...@@ -2173,7 +2175,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2173,7 +2175,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} }
mainGame->WaitFrameSignal(5); mainGame->WaitFrameSignal(5);
} }
if (panel_confirm.size()) { if (panel_confirm.size() && !auto_watch_mode) {
std::sort(panel_confirm.begin(), panel_confirm.end(), ClientCard::client_card_sort); std::sort(panel_confirm.begin(), panel_confirm.end(), ClientCard::client_card_sort);
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->dField.selectable_cards = panel_confirm; mainGame->dField.selectable_cards = panel_confirm;
......
gframe/gframe.cpp
View file @ 59235619
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
int enable_log = 0; int enable_log = 0;
bool exit_on_return = false; bool exit_on_return = false;
bool auto_watch_mode = false;
bool open_file = false; bool open_file = false;
wchar_t open_file_name[256] = L""; wchar_t open_file_name[256] = L"";
bool bot_mode = false; bool bot_mode = false;
...@@ -113,6 +114,8 @@ int main(int argc, char* argv[]) { ...@@ -113,6 +114,8 @@ int main(int argc, char* argv[]) {
} else if(!wcscmp(wargv[i], L"-k")) { // Keep on return } else if(!wcscmp(wargv[i], L"-k")) { // Keep on return
exit_on_return = false; exit_on_return = false;
keep_on_return = true; keep_on_return = true;
} else if(!wcscmp(wargv[i], L"--auto-watch")) { // Auto watch mode
auto_watch_mode = true;
} else if(!wcscmp(wargv[i], L"-d")) { // Deck } else if(!wcscmp(wargv[i], L"-d")) { // Deck
++i; ++i;
if(i + 1 < wargc) { // select deck if(i + 1 < wargc) { // select deck
......
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