aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL
diff options
context:
space:
mode:
Diffstat (limited to 'NorthstarDLL')
-rw-r--r--NorthstarDLL/logging/logging.cpp2
-rw-r--r--NorthstarDLL/server/serverchathooks.h2
-rw-r--r--NorthstarDLL/server/servernethooks.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/NorthstarDLL/logging/logging.cpp b/NorthstarDLL/logging/logging.cpp
index 53795ef0..9627f9c1 100644
--- a/NorthstarDLL/logging/logging.cpp
+++ b/NorthstarDLL/logging/logging.cpp
@@ -134,7 +134,7 @@ void InitialiseConsole()
if (!strstr(GetCommandLineA(), "-noansiclr"))
{
g_bSpdLog_UseAnsiColor = true;
- DWORD dwMode = NULL;
+ DWORD dwMode = 0;
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
GetConsoleMode(hOutput, &dwMode);
diff --git a/NorthstarDLL/server/serverchathooks.h b/NorthstarDLL/server/serverchathooks.h
index 8fda3cec..d033e769 100644
--- a/NorthstarDLL/server/serverchathooks.h
+++ b/NorthstarDLL/server/serverchathooks.h
@@ -9,7 +9,7 @@ enum class CustomMessageType : char
};
constexpr unsigned char CUSTOM_MESSAGE_INDEX_BIT = 0b10000000;
-constexpr unsigned char CUSTOM_MESSAGE_INDEX_MASK = ~CUSTOM_MESSAGE_INDEX_BIT;
+constexpr unsigned char CUSTOM_MESSAGE_INDEX_MASK = (unsigned char)~CUSTOM_MESSAGE_INDEX_BIT;
// Send a vanilla chat message as if it was from the player.
void ChatSendMessage(unsigned int playerIndex, const char* text, bool isteam);
diff --git a/NorthstarDLL/server/servernethooks.cpp b/NorthstarDLL/server/servernethooks.cpp
index 905d3251..f74f2d38 100644
--- a/NorthstarDLL/server/servernethooks.cpp
+++ b/NorthstarDLL/server/servernethooks.cpp
@@ -18,8 +18,8 @@ constexpr size_t HMACSHA256_LEN = 256 / 8;
static bool InitHMACSHA256()
{
NTSTATUS status;
- DWORD hashLength = NULL;
- ULONG hashLengthSz = NULL;
+ DWORD hashLength = 0;
+ ULONG hashLengthSz = 0;
if ((status = BCryptOpenAlgorithmProvider(&HMACSHA256, BCRYPT_SHA256_ALGORITHM, NULL, BCRYPT_ALG_HANDLE_HMAC_FLAG)))
{