diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-21 23:11:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-21 23:22:06 +0300 |
| commit | 67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf (patch) | |
| tree | 0efb80c3cf13e5f859c522da923cf7fddac90bc5 /src/client.cpp | |
| parent | 73f36dd1934b3d0cdd52f13cab15480de4d0b9d2 (diff) | |
| download | mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.gz mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.bz2 mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.xz mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.zip | |
fix code style and some other fixes after auto checks.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp index 6cd3967fc..e22f50fea 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -655,7 +655,7 @@ void Client::gameInit() if (mCurrentServer.port == 0) { mCurrentServer.port = static_cast<uint16_t>(branding.getValue( - "defaultPort", DEFAULT_PORT)); + "defaultPort", static_cast<int>(DEFAULT_PORT))); mCurrentServer.type = ServerInfo::parseType( branding.getValue("defaultServerType", "tmwathena")); } @@ -722,7 +722,7 @@ void Client::setEnv(const char *const name, const char *const value) if (!name || !value) return; #ifdef WIN32 - if (putenv(reinterpret_cast<char*>((std::string(name) + if (putenv(const_cast<char*>((std::string(name) + "=" + value).c_str()))) #else if (setenv(name, value, 1)) |