Move manaplus game related files into progs/manaplus.

1 files changed, 1 insertions, 145 deletions

diff --git a/src/client.h b/src/client.h
index 6c6888f52..feead38e4 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,7 +1,5 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
  *  Copyright (C) 2011-2017  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
@@ -25,149 +23,7 @@
 
 #ifdef DYECMD
 #include "progs/dyecmd/client.h"
-
 #else  // DYECMD
-
-#include "enums/state.h"
-
-#include "listeners/actionlistener.h"
-#include "listeners/configlistener.h"
-
-#include "net/serverinfo.h"
-
-#include "localconsts.h"
-
-class Button;
-class Game;
-class LoginData;
-class Skin;
-class Window;
-class QuitDialog;
-
-extern bool isSafeMode;
-extern int serverVersion;
-extern unsigned int tmwServerVersion;
-extern time_t start_time;
-extern int textures_count;
-
-extern std::string errorMessage;
-extern LoginData loginData;
-
-/**
- * The core part of the client. This class initializes all subsystems, runs
- * the event loop, and shuts everything down again.
- */
-class Client final : public ConfigListener,
-                     public ActionListener
-{
-    public:
-        Client();
-
-        A_DELETE_COPY(Client)
-
-        ~Client();
-
-        void gameInit();
-
-        void testsInit();
-
-        int gameExec();
-
-        static int testsExec();
-
-        void setState(const StateT state)
-        { mState = state; }
-
-        StateT getState() const noexcept2 A_WARN_UNUSED
-        { return mState; }
-
-        static bool isTmw() A_WARN_UNUSED;
-
-        void optionChanged(const std::string &name) override final;
-
-        void action(const ActionEvent &event) override final;
-
-        static void initTradeFilter();
-
-        void moveButtons(const int width);
-
-        void windowRemoved(const Window *const window);
-
-        void slowLogic();
-
-        ServerInfo &getCurrentServer()
-        { return mCurrentServer; }
-
-    private:
-        void initSoundManager();
-
-        void initConfigListeners();
-
-        static void initGraphics();
-
-        static void initFeatures();
-
-        static void initPaths();
-
-        void gameClear();
-
-        void testsClear();
-
-#ifdef ANDROID
-        static void logVars();
-#else  // ANDROID
-
-        static void logVars() A_CONST;
-#endif  // ANDROID
-
-        void stateConnectGame1();
-
-        void stateConnectServer1();
-
-        void stateWorldSelect1();
-
-        void stateGame1();
-
-        void stateSwitchLogin1();
-
-        void loadData();
-
-        void unloadData();
-
-        void runValidate()
-#ifndef BAD_CILKPLUS
-        __attribute__ ((noreturn))
-#endif  // BAD_CILKPLUS
-;
-
-        ServerInfo mCurrentServer;
-
-        Game *mGame;
-        Window *mCurrentDialog;
-        QuitDialog *mQuitDialog;
-        Button *mSetupButton;
-        Button *mVideoButton;
-        Button *mHelpButton;
-        Button *mAboutButton;
-        Button *mThemesButton;
-        Button *mPerfomanceButton;
-#ifdef ANDROID
-        Button *mCloseButton;
-#endif  // ANDROID
-
-        StateT mState;
-        StateT mOldState;
-
-        Skin *mSkin;
-        int mButtonPadding;
-        int mButtonSpacing;
-        int mPing;
-        bool mConfigAutoSaved;
-};
-
-extern Client *client;
-extern unsigned int mLastHost;
-extern unsigned long mSearchHash;
-
+#include "progs/manaplus/client.h"
 #endif  // DYECMD
 #endif  // CLIENT_H