From 35b424c5318d83d8de79c64559ebc7ce7a808aee Mon Sep 17 00:00:00 2001
From: CPunch <sethtstubbs@gmail.com>
Date: Sat, 22 Aug 2020 13:38:27 -0500
Subject: [PATCH] fixed warnings for VC++

---
 src/CNProtocol.hpp    |  2 +-
 src/CNShardServer.cpp |  2 +-
 src/CNStructs.cpp     |  2 +-
 src/CNStructs.hpp     |  2 +-
 src/Defines.hpp       | 12 ++++++------
 src/PlayerManager.hpp |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/CNProtocol.hpp b/src/CNProtocol.hpp
index 5887384..8f87962 100644
--- a/src/CNProtocol.hpp
+++ b/src/CNProtocol.hpp
@@ -133,7 +133,7 @@ protected:
     void init();
 
     bool active = true;
-    long int lastTimer;
+    uint64_t lastTimer;
 
 public:
     PacketHandler pHandler;
diff --git a/src/CNShardServer.cpp b/src/CNShardServer.cpp
index 6aa26b4..e603d01 100644
--- a/src/CNShardServer.cpp
+++ b/src/CNShardServer.cpp
@@ -37,7 +37,7 @@ void CNShardServer::killConnection(CNSocket* cns) {
 }
 
 void CNShardServer::onTimer() {
-    long int currTime = getTime();
+    uint64_t currTime = getTime();
 
     auto cachedPlayers = PlayerManager::players;
 
diff --git a/src/CNStructs.cpp b/src/CNStructs.cpp
index b580cc3..c58c6fe 100644
--- a/src/CNStructs.cpp
+++ b/src/CNStructs.cpp
@@ -10,7 +10,7 @@ std::string U16toU8(char16_t* src) {
 }
 
 // returns number of char16_t that was written at des
-int U8toU16(std::string src, char16_t* des) {
+size_t U8toU16(std::string src, char16_t* des) {
     std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t> convert; 
     std::u16string tmp = convert.from_bytes(src);
 
diff --git a/src/CNStructs.hpp b/src/CNStructs.hpp
index 113d794..6adebec 100644
--- a/src/CNStructs.hpp
+++ b/src/CNStructs.hpp
@@ -28,7 +28,7 @@
 // TODO: rewrite U16toU8 & U8toU16 to not use codecvt
 
 std::string U16toU8(char16_t* src);
-int U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des
+size_t U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des
 uint64_t getTime();
 
 // The PROTOCOL_VERSION definition is defined by the build system.
diff --git a/src/Defines.hpp b/src/Defines.hpp
index a10fa75..21eb8f2 100644
--- a/src/Defines.hpp
+++ b/src/Defines.hpp
@@ -8,12 +8,12 @@
  * implementing just yet anyway.
  */
 
-const float VALUE_BATTERY_EMPTY_PENALTY = 0.5;
-const float CN_EP_RANK_1 = 0.8;
-const float CN_EP_RANK_2 = 0.7;
-const float CN_EP_RANK_3 = 0.5;
-const float CN_EP_RANK_4 = 0.3;
-const float CN_EP_RANK_5 = 0.29;
+const float VALUE_BATTERY_EMPTY_PENALTY = 0.5f;
+const float CN_EP_RANK_1 = 0.8f;
+const float CN_EP_RANK_2 = 0.7f;
+const float CN_EP_RANK_3 = 0.5f;
+const float CN_EP_RANK_4 = 0.3f;
+const float CN_EP_RANK_5 = 0.29f;
 
 enum {
     SUCC = 1,
diff --git a/src/PlayerManager.hpp b/src/PlayerManager.hpp
index 3105f51..34cfb6a 100644
--- a/src/PlayerManager.hpp
+++ b/src/PlayerManager.hpp
@@ -13,7 +13,7 @@ struct PlayerView {
     std::list<CNSocket*> viewable;
     std::list<int32_t> viewableNPCs;
     Player plr;
-    int long lastHeartbeat;
+    uint64_t lastHeartbeat;
 };