diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-05-18 01:57:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-05-19 00:31:16 +0300 |
| commit | 804154afbee8843dde358837ec18ab7bfb785088 (patch) | |
| tree | d0b58bea9b13e37dc44c7bf9487d3cde2a7991f6 /src/test/testmain.h | |
| parent | f35d6cd35d92ad16a55bf49f61f19153949497c0 (diff) | |
| download | manaverse-804154afbee8843dde358837ec18ab7bfb785088.tar.gz manaverse-804154afbee8843dde358837ec18ab7bfb785088.tar.bz2 manaverse-804154afbee8843dde358837ec18ab7bfb785088.tar.xz manaverse-804154afbee8843dde358837ec18ab7bfb785088.zip | |
Add button "detect best video mode" in video settings (windows only).
Diffstat (limited to 'src/test/testmain.h')
| -rw-r--r-- | src/test/testmain.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/test/testmain.h b/src/test/testmain.h index 8e5ce162f..281cdab3a 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -21,6 +21,7 @@ #ifndef TEST_TESTMAIN_H #define TEST_TESTMAIN_H +#include "configuration.h" #include "logger.h" #include <string> @@ -30,13 +31,16 @@ class TestMain public: TestMain(); - int exec(); + int exec(bool testAudio = true); + + static int readValue(int ver, int def); + + Configuration &getConfig() + { return mConfig; } private: void initConfig(); - int readValue(int ver, int def = 0); - int invokeTest(std::string test); int invokeTest3(); @@ -56,9 +60,11 @@ class TestMain void writeConfig(int openGLMode, int rescale, int sound, std::string info); + int readValue2(int ver); + Logger *log; - std::ifstream file; + Configuration mConfig; }; #endif // TEST_TESTMAIN_H |