summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-28 21:09:30 +0300
committerAndrei Karas <akaras@inbox.ru>2016-10-28 21:09:30 +0300
commit26a5e61ecf182e06ff2c6a0750ddbd81a944b6fd (patch)
treeff798249432cf785db7c03d32636758e18e11e06
parentf364a75c082beed87dba04261650e5e5a412bd57 (diff)
downloadmv-26a5e61ecf182e06ff2c6a0750ddbd81a944b6fd.tar.gz
mv-26a5e61ecf182e06ff2c6a0750ddbd81a944b6fd.tar.bz2
mv-26a5e61ecf182e06ff2c6a0750ddbd81a944b6fd.tar.xz
mv-26a5e61ecf182e06ff2c6a0750ddbd81a944b6fd.zip
Fix some other small issues.
-rw-r--r--src/client.cpp2
-rw-r--r--src/dyetool/client.cpp2
-rw-r--r--src/game.h2
-rw-r--r--src/utils/copynpaste.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 080d83846..167a8f19c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -497,7 +497,7 @@ void Client::gameInit()
settings.guiAlpha = config.getFloatValue("guialpha");
optionChanged("fpslimit");
- start_time = CAST_S32(time(nullptr));
+ start_time = time(nullptr);
PlayerInfo::init();
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 1d089e4ad..25e4418fe 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -322,7 +322,7 @@ void Client::gameInit()
SDL_initFramerate(&fpsManager);
WindowManager::setFramerate(fpsLimit);
- start_time = CAST_S32(time(nullptr));
+ start_time = time(nullptr);
// PlayerInfo::init();
diff --git a/src/game.h b/src/game.h
index 05b2574f9..767af0ef9 100644
--- a/src/game.h
+++ b/src/game.h
@@ -39,8 +39,8 @@ class Map;
struct LastKey final
{
- InputActionT key;
time_t time;
+ InputActionT key;
int cnt;
};
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 307f7dd22..4ead397ce 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -470,7 +470,7 @@ static bool runxsel(const std::string &text, const char *p1, const char *p2)
// parent
close(fd[0]);
- const int len = CAST_S32(strlen(text.c_str()));
+ const int len = text.length();
if (write(fd[1], text.c_str(), len) != len)
{
close(fd[1]);