chore: update

Co-authored-by: mjkzy <mjkzyalt@gmail.com>

deps/premake/wintoast.lua

@@ -1,32 +0,0 @@
-wintoast = {
-	source = path.join(dependencies.basePath, "WinToast"),
-}
-
-function wintoast.import()
-	links { "WinToast" }
-	wintoast.includes()
-end
-
-function wintoast.includes()
-	includedirs {
-		path.join(wintoast.source, "include"),
-	}
-end
-
-function wintoast.project()
-	project "WinToast"
-		language "C++"
-
-		wintoast.includes()
-		rapidjson.import();
-
-		files {
-			path.join(wintoast.source, "include/wintoastlib.h"),
-			path.join(wintoast.source, "src/wintoastlib.cpp"),
-		}
-
-		warnings "Off"
-		kind "StaticLib"
-end
-
-table.insert(dependencies, wintoast)

src/client/component/demonware.cpp

@@ -117,7 +117,7 @@ namespace demonware
 		{
 			hostent* WINAPI gethostbyname_stub(const char* name)
 			{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 				printf("[ network ]: [gethostbyname]: \"%s\"\n", name);
 #endif
 

src/client/component/fastfiles.cpp

@@ -6,9 +6,9 @@
 #include "command.hpp"
 #include "console.hpp"
 
+#include <utils/concurrency.hpp>
 #include <utils/hook.hpp>
 #include <utils/io.hpp>
-#include <utils/concurrency.hpp>
 
 namespace fastfiles
 {
@@ -115,7 +115,7 @@ namespace fastfiles
 	char* reallocate_asset_pool()
 	{
 		constexpr auto element_size = get_asset_type_size(Type);
-		static char new_pool[element_size * Size] = {0};
+		static char new_pool[element_size * Size]{0};
 		assert(get_asset_type_size(Type) == game::DB_GetXAssetTypeSize(Type));
 
 		std::memmove(new_pool, game::DB_XAssetPool[Type], game::g_poolSize[Type] * element_size);
@@ -167,8 +167,30 @@ namespace fastfiles
 				utils::hook::inject(0x14027463C, xmodel_pool + 8);
 				utils::hook::inject(0x140274689, xmodel_pool + 8);
 
+				// Reallocate asset pools
+				// Disabled because it causes a crash in the main menu once you rejoin a server after
+				// disconnecting and waiting for the server to map rotating.
+#if 0
+				reallocate_asset_pool<game::ASSET_TYPE_LUA_FILE, 768>();
+				reallocate_asset_pool<game::ASSET_TYPE_WEAPON, 1400>();
+				reallocate_asset_pool<game::ASSET_TYPE_LOCALIZE_ENTRY, 27200>();
+				reallocate_asset_pool<game::ASSET_TYPE_XANIMPARTS, 11600>();
+				reallocate_asset_pool<game::ASSET_TYPE_ATTACHMENT, 256>();
+				reallocate_asset_pool<game::ASSET_TYPE_FONT, 96>();
+				reallocate_asset_pool<game::ASSET_TYPE_SNDDRIVER_GLOBALS, 4>();
+				reallocate_asset_pool<game::ASSET_TYPE_EQUIPMENT_SND_TABLE, 4>();
+				reallocate_asset_pool<game::ASSET_TYPE_SOUND, 32000>();
+				reallocate_asset_pool<game::ASSET_TYPE_LOADED_SOUND, 14000>();
+				reallocate_asset_pool<game::ASSET_TYPE_VERTEXDECL, 3072>();
+				reallocate_asset_pool<game::ASSET_TYPE_COMPUTESHADER, 1024>();
+				reallocate_asset_pool<game::ASSET_TYPE_REVERB_PRESET, 128>();
+				reallocate_asset_pool<game::ASSET_TYPE_IMPACT_FX, 40>();
+#endif
 				// Fix compressor type on streamed file load
 				db_read_stream_file_hook.create(0x14027AA70, db_read_stream_file_stub);
+
+				// Allow loading of unsigned fastfiles
+				utils::hook::nop(0x1402427A5, 2); // DB_InflateInit
 			}
 		}
 	};

src/client/game/demonware/keys.cpp

@@ -89,7 +89,7 @@ namespace demonware
 		std::memcpy(data.m_dec_key, &out_3[40], 16);
 		std::memcpy(data.m_enc_key, &out_3[56], 16);
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW] Response id: %s\n", utils::string::dump_hex(std::string(&out_2[8], 8)).data());
 		printf("[DW] Hash verify: %s\n", utils::string::dump_hex(std::string(&out_3[20], 20)).data());
 		printf("[DW] AES dec key: %s\n", utils::string::dump_hex(std::string(&out_3[40], 16)).data());

src/client/game/demonware/servers/auth3_server.cpp

@@ -38,7 +38,7 @@ namespace demonware
 	{
 		if (packet.starts_with("POST /auth/"))
 		{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 			printf("[DW]: [auth]: user requested authentication.\n");
 #endif
 			return;
@@ -81,7 +81,7 @@ namespace demonware
 			}
 		}
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW]: [auth]: authenticating user %s\n", token.data() + 64);
 #endif
 
@@ -160,7 +160,7 @@ namespace demonware
 		raw_reply reply(result);
 		this->send_reply(&reply);
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW]: [auth]: user successfully authenticated.\n");
 #endif
 	}

src/client/game/demonware/servers/lobby_server.cpp

