fix various random warnings

10 files changed, 13 insertions, 12 deletions

diff --git a/NorthstarDedicatedTest/dedicated.cpp b/NorthstarDedicatedTest/dedicated.cpp
index e628a011..851ab861 100644
--- a/NorthstarDedicatedTest/dedicated.cpp
+++ b/NorthstarDedicatedTest/dedicated.cpp
@@ -247,7 +247,7 @@ void InitialiseDedicated(HMODULE engineAddress)
 		TempReadWrite rw(ptr);
 
 		// remove call to ui loading stuff
-		*ptr = 0x90;
+		*ptr = (char)0x90;
 		*(ptr + 1) = (char)0x90;
 		*(ptr + 2) = (char)0x90;
 		*(ptr + 3) = (char)0x90;
diff --git a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp b/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp
index 7097e11a..1d0e13b6 100644
--- a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp
+++ b/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp
@@ -59,7 +59,7 @@ void InitialiseDedicatedMaterialSystem(HMODULE baseAddress)
 		TempReadWrite rw(ptr);
 
 		// make the game always use the error material
-		*ptr = 0xE9;
+		*ptr = (char)0xE9;
 		*(ptr + 1) = (char)0x34;
 		*(ptr + 2) = (char)0x03;
 		*(ptr + 3) = (char)0x00;
diff --git a/NorthstarDedicatedTest/filesystem.cpp b/NorthstarDedicatedTest/filesystem.cpp
index 89eb9423..1fe3ec9d 100644
--- a/NorthstarDedicatedTest/filesystem.cpp
+++ b/NorthstarDedicatedTest/filesystem.cpp
@@ -57,7 +57,7 @@ std::string ReadVPKFile(const char* path)
 	char data[4096];
 	do
 	{
-		bytesRead = (*g_Filesystem)->m_vtable2->Read(&(*g_Filesystem)->m_vtable2, data, std::size(data), fileHandle);
+		bytesRead = (*g_Filesystem)->m_vtable2->Read(&(*g_Filesystem)->m_vtable2, data, (int)std::size(data), fileHandle);
 		fileStream.write(data, bytesRead);
 	} while (bytesRead == std::size(data));
 
diff --git a/NorthstarDedicatedTest/keyvalues.cpp b/NorthstarDedicatedTest/keyvalues.cpp
index 6de93822..b14ecf42 100644
--- a/NorthstarDedicatedTest/keyvalues.cpp
+++ b/NorthstarDedicatedTest/keyvalues.cpp
@@ -50,7 +50,7 @@ void ModManager::TryBuildKeyValues(const char* filename)
 
 	// copy over patch kv files, and add #bases to new file, last mods' patches should be applied first
 	// note: #include should be identical but it's actually just broken, thanks respawn
