diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-09-12 18:41:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-09-12 18:41:12 +0300 |
| commit | 906e0791682825606f80f72f067f4b19005fe535 (patch) | |
| tree | 0367ebe15da35860bb12b4d9735d5b18236f0d07 | |
| parent | 21c3ddedc9d54fdc263adc758f49ea5688d7b6c3 (diff) | |
| download | manaplus-906e0791682825606f80f72f067f4b19005fe535.tar.gz manaplus-906e0791682825606f80f72f067f4b19005fe535.tar.bz2 manaplus-906e0791682825606f80f72f067f4b19005fe535.tar.xz manaplus-906e0791682825606f80f72f067f4b19005fe535.zip | |
Reenable dyecmd compilation.
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | src/dyetool/client.cpp | 12 | ||||
| -rw-r--r-- | src/dyetool/client.h | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e10a43d2a..1dc58b62b 100755 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_ARG_ENABLE(androidbuild, *) AC_MSG_ERROR(bad value ${enableval} for --enable-androidbuild) ;; esac],[androidbuild_enabled=false]) -AM_CONDITIONAL(ENABLE_DYECMD, test x$androidbuild_enabled = xyes) +AM_CONDITIONAL(ENABLE_DYECMD, test x$androidbuild_enabled != xyes) # Enable nacl build AC_ARG_ENABLE(naclbuild, diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 72e58385e..91a2cbe88 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -728,3 +728,15 @@ int Client::testsExec() { return 0; } + +bool Client::isTmw() +{ + const std::string &name = settings.serverName; + if (name == "server.themanaworld.org" + || name == "themanaworld.org" + || name == "167.114.185.71") + { + return true; + } + return false; +} diff --git a/src/dyetool/client.h b/src/dyetool/client.h index 3e1b64691..40a72ef9d 100644 --- a/src/dyetool/client.h +++ b/src/dyetool/client.h @@ -82,6 +82,8 @@ class Client final : public ActionListener void slowLogic(); + bool isTmw(); + private: void stateGame(); |