Skip to content

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

Merge branch 'server' of git.mycard.moe:mycard/ygopro into server

parents b89a9c77 17cf82e9
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
gframe/deck_manager.h
View file @ c5ea112f
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
#include "client_card.h" #include "client_card.h"
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#ifndef YGOPRO_SERVER_MODE
#include <sstream> #include <sstream>
#endif
#ifndef YGOPRO_MAX_DECK #ifndef YGOPRO_MAX_DECK
#define YGOPRO_MAX_DECK 60 #define YGOPRO_MAX_DECK 60
......
gframe/replay_mode.cpp
View file @ c5ea112f
...@@ -282,7 +282,6 @@ void ReplayMode::EndDuel() { ...@@ -282,7 +282,6 @@ void ReplayMode::EndDuel() {
} }
void ReplayMode::Restart(bool refresh) { void ReplayMode::Restart(bool refresh) {
end_duel(pduel); end_duel(pduel);
mainGame->dInfo.isInDuel = false;
mainGame->dInfo.isStarted = false; mainGame->dInfo.isStarted = false;
mainGame->dInfo.isInDuel = false; mainGame->dInfo.isInDuel = false;
mainGame->dInfo.isFinished = true; mainGame->dInfo.isFinished = true;
......
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