-	for (int i = m_loadedMods.size() - 1; i > -1; i--)
+	for (int64_t i = m_loadedMods.size() - 1; i > -1; i--)
 	{
 		if (!m_loadedMods[i].Enabled)
 			continue;
@@ -92,6 +92,7 @@ void ModManager::TryBuildKeyValues(const char* filename)
 
 	char rootName[64];
 	memset(rootName, 0, sizeof(rootName));
+	rootName[63] = '\0';
 
 	// iterate until we hit an ascii char that isn't in a # command or comment to get root obj name
 	int i = 0;
diff --git a/NorthstarDedicatedTest/logging.cpp b/NorthstarDedicatedTest/logging.cpp
index 7791299d..e345f2e8 100644
--- a/NorthstarDedicatedTest/logging.cpp
+++ b/NorthstarDedicatedTest/logging.cpp
@@ -113,7 +113,7 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
 		GetModuleFileNameExA(GetCurrentProcess(), crashedModuleHandle, crashedModuleFullName, MAX_PATH);
 		char* crashedModuleName = strrchr(crashedModuleFullName, '\\') + 1;
 
-		DWORD crashedModuleOffset = ((DWORD)exceptionAddress) - ((DWORD)crashedModuleInfo.lpBaseOfDll);
+		DWORD64 crashedModuleOffset = ((DWORD64)exceptionAddress) - ((DWORD64)crashedModuleInfo.lpBaseOfDll);
 		CONTEXT* exceptionContext = exceptionInfo->ContextRecord;
 
 		spdlog::error("Northstar has crashed! a minidump has been written and exception info is available below:");
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp
index 615197b7..fa3854d3 100644
--- a/NorthstarDedicatedTest/masterserver.cpp
+++ b/NorthstarDedicatedTest/masterserver.cpp
@@ -142,7 +142,7 @@ void MasterServerManager::AuthenticateOriginWithMasterServer(char* uid, char* or
 
 				if (originAuthInfo.HasParseError())
 				{
-					spdlog::error("Failed reading origin auth info response: encountered parse error \{}\"", rapidjson::GetParseError_En(originAuthInfo.GetParseError()));
+					spdlog::error("Failed reading origin auth info response: encountered parse error \"{}\"", rapidjson::GetParseError_En(originAuthInfo.GetParseError()));
 					goto REQUEST_END_CLEANUP;
 				}
 
@@ -509,7 +509,7 @@ void MasterServerManager::AuthenticateWithOwnServer(char* uid, char* playerToken
 						goto REQUEST_END_CLEANUP;
 					}
 
-					newAuthData.pdata[i++] = (char)byte.GetUint();
+					newAuthData.pdata[i++] = static_cast<char>(byte.GetUint());
 				}
 
 				std::lock_guard<std::mutex> guard(g_ServerAuthenticationManager->m_authDataMutex);
@@ -623,7 +623,7 @@ void MasterServerManager::AuthenticateWithServer(char* uid, char* playerToken, c
 				}
 
 				m_pendingConnectionInfo.ip.S_un.S_addr = inet_addr(connectionInfoJson["ip"].GetString());
-				m_pendingConnectionInfo.port = connectionInfoJson["port"].GetInt();
+				m_pendingConnectionInfo.port = (unsigned short)connectionInfoJson["port"].GetUint();
 
 				strncpy(m_pendingConnectionInfo.authToken, connectionInfoJson["authToken"].GetString(), 31);
 				m_pendingConnectionInfo.authToken[31] = 0;
diff --git a/NorthstarDedicatedTest/masterserver.h b/NorthstarDedicatedTest/masterserver.h
index dc06c933..325caadd 100644
--- a/NorthstarDedicatedTest/masterserver.h
+++ b/NorthstarDedicatedTest/masterserver.h
@@ -38,7 +38,7 @@ public:
 	char authToken[32];
 
 	in_addr ip;
-	int port;
+	unsigned short port;
 };
 
 struct MainMenuPromoData
diff --git a/NorthstarDedicatedTest/modmanager.cpp b/NorthstarDedicatedTest/modmanager.cpp
index 4f4a2da0..49c69c78 100644
--- a/NorthstarDedicatedTest/modmanager.cpp
+++ b/NorthstarDedicatedTest/modmanager.cpp
@@ -333,7 +333,7 @@ void ModManager::LoadMods()
 	}
 
 	// in a seperate loop because we register mod files in reverse order, since mods loaded later should have their files prioritised
-	for (int i = m_loadedMods.size() - 1; i > -1; i--)
+	for (size_t i = m_loadedMods.size() - 1; i > -1; i--)
 	{
 		if (!m_loadedMods[i].Enabled)
 			continue;
diff --git a/NorthstarDedicatedTest/playlist.cpp b/NorthstarDedicatedTest/playlist.cpp
index 01a2de6a..1a0cff00 100644
--- a/NorthstarDedicatedTest/playlist.cpp
+++ b/NorthstarDedicatedTest/playlist.cpp
@@ -97,7 +97,7 @@ void InitialisePlaylistHooks(HMODULE baseAddress)
 	{
 		void* ptr = (char*)baseAddress + 0x18ED8D;
 		TempReadWrite rw(ptr);
-		*((char*)ptr) = 0xC3; // jmp => ret
+		*((char*)ptr) = (char)0xC3; // jmp => ret
 	}
 
 	if (IsDedicated())
diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDedicatedTest/serverauthentication.cpp
index 5351dfdc..9a80382b 100644
--- a/NorthstarDedicatedTest/serverauthentication.cpp
+++ b/NorthstarDedicatedTest/serverauthentication.cpp
@@ -160,7 +160,7 @@ bool ServerAuthenticationManager::AuthenticatePlayer(void* player, int64_t uid,
 		
 		// get file length
 		pdataStream.seekg(0, pdataStream.end);
-		int length = pdataStream.tellg();
+		auto length = pdataStream.tellg();
 		pdataStream.seekg(0, pdataStream.beg);
 
 		// copy pdata into buffer