@@ -56,7 +56,7 @@ namespace demonware
 				}
 				else if (size == 0xC8)
 				{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 					printf("[DW]: [lobby]: received client_header_ack.\n");
 #endif
 
@@ -72,7 +72,7 @@ namespace demonware
 
 					raw_reply reply(packet_2);
 					this->send_reply(&reply);
-#ifdef DEBUG
+#ifdef DW_DEBUG
 					printf("[DW]: [lobby]: sending server_header_ack.\n");
 #endif
 					return;
@@ -89,7 +89,7 @@ namespace demonware
 
 					if (type == 0x82)
 					{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 						printf("[DW]: [lobby]: received client_auth.\n");
 #endif
 						std::string packet_3(packet.data(), packet.size() - 8); // this 8 are client hash check?
@@ -104,7 +104,7 @@ namespace demonware
 						raw_reply reply(response);
 						this->send_reply(&reply);
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 						printf("[DW]: [lobby]: sending server_auth_done.\n");
 #endif
 						return;
@@ -163,8 +163,9 @@ namespace demonware
 		}
 		else
 		{
+#ifdef DW_DEBUG
 			printf("[DW]: [lobby]: missing service '%s'\n", utils::string::va("%d", id));
-
+#endif
 			// return no error
 			byte_buffer buffer(data);
 			uint8_t task_id;

src/client/game/demonware/service.hpp

@@ -51,7 +51,7 @@ namespace demonware
 
 			if (it != this->tasks_.end())
 			{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 				printf("[DW] %s: executing task '%d'\n", name_.data(), this->task_id_);
 #endif
 

src/client/game/demonware/services/bdStorage.cpp

@@ -15,7 +15,7 @@ namespace demonware
 	{
 		std::string get_motd_text()
 		{
-			return "This is not a copy & pasted client";
+			return "Did you know aiming down sights increases accuracy? Online Interactions Not Rated by the ESRB.";
 		}
 	}
 
@@ -75,7 +75,7 @@ namespace demonware
 			}
 		}
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW]: [bdStorage]: missing publisher file: %s\n", name.data());
 #endif
 
@@ -118,7 +118,7 @@ namespace demonware
 		std::string filename;
 		buffer->read_string(&filename);
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW]: [bdStorage]: loading publisher file: %s\n", filename.data());
 #endif
 
@@ -126,7 +126,7 @@ namespace demonware
 
 		if (this->load_publisher_resource(filename, data))
 		{
-#ifdef DEBUG
+#ifdef DW_DEBUG
 			printf("[DW]: [bdStorage]: sending publisher file: %s, size: %lld\n", filename.data(), data.size());
 #endif
 
@@ -185,7 +185,7 @@ namespace demonware
 		buffer->read_uint64(&owner);
 		buffer->read_string(&platform);
 
-#ifdef DEBUG
+#ifdef DW_DEBUG
 		printf("[DW]: [bdStorage]: user file: %s, %s, %s\n", game.data(), filename.data(), platform.data());
 #endif
 

src/client/resources/dw/motd-english.txt

@@ -1 +1 @@
-Welcome to s1-mod. This is not a copy & pasted project.
+Welcome to s1-mod. Did you know aiming down sights increases accuracy? Online Interactions Not Rated by the ESRB.

src/common/utils/string.hpp

@@ -22,54 +22,54 @@ namespace utils::string
 			++this->current_buffer_ %= ARRAY_COUNT(this->string_pool_);
 			auto entry = &this->string_pool_[this->current_buffer_];
 
-			if (!entry->size || !entry->buffer)
+			if (!entry->size_ || !entry->buffer_)
 			{
 				throw std::runtime_error("String pool not initialized");
 			}
 
 			while (true)
 			{
-				const int res = vsnprintf_s(entry->buffer, entry->size, _TRUNCATE, format, ap);
+				const auto res = vsnprintf_s(entry->buffer_, entry->size_, _TRUNCATE, format, ap);
 				if (res > 0) break; // Success
 				if (res == 0) return nullptr; // Error
 
 				entry->double_size();
 			}
 
-			return entry->buffer;
+			return entry->buffer_;
 		}
 
 	private:
 		class entry final
 		{
 		public:
-			explicit entry(const size_t _size = MinBufferSize) : size(_size), buffer(nullptr)
+			explicit entry(const size_t size = MinBufferSize) : size_(size), buffer_(nullptr)
 			{
-				if (this->size < MinBufferSize) this->size = MinBufferSize;
+				if (this->size_ < MinBufferSize) this->size_ = MinBufferSize;
 				this->allocate();
 			}
 
 			~entry()
 			{
-				if (this->buffer) memory::get_allocator()->free(this->buffer);
+				if (this->buffer_) memory::get_allocator()->free(this->buffer_);
-				this->size = 0;
+				this->size_ = 0;
-				this->buffer = nullptr;
+				this->buffer_ = nullptr;
 			}
 
 			void allocate()
 			{
-				if (this->buffer) memory::get_allocator()->free(this->buffer);
+				if (this->buffer_) memory::get_allocator()->free(this->buffer_);
-				this->buffer = memory::get_allocator()->allocate_array<char>(this->size + 1);
+				this->buffer_ = memory::get_allocator()->allocate_array<char>(this->size_ + 1);
 			}
 
 			void double_size()
 			{
-				this->size *= 2;
+				this->size_ *= 2;
 				this->allocate();
 			}
 
-			size_t size;
+			size_t size_;
-			char* buffer;
+			char* buffer_;
 		};
 
 		size_t current_buffer_;