summaryrefslogtreecommitdiff
path: root/src/client.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-29 12:53:30 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:42 +0300
commit38aea9a883ec792d49bee91bfcec5468c15eff7a (patch)
treeb3315bd1bb7d673ec55be1ed77594ba4a895540e /src/client.h
parent5f048b85f826a85278545ac363d7058793fb3ece (diff)
downloadmv-38aea9a883ec792d49bee91bfcec5468c15eff7a.tar.gz
mv-38aea9a883ec792d49bee91bfcec5468c15eff7a.tar.bz2
mv-38aea9a883ec792d49bee91bfcec5468c15eff7a.tar.xz
mv-38aea9a883ec792d49bee91bfcec5468c15eff7a.zip
Move options into settings.
Diffstat (limited to 'src/client.h')
-rw-r--r--src/client.h62
1 files changed, 1 insertions, 61 deletions
diff --git a/src/client.h b/src/client.h
index 06bc1faf0..e2e5a84de 100644
--- a/src/client.h
+++ b/src/client.h
@@ -95,62 +95,7 @@ class Client final : public ConfigListener,
public ActionListener
{
public:
- /**
- * A structure holding the values of various options that can be passed
- * from the command line.
- */
- struct Options
- {
- Options() :
- username(),
- password(),
- character(),
- brandingPath(),
- updateHost(),
- dataPath(),
- homeDir(),
- logFileName(),
- chatLogDir(),
- configDir(),
- localDataDir(),
- screenshotDir(),
- test(),
- serverName(),
- serverPort(0),
- printHelp(false),
- printVersion(false),
- skipUpdate(false),
- chooseDefault(false),
- noOpenGL(false),
- safeMode(false),
- testMode(false)
- {}
-
- std::string username;
- std::string password;
- std::string character;
- std::string brandingPath;
- std::string updateHost;
- std::string dataPath;
- std::string homeDir;
- std::string logFileName;
- std::string chatLogDir;
- std::string configDir;
- std::string localDataDir;
- std::string screenshotDir;
- std::string test;
- std::string serverName;
- uint16_t serverPort;
- bool printHelp;
- bool printVersion;
- bool skipUpdate;
- bool chooseDefault;
- bool noOpenGL;
- bool safeMode;
- bool testMode;
- };
-
- explicit Client(const Options &options);
+ explicit Client();
A_DELETE_COPY(Client)
@@ -189,9 +134,6 @@ public:
void setMouseFocused(const bool n)
{ mMouseFocused = n; }
- const Options &getOptions() const A_WARN_UNUSED
- { return mOptions; }
-
bool isKeyboardVisible() const;
void setGuiAlpha(const float n)
@@ -314,8 +256,6 @@ private:
#endif
#endif
- Options mOptions;
-
std::string mRootDir;
std::string mLogFileName;