Skip to content

Y
ygopro
Commit 551606a6 authored by mercury233's avatar mercury233
Browse files
Options

test

parent 39b8c2f9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
gframe/game.cpp
View file @ 551606a6
...@@ -658,8 +658,6 @@ bool Game::Initialize() { ...@@ -658,8 +658,6 @@ bool Game::Initialize() {
hideChatTimer = 0; hideChatTimer = 0;
return true; return true;
} }
void Game::MainLoop() { void Game::MainLoop() {
wchar_t cap[256]; wchar_t cap[256];
camera = smgr->addCameraSceneNode(0); camera = smgr->addCameraSceneNode(0);
......
gframe/game.h
View file @ 551606a6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
namespace ygo { namespace ygo {
#ifndef YGOPRO_SERVER_MODE
struct Config { struct Config {
bool use_d3d; bool use_d3d;
unsigned short antialias; unsigned short antialias;
...@@ -67,7 +68,7 @@ struct DuelInfo { ...@@ -67,7 +68,7 @@ struct DuelInfo {
unsigned short time_limit; unsigned short time_limit;
unsigned short time_left[2]; unsigned short time_left[2];
}; };
#ifndef YGOPRO_SERVER_MODE
struct FadingUnit { struct FadingUnit {
bool signalAction; bool signalAction;
bool isFadein; bool isFadein;
...@@ -80,6 +81,7 @@ struct FadingUnit { ...@@ -80,6 +81,7 @@ struct FadingUnit {
irr::core::vector2di fadingDiff; irr::core::vector2di fadingDiff;
}; };
#endif //YGOPRO_SERVER_MODE #endif //YGOPRO_SERVER_MODE
class Game { class Game {
public: public:
...@@ -140,9 +142,7 @@ public: ...@@ -140,9 +142,7 @@ public:
Signal singleSignal; Signal singleSignal;
Signal closeSignal; Signal closeSignal;
Signal closeDoneSignal; Signal closeDoneSignal;
#endif //YGOPRO_SERVER_MODE
Config gameConf; Config gameConf;
#ifndef YGOPRO_SERVER_MODE
DuelInfo dInfo; DuelInfo dInfo;
std::list<FadingUnit> fadingList; std::list<FadingUnit> fadingList;
......
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