diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-29 02:16:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-29 02:16:00 +0300 |
| commit | c2bc6bcf77d737ba52ecfb8f04baae2fb541a542 (patch) | |
| tree | ec8161556c7bc3ad37b2b19057bf4b86e2a75d3c | |
| parent | ca130a19b36a78c6a23aa56c6ea82eaa187b0a06 (diff) | |
| download | manaverse-c2bc6bcf77d737ba52ecfb8f04baae2fb541a542.tar.gz manaverse-c2bc6bcf77d737ba52ecfb8f04baae2fb541a542.tar.bz2 manaverse-c2bc6bcf77d737ba52ecfb8f04baae2fb541a542.tar.xz manaverse-c2bc6bcf77d737ba52ecfb8f04baae2fb541a542.zip | |
Fix some cast issues.
| -rw-r--r-- | src/game.cpp | 4 | ||||
| -rw-r--r-- | src/gui/viewport.h | 2 | ||||
| -rw-r--r-- | src/net/ea/chatrecv.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index 789f87120..d9ad1cb47 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -151,7 +151,7 @@ QuitDialog *quitDialog = nullptr; Window *disconnectedDialog = nullptr; bool mStatsReUpdated = false; -const unsigned adjustDelay = 10; +const time_t adjustDelay = 10; /** * Initialize every game sub-engines in the right order @@ -730,7 +730,7 @@ void Game::adjustPerfomance() { mNextAdjustTime = time + adjustDelay; } - else if (mNextAdjustTime < CAST_U32(time)) + else if (mNextAdjustTime < time) { mNextAdjustTime = time + adjustDelay; diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 802ba8ffe..cbe48c7c4 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -238,7 +238,7 @@ class Viewport final : public WindowContainer, int mViewXmax; int mViewYmax; - time_t mLocalWalkTime; /**< Timestamp before the next walk can be sent. */ + time_t mLocalWalkTime; int mCameraRelativeX; int mCameraRelativeY; diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index 2904fc58b..c7e1c3aca 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -33,6 +33,7 @@ #include <string> #include <queue> +#include <time.h> namespace Net { |