diff --git a/.gitignore b/.gitignore
index a3191f6e..6301d17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,9 +36,10 @@ build*/
Build*/
.vs/
.vscode/
+.idea/
out/
CMakeSettings.json
# Exceptions
.cache/
-*.patch
\ No newline at end of file
+*.patch
diff --git a/Dependencies/libsodium/libsodium.lua b/Dependencies/libsodium/libsodium.lua
index 55da7431..0102e073 100644
--- a/Dependencies/libsodium/libsodium.lua
+++ b/Dependencies/libsodium/libsodium.lua
@@ -9,8 +9,8 @@ Solution.Util.CreateDep(dep.Name, dep.Dependencies, function()
Solution.Util.SetLibDirs(libPath)
Solution.Util.SetLinks(lib)
else
- Solution.Util.SetLinks("libsodium")
+ Solution.Util.SetLinks("sodium")
end
Solution.Util.SetIncludes(dep.Path)
-end)
\ No newline at end of file
+end)
diff --git a/Premake/ProjectUtil.lua b/Premake/ProjectUtil.lua
index 33af9755..99c5e111 100644
--- a/Premake/ProjectUtil.lua
+++ b/Premake/ProjectUtil.lua
@@ -44,8 +44,8 @@ end
systemToExecutableExtensionMap =
{
- windows = "exe",
- linux = "sh"
+ windows = ".exe",
+ linux = ""
}
systemToDynamicLibExtensionMap =
@@ -490,4 +490,4 @@ if InitBuildSettings == nil then
BuildSettings:SetSilentFailOnDuplicateSetting(silentFailOnDuplicateSetting)
end
-end
\ No newline at end of file
+end
diff --git a/Source/Base/Base/Util/StringUtils.h b/Source/Base/Base/Util/StringUtils.h
index 60b93b64..c33f4d6f 100644
--- a/Source/Base/Base/Util/StringUtils.h
+++ b/Source/Base/Base/Util/StringUtils.h
@@ -38,12 +38,11 @@ namespace StringUtils
{
i32 length = -1;
- #ifdef _WIN32
- length = sprintf_s(buffer, bufferSize, format, args...);
- #else
- (void)bufferSize; // Get rid of warning
- length = sprintf(buffer, format, args...);
- #endif
+ if constexpr (sizeof...(Args) == 0) {
+ length = std::snprintf(buffer, bufferSize, "%s", format);
+ } else {
+ length = std::snprintf(buffer, bufferSize, format, args...);
+ }
assert(length > -1);
return length;
diff --git a/Source/FileFormat/FileFormat/Novus/ShaderPack/ShaderPack.cpp b/Source/FileFormat/FileFormat/Novus/ShaderPack/ShaderPack.cpp
index ca50e80d..68e09988 100644
--- a/Source/FileFormat/FileFormat/Novus/ShaderPack/ShaderPack.cpp
+++ b/Source/FileFormat/FileFormat/Novus/ShaderPack/ShaderPack.cpp
@@ -1,4 +1,3 @@
-#pragma once
#include "ShaderPack.h"
#include
@@ -221,4 +220,4 @@ namespace FileFormat
return true;
}
-}
\ No newline at end of file
+}
diff --git a/Source/Gameplay/Gameplay/Network/GameMessageRouter.h b/Source/Gameplay/Gameplay/Network/GameMessageRouter.h
index 2591a3b4..4b02975b 100644
--- a/Source/Gameplay/Gameplay/Network/GameMessageRouter.h
+++ b/Source/Gameplay/Gameplay/Network/GameMessageRouter.h
@@ -62,8 +62,6 @@ namespace Network
template
void UnregisterPacketHandler(OpcodeType opcode)
{
- auto opcode = static_cast(PacketStruct::PACKET_ID);
-
GameMessageHandler& handler = _handlers[opcode];
handler.status = ConnectionStatus::None;
handler.minSize = 0;
@@ -78,4 +76,4 @@ namespace Network
private:
GameMessageHandler _handlers[(u16)MetaGen::PacketListEnum::Count];
};
-}
\ No newline at end of file
+}
diff --git a/Source/Meta/Component.lua b/Source/Meta/Component.lua
index 329601df..9ef413f5 100644
--- a/Source/Meta/Component.lua
+++ b/Source/Meta/Component.lua
@@ -329,7 +329,7 @@ M.EnumMetaData =
system =
{
"Base/Types.h",
- "Array"
+ "array"
}
},
@@ -647,4 +647,4 @@ M.GameCommand =
end
}
-return M
\ No newline at end of file
+return M
diff --git a/Source/Scripting/Scripting/Zenith.cpp b/Source/Scripting/Scripting/Zenith.cpp
index a3ca3ccc..a20bf61e 100644
--- a/Source/Scripting/Scripting/Zenith.cpp
+++ b/Source/Scripting/Scripting/Zenith.cpp
@@ -2,6 +2,8 @@
#include
+#include
+
namespace Scripting
{
void Zenith::SetState(lua_State* newState)
@@ -366,7 +368,7 @@ namespace Scripting
{
f64 value = luaL_checknumber(zenith->state, index);
if (value < min || value > max)
- luaL_error(zenith->state, "signed integer expected, got %f (Must be between %u...%u)", value, min, max);
+ luaL_error(zenith->state, "signed integer expected, got %f (Must be between %" PRId64 "...%" PRId64 ")", value, min, max);
i64 result = static_cast(value);
return result;
@@ -376,7 +378,7 @@ namespace Scripting
{
f64 value = luaL_checknumber(zenith->state, index);
if (value < 0 || value > max)
- luaL_error(zenith->state, "unsigned integer expected, got %f (Must be between 0...%u)", value, max);
+ luaL_error(zenith->state, "unsigned integer expected, got %f (Must be between 0...%" PRId64 ")", value, max);
u64 result = static_cast(value);
return result;
@@ -758,4 +760,4 @@ namespace Scripting
return Get(it->second);
}
-}
\ No newline at end of file
+}