From ca130a19b36a78c6a23aa56c6ea82eaa187b0a06 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 29 Aug 2016 01:24:49 +0300
Subject: Use time_t for time values.

---
 src/net/ea/chathandler.cpp  | 2 +-
 src/net/ea/chatrecv.cpp     | 2 +-
 src/net/ea/chatrecv.h       | 2 +-
 src/net/packetcounters.cpp  | 4 ++--
 src/net/tmwa/chatrecv.cpp   | 2 +-
 src/net/tmwa/guildmanager.h | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 8ce8ec59d..44a8cb736 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -35,7 +35,7 @@ ChatHandler::ChatHandler()
 {
     if (!ChatRecv::mSentWhispers.empty())
         ChatRecv::mSentWhispers.pop();
-    ChatRecv::mMotdTime = -1;
+    ChatRecv::mMotdTime = 0;
     ChatRecv::mShowAllLang = serverConfig.getValue("showAllLang", 0);
     ChatRecv::mShowMotd = config.getBoolValue("showmotd");
     ChatRecv::mSkipping = true;
diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp
index 4e4695cf6..ee994b7e4 100644
--- a/src/net/ea/chatrecv.cpp
+++ b/src/net/ea/chatrecv.cpp
@@ -46,7 +46,7 @@ namespace Ea
 namespace ChatRecv
 {
     WhisperQueue mSentWhispers;
-    int mMotdTime = -1;
+    time_t mMotdTime = 0;
     bool mShowAllLang = false;
     bool mShowMotd = false;
     bool mSkipping = true;
diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h
index 374d6c12a..2904fc58b 100644
--- a/src/net/ea/chatrecv.h
+++ b/src/net/ea/chatrecv.h
@@ -53,7 +53,7 @@ namespace Ea
         std::string getLastWhisperNick();
 
         extern WhisperQueue mSentWhispers;
-        extern int mMotdTime;
+        extern time_t mMotdTime;
         extern bool mShowAllLang;
         extern bool mShowMotd;
         extern bool mSkipping;
diff --git a/src/net/packetcounters.cpp b/src/net/packetcounters.cpp
index 13eae4701..f29bb890c 100644
--- a/src/net/packetcounters.cpp
+++ b/src/net/packetcounters.cpp
@@ -24,7 +24,7 @@
 
 #include "debug.h"
 
-extern volatile int cur_time;
+extern volatile time_t cur_time;
 extern volatile bool runCounters;
 
 int PacketCounters::mInCurrentSec = 0;
@@ -108,7 +108,7 @@ void PacketCounters::updateCounter(int &restrict currentSec,
                                    int &restrict calc,
                                    int &restrict counter)
 {
-    const int idx = cur_time % 60;
+    const time_t idx = cur_time % 60;
     if (currentSec != idx)
     {
         currentSec = idx;
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index 54c13545a..1d74fef4c 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -93,7 +93,7 @@ void ChatRecv::processChatContinue(std::string chatMsg,
         channel.empty())
     {
         // skip motd from "new" tmw server
-        if (Ea::ChatRecv::mMotdTime == -1)
+        if (Ea::ChatRecv::mMotdTime == 0)
         {
             Ea::ChatRecv::mMotdTime = cur_time + 1;
         }
diff --git a/src/net/tmwa/guildmanager.h b/src/net/tmwa/guildmanager.h
index 24ace9e77..b47c498d6 100644
--- a/src/net/tmwa/guildmanager.h
+++ b/src/net/tmwa/guildmanager.h
@@ -96,7 +96,7 @@ class GuildManager final
         StringVect mTempList;
         EmulateGuildTab *mTab;
         bool mRequest;
-        int mRequestTime;
+        time_t mRequestTime;
         bool mGotOnlineInfo;
 };
 
-- 
cgit v1.2.3-70-g09d2