summaryrefslogtreecommitdiff
path: root/src/client.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-04 20:53:28 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-04 20:58:00 +0300
commit11b1348fd4b52a35851a03a9c50bd962e385a6a9 (patch)
treecff1c3237c2cf05cb9f4de9b5084762ce374a947 /src/client.h
parenta7aa62d82574128cba8fd3c10d29e2bbcfca305d (diff)
downloadmanaplus-11b1348fd4b52a35851a03a9c50bd962e385a6a9.tar.gz
manaplus-11b1348fd4b52a35851a03a9c50bd962e385a6a9.tar.bz2
manaplus-11b1348fd4b52a35851a03a9c50bd962e385a6a9.tar.xz
manaplus-11b1348fd4b52a35851a03a9c50bd962e385a6a9.zip
Add ability for testing drivers and graphics.
Diffstat (limited to 'src/client.h')
-rw-r--r--src/client.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/src/client.h b/src/client.h
index fcb14a660..22eb406eb 100644
--- a/src/client.h
+++ b/src/client.h
@@ -163,6 +163,7 @@ public:
chooseDefault(false),
noOpenGL(false),
safeMode(false),
+ testMode(false),
serverPort(0)
{}
@@ -184,6 +185,8 @@ public:
std::string localDataDir;
std::string screenshotDir;
bool safeMode;
+ bool testMode;
+ std::string test;
std::string serverName;
short serverPort;
@@ -198,7 +201,13 @@ public:
static Client *instance()
{ return mInstance; }
- int exec();
+ void gameInit();
+
+ void testsInit();
+
+ int gameExec();
+
+ int testsExec();
static void setState(State state)
{ instance()->mState = state; }
@@ -280,19 +289,33 @@ public:
private:
void initRootDir();
+
void initHomeDir();
+
void initConfiguration();
+
+ void initLocalDataDir();
+
+ void initConfigDir();
+
void initUpdatesDir();
+
void initScreenshotDir();
+
void initServerConfig(std::string serverName);
bool copyFile(std::string &configPath, std::string &oldConfigPath);
+
bool createConfig(std::string &configPath);
void accountLogin(LoginData *data);
void storeSafeParameters();
+ void gameClear();
+
+ void testsClear();
+
static Client *mInstance;
Options mOptions;