diff --git a/README.md b/README.md index f8c79995..fe82b30b 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ | `--disable-bitmessage` | Disable use of BitMessage completely. | | `--disable-base128` | Disable base128 encoding for minidumps. | | `--no-new-structure` | Do not use new virtual path structure (separating headers and source files). | +| `--iw4x-zones` | Zonebuilder generates iw4x zones that cannot be loaded without IW4x specific patches. | ## Command line arguments diff --git a/premake5.lua b/premake5.lua index ea000824..91bee2df 100644 --- a/premake5.lua +++ b/premake5.lua @@ -74,6 +74,11 @@ newoption { description = "Upload minidumps even for Debug builds." } +newoption { + trigger = "iw4x-zones", + description = "Zonebuilder generates iw4x zones that cannot be loaded without IW4x specific patches." +} + newaction { trigger = "version", description = "Returns the version string for the current commit of the source code.", @@ -324,6 +329,9 @@ workspace "iw4x" if _OPTIONS["force-exception-handler"] then defines { "FORCE_EXCEPTION_HANDLER" } end + if _OPTIONS["iw4x-zones"] then + defines { "GENERATE_IW4X_SPECIFIC_ZONES" } + end -- Pre-compiled header pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp index 4b0e78b3..4cdee9f5 100644 --- a/src/Components/Modules/QuickPatch.cpp +++ b/src/Components/Modules/QuickPatch.cpp @@ -341,9 +341,6 @@ namespace Components // original code mov eax, dword ptr[esp + 0xa0]; - jmp collide; - - collide: push 0x00478376; retn; @@ -374,11 +371,6 @@ namespace Components // dont eject if g_playerEjection is set to 0 je donteject; - // original code - cmp dword ptr[ebx + 19ch], edi; - jle eject; - - eject: push 0x005d8152; retn;