Merge branch 'develop' into serverlistsorting

deps/iw4-open-formats

@@ -1 +1 @@
-Subproject commit 6af596a010eebf727e5d914bf9a01903c14ae128
+Subproject commit aaf4455bdac1ccd07c6eeeac993b7800124244c0

src/Components/Modules/AssetInterfaces/IXAnimParts.cpp

@@ -14,7 +14,7 @@ namespace Assets
 
 		if (asset->names)
 		{
-			for (char i = 0; i < asset->boneCount[Game::PART_TYPE_ALL]; ++i)
+			for (unsigned char i = 0; i < asset->boneCount[Game::PART_TYPE_ALL]; ++i)
 			{
 				builder->addScriptString(asset->names[i]);
 			}
@@ -22,7 +22,7 @@ namespace Assets
 
 		if (asset->notify)
 		{
-			for (char i = 0; i < asset->notifyCount; ++i)
+			for (unsigned char i = 0; i < asset->notifyCount; ++i)
 			{
 				builder->addScriptString(asset->notify[i].name);
 			}
@@ -165,7 +165,7 @@ namespace Assets
 			unsigned short* destTagnames = buffer->dest<unsigned short>();
 			buffer->saveArray(asset->names, asset->boneCount[Game::PART_TYPE_ALL]);
 
-			for (char i = 0; i < asset->boneCount[Game::PART_TYPE_ALL]; ++i)
+			for (unsigned char i = 0; i < asset->boneCount[Game::PART_TYPE_ALL]; ++i)
 			{
 				builder->mapScriptString(destTagnames[i]);
 			}
@@ -181,7 +181,7 @@ namespace Assets
 			Game::XAnimNotifyInfo* destNotetracks = buffer->dest<Game::XAnimNotifyInfo>();
 			buffer->saveArray(asset->notify, asset->notifyCount);
 
-			for (char i = 0; i < asset->notifyCount; ++i)
+			for (unsigned char i = 0; i < asset->notifyCount; ++i)
 			{
 				builder->mapScriptString(destNotetracks[i].name);
 			}

src/Components/Modules/Download.cpp

@@ -437,6 +437,12 @@ namespace Components
 
 	static std::optional<std::string> InfoHandler([[maybe_unused]] mg_connection* c, [[maybe_unused]] const mg_http_message* hm)
 	{
+		if (!(*Game::com_sv_running)->current.enabled)
+		{
+			// Game is not running ,cannot return info
+			return std::nullopt;
+		}
+
 		const auto status = ServerInfo::GetInfo();
 		const auto host = ServerInfo::GetHostInfo();
 
@@ -586,6 +592,12 @@ namespace Components
 
 		Utils::String::Replace(url, "\\", "/");
 
+		if (url.size() <= 5)
+		{
+			mg_http_reply(c, 403, "Content-Type: text/html\r\n", "%s", "400 - Bad requestt");
+			return {};
+		}
+
 		url = url.substr(6); // Strip /file
 		Utils::String::Replace(url, "%20", " ");
 

src/Components/Modules/MapRotation.cpp

@@ -208,7 +208,6 @@ namespace Components
 
 	nlohmann::json MapRotation::to_json()
 	{
-		assert(!DedicatedRotation.empty());
 		return DedicatedRotation.to_json();
 	}
 

src/Game/Structs.hpp

@@ -1044,8 +1044,8 @@ namespace Game
 		unsigned __int16 randomDataIntCount;
 		unsigned __int16 numframes;
 		char flags;
-		char boneCount[10];
+		unsigned char boneCount[10];
-		char notifyCount;
+		unsigned char notifyCount;
 		char assetType;
 		bool isDefault;
 		unsigned int randomDataShortCount;