refactor: Remove `return` redundant logic. #1811

vitimiti · 2025-11-06T13:05:35Z

Remove all the redundant return logic I could find in the project. This should help resolve refactor #1778.

Skyaero42 · 2025-11-06T13:11:50Z

Xezon mentioned there are 1356 of them, so I think you are missing a few.

xezon

Yes this refactor is expected to touch more than a thousand lines.

Core/Tools/WW3D/pluglib/WWmatrix3.cpp

vitimiti · 2025-11-06T14:22:23Z

Xezon mentioned there are 1356 of them, so I think you are missing a few.

I am trying to find more unnecessary return statements and even including ones that return values (not just return;) and I can't find any other in the project or in the entire directory, for that matter.

I can see return logic that can be simplified, such as simplifying some if/else blocks, but not anything else.

xezon · 2025-11-06T14:36:45Z

Maybe I looked wrong. I just searched for all return ; and looked over a few and they looked bad.

vitimiti · 2025-11-06T14:40:41Z

Yes, but I've also rejoined the project after many commits and merges, so I'm assuming some of them have gone as "collateral damage". I am looking for return ;, return;, return(\s+)?; and even just return and that is all I found.

Correct me if I'm wrong, of course.

vitimiti · 2025-11-06T14:42:22Z

Wow, I found some more, bad settings on my search. Let me fix that

xezon · 2025-11-06T14:52:04Z

Maybe search for "\n\treturn".

vitimiti · 2025-11-06T14:58:48Z

Yeap, yeap, I searched for \n\nreturn ;\n and \nreturn;\n. My static analyzer fails majorly due to the UNIX configuration failing due to precompiled headers that depend on the Win32 API so searching across the "project" missing things that weren't configured on my Linux machine. I found them by forcing recursive search in all directories.

vitimiti · 2025-11-06T15:08:41Z

I have found more, don't merge yet lol. I need to do some chores...

vitimiti · 2025-11-06T21:53:57Z

I believe that is all the redundant return statements! Happy to check my work?

xezon · 2025-11-06T22:56:57Z

1400 lines looks more like it!

vitimiti · 2025-11-06T23:29:31Z

Yeah, I'm quite happy I can't find anything else at this point, I've even used other means than just my IDE lol

xezon · 2025-11-07T18:06:18Z

I pulled this branch and I can see 603 results when searching for "return ;"

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp

Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp

Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp

vitimiti · 2025-11-08T20:38:06Z

I pulled this branch and I can see 603 results when searching for "return ;"

I honestly don't know what I was doing with my searches that day, I'll fix it right away.

vitimiti · 2025-11-08T20:43:01Z

Okay, I believe that should be it, sorry for the inconvenience.

Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp

Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp

Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp

xezon · 2025-11-10T18:31:30Z

Can you collapse this branch into single commit? Then it will be easier to look through locally.

vitimiti · 2025-11-10T21:19:43Z

I'll create a new branch and squash this into it for a single commit in the morning after my shift

Skyaero42 · 2025-11-11T16:46:41Z

I'll create a new branch and squash this into it for a single commit in the morning after my shift

Just use git rebase - i to squash and then force push. No need for a new PR

vitimiti · 2025-11-11T16:52:41Z

I'll create a new branch and squash this into it for a single commit in the morning after my shift

Just use git rebase - i to squash and then force push. No need for a new PR

What I get for learning by myself.

# This is the 1st commit message: Initial commit # This is the commit message #2: Initial commit of Command & Conquer Generals and Command & Conquer Generals Zero Hour source code. # This is the commit message #3: initial .gitignore. # This is the commit message #4: Adds LICENSE.md and initial README.md. # This is the commit message #5: Prepare issue templates and other github specific files (#379) # This is the commit message #6: Allow blank issues (#388) # This is the commit message #7: Add top level gitignore. # This is the commit message #8: Implements CMake build system. (#365) Pulls most dependencies via FetchContent. # This is the commit message #9: Minimal changes for successful build. (#365) Only builds under VC6. Has some changes to accomodate newer API of public GameSpy SDK. Disables copy protection code in ZH code base (EA already disabled it for Generals code base). # This is the commit message #10: Fix filename casings in CMakeLists for case-sensitive systems (#431) # This is the commit message #11: Bumps version of miles sdk stub. (#440) Brings in fixes to API that solve audio issues. # This is the commit message #12: Add CI for generals and zerohour (#428) Adds CI for generals and zerohour game executables using cmake vc6 preset Generals artifact containing generals executable Generals-Tools artifact containing generals tools executables GeneralsMD artifact containing zerohour executable GeneralsMD-Tools artifact containing zerohour tools executables # This is the commit message #13: Implement options to control building internal and debug code. (#441) Adds additional configure presets to build these on vc6. Adds an additional config for loading into Visual Studio without breaking ninja. # This is the commit message #14: Add precompiled header support to "GameEngine" targets. (#449) # This is the commit message #15: README.md: Remove archived status and PR restriction (#447) # This is the commit message #16: Fix building debug and internal builds. (#452) # This is the commit message #17: Add install targets if install path found. (#456) # This is the commit message #18: [GITHUB] Refactor CI to better support multiple profiles (#483) This PR merges the two separate workflow files build-vc6-generals.yml and build-vc6-zerohour.yml into one build-games.yml. This new workflow file supports running multiple presets through the use of matrixes, also useful once VC2022 is merged. # This is the commit message #19: [GEN][ZH] Fix character encoding issues in comments and key mappings (#475) # This is the commit message #20: Add script to fix file name case in includes (#481) # This is the commit message #21: [ZH] Fix type declaration scope issues for Zero Hour build (#426) # This is the commit message #22: [ZH] Fix BrowserEngine import for Zero Hour build (#426) # This is the commit message #23: [ZH] Fix AnimateWindow symbol collision for Zero Hour build (#426) # This is the commit message #24: [ZH] Fix TheEmptyString syntax for Zero Hour build (#426) # This is the commit message #25: [ZH] Fix type mismatch errors for Zero Hour build (#426) # This is the commit message #26: [ZH] Fix constness errors for Zero Hour build (#426) # This is the commit message #27: [ZH] Fix AI_PASSIVE symbol collision for Zero Hour build (#426) # This is the commit message #28: [ZH] Exclude stlport from non-VS6 builds, enable multithread builds for MSVC (#426) # This is the commit message #29: [ZH] Fix new/delete redefinition errors for Zero Hour build (#426) # This is the commit message #30: [ZH] Add missing value types for Zero Hour build (#426) # This is the commit message #31: [ZH] Fix BitTest symbol collision for Zero Hour build (#426) # This is the commit message #32: [ZH] Fix iterator errors for Zero Hour build (#426) # This is the commit message #33: [ZH] Fix misc compile errors for Zero Hour build (#426) # This is the commit message #34: [ZH] Fix header include errors/mistakes for Zero Hour build (#426) # This is the commit message #35: [ZH] Upgrade to c++17 (#426) # This is the commit message #36: [ZH] Fix dependent name errors for Zero Hour build (#426) # This is the commit message #37: [ZH] Upgrade to c++20 (#426) # This is the commit message #38: [GEN] Fix BitTest symbol collision for Generals build (#484) # This is the commit message #39: [GEN] Fix AI_PASSIVE symbol collision for Generals build (#484) # This is the commit message #40: [GEN] Fix TheEmptyString syntax for Generals build (#484) # This is the commit message #41: [GEN] Fix BrowserEngine import for Generals build (#484) # This is the commit message #42: [GEN] Fix AnimateWindow symbol collision for Generals build (#484) # This is the commit message #43: [GEN] Exclude stlport from non-VS6 builds (#484) # This is the commit message #44: [GEN] Fix iterator errors for Generals build (#484) # This is the commit message #45: [GEN] Fix header include errors/mistakes for Generals build (#484) # This is the commit message #46: [GEN] Fix new/delete redefinition errors for Generals build (#484) # This is the commit message #47: [GEN] Add missing value types for Generals build (#484) # This is the commit message #48: [GEN] Fix type mismatch errors for Generals build (#484) # This is the commit message #49: [GEN] Fix misc compile errors for Generals build (#484) # This is the commit message #50: [GEN] Fix dependent name errors for Generals build (#484) # This is the commit message #51: [GEN] Fix constness errors for Generals build (#484) # This is the commit message #52: [GEN] Fix type declaration scope issues for Generals build (#484) # This is the commit message #53: [GEN] Upgrate to c++20 (#484) # This is the commit message #54: [GEN][ZH] Fix file name case in includes (#347) # This is the commit message #55: [CMake] Stop features being printed out 3 times. (#498) # This is the commit message #56: [CMake] Fix deprecation warning in benchmark stub. (#498) # This is the commit message #57: [GEN][ZH] Remove "pragma comment" implict linker instructions. (#498) Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options. # This is the commit message #58: [CMake] Move compiler configuration to its own cmake file. (#498) # This is the commit message #59: [CMake] Refactor CMake build config options. (#498) # This is the commit message #60: [CMake] Remove unused code from lzhl library build. (#498) Files cause issues on 64bit and aren't required. # This is the commit message #61: [CMake] Split tools into useful and extra. (#498) GENZH_BUILD_%GAME%_TOOLS now defaults to ON and builds only tools a developer would use/need. GENZH_BUILD_%GAME%_EXTRAS has been added and defaults to OFF. It controls building everything else. All useful tools are now added to the install target. # This is the commit message #62: [ZH] Fix compilation errors in profile library (#519) # This is the commit message #63: Add natvis for AsciiString, UnicodeString, _STL::_List_base, _STL::_Vector_base (#451) # This is the commit message #64: [ZH] Fix constness errors for Zero Hour Tools build (#509) # This is the commit message #65: [ZH] Fix dependent name errors for Zero Hour Tools (#509) # This is the commit message #66: [ZH] Prevent including d3d9types.h via afxwin.h for Zero Hour Tools build (#509) # This is the commit message #67: [ZH] Fix type declaration scope issues for Zero Hour Tools build (#509) # This is the commit message #68: [GEN][ZH] Disable maxsdk and max2w3d tool in non-vs6 build (#509) # This is the commit message #69: [ZH] Fix type mismatch errors for Zero Hour Tools build (#509) # This is the commit message #70: [ZH] Fix incompatible function calls of std::vector, std::string, CString for Zero Hour Tools build (#509) # This is the commit message #71: [ZH] Fix c++20 keyword conflicts for Zero Hour Tools build (#509) # This is the commit message #72: [ZH] Fix hash_map errors for Zero Hour Tools build (#509) # This is the commit message #73: [ZH] Fix iostream errors for Zero Hour Tools build (#509) # This is the commit message #74: [ZH] Fix fstream include errors for Zero Hour Tools build (#509) # This is the commit message #75: [ZH] Fix misc and header include errors for Zero Hour Tools build (#509) # This is the commit message #76: [ZH] Upgrade Zero Hour Tools to c++20 (#509) # This is the commit message #77: [GEN] Fix incorrect minor version for Generals (#524) # This is the commit message #78: [ZH] Fix stringstream for Zero Hour Tools build (#532) # This is the commit message #79: [GEN] Fix constness errors for Generals Tools build (#527) # This is the commit message #80: [GEN] Fix dependent name errors for Generals Tools build (#527) # This is the commit message #81: [GEN] Prevent including d3d9types.h via afxwin.h for Generals Tools build (#527) # This is the commit message #82: [GEN] Fix type declaration scope issues for Generals Tools build (#527) # This is the commit message #83: [GEN] Fix type mismatch errors for Generals Tools build (#527) # This is the commit message #84: [GEN] Fix incompatible function calls of std::vector, std::string, CString for Generals Tools build (#527) # This is the commit message #85: [GEN] Fix c++20 keyword conflicts for Generals Tools build (#527) # This is the commit message #86: [GEN] Fix hash_map errors for Generals Tools build (#527) # This is the commit message #87: [GEN] Fix iostream errors for Generals Tools build (#527) # This is the commit message #88: [GEN] Fix fstream include errors for Generals Tools build (#527) # This is the commit message #89: [GEN] Fix misc and header include errors for Generals Tools build (#527) # This is the commit message #90: [GEN] Upgrade Generals Tools to c++20 (#527) # This is the commit message #91: [GEN] Fix stringstream for Generals Tools build (#537) # This is the commit message #92: [GitHub] Add CI for VS2022 (#531) This PR adds CI for VS2022 builds and enables the gated EXTRAS for VC6 as well. Renamed build-games.yml simply to ci.yml for future addition of linters. # This is the commit message #93: [GEN][ZH] Fix incorrect AsciiString hash implementation for non-stlport (#450) # This is the commit message #94: [GEN][ZH] Fix uninitialized memory access in Get_OS_Info (#438) # This is the commit message #95: Move cmake config setup into config.cmake (#542) # This is the commit message #96: [GEN][ZH] Add cmake configurability for MemoryPool features and debugs, disable slow stack trace (#542) # This is the commit message #97: [ZH] Replace inline assembler for non VS6 builds (#479) # This is the commit message #98: [GEN] Replace inline assembler for non VS6 builds (#508) # This is the commit message #99: [GEN] Backport UpgradeMaskType typedef (#554) # This is the commit message #100: [GEN] Backport ObjectStatusMaskType typedef (#554) # This is the commit message #101: [GEN] Backport zoneStorageType typedef (#554) # This is the commit message #102: [GEN] Backport TriIndex typedef (#558) # This is the commit message #103: [GEN][ZH] Fix invalid memory access in AudioManager::addAudioEvent (#464) # This is the commit message #104: [GEN][ZH] Fix heap-buffer-overflow in getListboxBottomEntry (#462) # This is the commit message #105: [GEN][ZH] Fix heap-buffer-overflow, new/delete mismatch in FontCharsClass::~FontCharsClass (#463) # This is the commit message #106: [GEN][ZH] Fix stack-buffer-underflow in Win32BIGFileSystem::openArchiveFile (#467) # This is the commit message #107: [GEN][ZH] Fix heap-use-after-free in Player::init (#468) # This is the commit message #108: [GEN][ZH] Fix stack-buffer-overflow in HotKeyTranslator::translateGameMessage (#465) # This is the commit message #109: [ZH] Fix global-buffer-overflow in Init_D3D_To_WW3_Conversion (#466) # This is the commit message #110: [GEN][ZH] Fix heap-use-after-free in TeamInQueue::~TeamInQueue (#469) # This is the commit message #111: [GEN] Backport TextureFilterClass (#559) # This is the commit message #112: [GEN][ZH] Remove superfluous tokens after endif (#573) # This is the commit message #113: [GEN] Remove obsolete _PLAYTEST macro (#570) # This is the commit message #114: [ZH] Add original wdump files from Renegade (#556) # This is the commit message #115: [ZH] Add CMake and VS2022 fixes to wdump (#556) # This is the commit message #116: [ZH] Port DEBUG_LOG_LEVEL from Generals (#561) # This is the commit message #117: [GEN][ZH] Remove WPAudio (#582) # This is the commit message #118: [GEN][ZH] Partially clean up WWLib (#581) # This is the commit message #119: [GitHub] Update bug report template (#585) # This is the commit message #120: [ZH] Port mod cursor support from Generals (#579) # This is the commit message #121: [ZH] Fix BitTest macro name in Win32DIMouse.cpp (#569) # This is the commit message #122: [ZH] Fix Replay CRC Checking (#545) # This is the commit message #123: [GitHub] Cancel in-progress jobs only for pull requests (#587) # This is the commit message #124: [GEN][ZH] Remove legacy VC6 project files (#591) # This is the commit message #125: [ZH] Add cmake setup for WWAudio and make it compile with VS2022 (#584) # This is the commit message #126: [Git] Expand gitignore to include CLion / JetBrains IDEs (#588) # This is the commit message #127: [GEN] Bring Matrix3, Matrix4 of WWMath in line with Zero Hour (#583) # This is the commit message #128: [GEN][ZH] Remove library placeholder folders (#592) # This is the commit message #129: [GEN][ZH] Readd WWVegas/WWLib/rcfile.cpp for w3dview (#598) This partially reverts commit 931d1051c376c4980780e2bb596cdb6ddbeb44c4 # This is the commit message #130: [GEN] Fix Replay CRC Checking (#594) # This is the commit message #131: [CMake] Add doxygen targets for documentation (#593) # This is the commit message #132: [GEN][ZH] Add optional game memory null replacement (#562) # This is the commit message #133: [ZH] Add original w3dview files from Renegade (#600) # This is the commit message #134: [ZH] Add CMake setup to w3dview (#600) # This is the commit message #135: [ZH] Fix VS6 compiler errors for w3dview (#600) # This is the commit message #136: [ZH] Fix VS2022 compiler errors for w3dview (#600) # This is the commit message #137: [ZH] Fix legacy function calls to miles in WWAudio (#600) # This is the commit message #138: [GEN] Bring WWSaveLoad and WWUtil in line with Zero Hour (#607) # This is the commit message #139: [GEN] Bring WW3D2 partially in line with Zero Hour (#608) # This is the commit message #140: [GEN] Bring WWLib partially in line with Zero Hour (#609) # This is the commit message #141: [CMake] Fix configuration on Linux (#619) # This is the commit message #142: [ZH] Add FXShader chunks from BFME (#599) # This is the commit message #143: [CMake] Add cmake option for enabling address sanitizer (#604) # This is the commit message #144: [GEN][ZH] Fix several new/delete mismatches (#606) # This is the commit message #145: [CMake] Remove unnecessary {g,z}i_libraries_source (#624) # This is the commit message #146: [LINUX] Add required compat headers for Linux (#620) Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com> # This is the commit message #147: [LINUX][ZH] Fix compress tool compilation (#620) Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com> # This is the commit message #148: [LINUX][ZH] Fix CRCDiff tool compilation (#620) Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com> # This is the commit message #149: [LINUX] Fix profile configuration warning (#620) # This is the commit message #150: [LINUX] Pass va_list by value (#625) # This is the commit message #151: [CMAKE] Remove unused LaunchWeb file from WWLib (#626) # This is the commit message #152: [GEN] Brings more WW3D2 in line with ZH (#618) # This is the commit message #153: [CMAKE] Rename options and targets reused by games (#628) * [CMAKE] Rename GENZH_ options * [CMAKE] Rename gz_ prefix to core_ # This is the commit message #154: [GEN] Change ObjectStatusMaskType, UpgradeMaskType to BitFlags like in Zero Hour (#613) # This is the commit message #155: [GEN] Make DX8Caps a class to mirror Zero Hour (#633) # This is the commit message #156: [GEN][ZH] Fix stlport iterator use to conform with STL (#630) # This is the commit message #157: [ZH] Remove superfluous CriticalSectionClass (#634) # This is the commit message #158: [GEN] Bring Thumbnail state checks closer to Zero Hour (#635) # This is the commit message #159: [GEN][ZH] Fix invalidated iterator access in ScriptEngine::evaluateAndProgressAllSequentialScripts (#629) # This is the commit message #160: [GEN][ZH] Fix list element erasure with iterator on unrelated container in ResourceGatheringManager::findBestSupplyCenter, MilesAudioManager::killLowestPrioritySoundImmediately (#631) # This is the commit message #161: [CMAKE] Setup Core folder with shared code (#617) # This is the commit message #162: [GEN][ZH] Fix compiler warnings for implicit integer conversion (#639) # This is the commit message #163: [GEN][ZH] Fix compiler warnings for uninitialized variables in copy constructors (#640) # This is the commit message #164: [GEN] Compile out unused bump mapped water (#616) # This is the commit message #165: [GEN][ZH] Correct the most egregious signed / unsigned mismatch warnings (#643) # This is the commit message #166: [GEN][ZH] Refactor GameLogic::rebalanceChildSleepyUpdate to avoid "vector subscript out of range" debug error (#644) # This is the commit message #167: [GEN][ZH] Refactor GameLogic::reset to avoid "vector subscript out of range" debug error (#645) # This is the commit message #168: [ZH] Remove obsolete IndexBufferExceptionFunc try-catch blocks for Windows 2000 (#652) # This is the commit message #169: [GEN][ZH] Delete obsolete code in WW3D2, W3DView (#636) # This is the commit message #170: [LINUX][ZH] Use C stdio API in RawFile class (#627) # This is the commit message #171: [GEN][ZH] Fix incorrect string copy with overlapping memory regions in AsciiString, UnicodeString, strtrim (#615) # This is the commit message #172: [GEN][ZH] Remove duplicate strtrim implementations (#655) # This is the commit message #173: [GITHUB] Add PR title and commit message validation workflow (#647) # This is the commit message #174: [GEN][ZH] Decouple Compress from CRCDiff (#658) # This is the commit message #175: [GEN] Backport WW3D2's ringobj, sphereobj, assetstatus from Zero Hour (#659) # This is the commit message #176: [CMAKE][CORE] Move compression library and compress tool to Core (#649) # This is the commit message #177: [GEN] Backport more of WW3D2 from Zero Hour (#660) # This is the commit message #178: [GEN][ZH] Fix compile errors with ALLOW_TEMPORARIES in WWMath (#603) # This is the commit message #179: [ZH] Remove the unused WWShade library (#596) # This is the commit message #180: [GEN] Backport WW3D2's StaticSortListClass from Zero Hour (#662) # This is the commit message #181: [GEN][ZH] Remove superfluous code of W3DGranny, QuickTrig, WSYS_String, DoCompressTest (#664) # This is the commit message #182: [GEN][ZH] Add underlying types to enum declarations for GCC build (#665) # This is the commit message #183: [CMAKE] Split cmake options for build and memory into separate files (#666) # This is the commit message #184: [GEN] Backport changes of mempool, rawfile, trim, widestring, wwstring from Zero Hour (#668) # This is the commit message #185: [GEN][ZH] Fix COM related compile errors for MinGW (#672) # This is the commit message #186: [CORE] Fix Compress tool build error (#674) # This is the commit message #187: Fix intrin_compat.h to work for MinGW (#671) # This is the commit message #188: [CMAKE] Sort CMake source files by alphabet (#677) # This is the commit message #189: [CMAKE] Add missing source files to WWVegas CMakeLists, remove duplicate pot source files (#678) # This is the commit message #190: [ZH] Use hash maps for Object and Drawable lookups in GameClient, GameLogic like Generals does (#676) # This is the commit message #191: [GEN] Backport WWDebug changes to wwdebug, wwmemlog, wwprofile from Zero Hour (#680) # This is the commit message #192: [CMAKE][ZH] Fix compile errors and add cmake options for DEBUG_LOGGING, DEBUG_CRASHING, DEBUG_STACKTRACE, DEBUG_PROFILE (#667) # This is the commit message #193: [CMAKE][CORE] Move WWLib and WWDebug to Core (#663) # This is the commit message #194: [GEN] Store StealthUpdate pointer in the Object class to avoid module lookups (#686) # This is the commit message #195: [CMAKE] Make WDump only depend on WWVegas (#682) # This is the commit message #196: [ZH] Improve CRC Logging Debug Functionality (#544) # This is the commit message #197: [ZH] Remove WW3D2 dependency from WWAudio (#689) # This is the commit message #198: [CMAKE][CORE] Move WWSaveLoad and most of WWMath to Core (#694) # This is the commit message #199: [CMAKE] Make W3DView only depend on WWVegas (#691) # This is the commit message #200: [CMAKE][CORE] Move max2w3d to Core (#696) # This is the commit message #201: [GEN] Improve CRC Logging Debug Functionality (#695) # This is the commit message #202: [CORE] Enable all supported compression types (#697) # This is the commit message #203: [CMAKE][CORE] Move CRCDiff tool to Core (#684) # This is the commit message #204: [GEN] Backport AnimatedSoundMgrClass and support changes, ParticleEmitterDefClass BlurTime support from Zero Hour (#701) # This is the commit message #205: [GEN] Backport various crash and memory fixes from Zero Hour (#692) # This is the commit message #206: [CORE][CMAKE] Fix Linux compilation of WWLib (#698) # This is the commit message #207: [CORE] Add compress functionality to the Compress tool (#702) # This is the commit message #208: [CORE][CMAKE] Fix Linux compilation of WWDebug (#699) Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com> # This is the commit message #209: [GEN] Backport WW3D2's TextureClass dimension functions from Zero Hour (#710) # This is the commit message #210: [GITHUB] Fix core tools compilation on GitHub CI (#717) Co-authored-by: Stephan Vedder <stephan.vedder@gmail.com> # This is the commit message #211: [CORE] Move matchbot tool to Core (#706) # This is the commit message #212: [GEN] Backport BlurTime functionality in WW3D2's ParticleBufferClass (#711) # This is the commit message #213: [GEN][ZH] Remove unused granny related code (#708) # This is the commit message #214: [CORE] Move buildversionUpdate, textureCompress, timingTest, versionUpdate tools to Core (#707) # This is the commit message #215: [CORE] Move Babylon tool to Core (#720) # This is the commit message #216: [CORE] Move assetcull, mangler, wolSetup tools to Core (#721) # This is the commit message #217: [GEN] Add future_start argument to constructor of WW3D2's ParticleEmitterClass for W3DView compatibility (#722) # This is the commit message #218: [GEN] Backport loading DDS file if TGA file of the same name was not found (#723) # This is the commit message #219: [GEN] Backport cube map, volume texture and hsv shift support for DDSFileClass from Zero Hour (#724) # This is the commit message #220: [CORE] Add a stdint adapter (#712) # This is the commit message #221: [ZH] Remove unused code in ThumbnailManagerClass (#727) # This is the commit message #222: [GEN] Bring texture related code in WW3D2 closer to Zero Hour (#726) # This is the commit message #223: [ZH][LINUX] Add C++ 17 based filesystem implementation (#693) Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com> Co-authored-by: d10sfan <4337981+d10sfan@users.noreply.github.com> # This is the commit message #224: [ZH][BFME] Support BINORMAL & TANGENT chunks from BFME (#736) # This is the commit message #225: Revert "[ZH] Use hash maps for Object and Drawable lookups in GameClient, GameLogic like Generals does (#676)" (#735) This reverts commit 4fe88de97b224db5c2bb964cd66b3422b6770ad1 # This is the commit message #226: [GEN][ZH] Fix broken replay list when it contains a replay with an unknown map (#732) # This is the commit message #227: [CMAKE] Add VCPKG package manager and use for ZLib (#605) # This is the commit message #228: [GEN][ZH] Unify the Autorun tool with changes from JFS (#739) # This is the commit message #229: [CORE] Move Autorun tool files to Core (#739) # This is the commit message #230: [ZH] Cleanup WDump chunk printing (#740) # This is the commit message #231: [CORE] Fix logging in wwdebugstub (#737) # This is the commit message #232: [CORE] Move ImagePacker tool files to Core (#747) # This is the commit message #233: [CORE] Move MapCacheBuilder tool files to Core (#749) # This is the commit message #234: [CMAKE] Move all RTS cmake options into early config-build.cmake to prevent cmake error on first generation (#753) # This is the commit message #235: [CORE] Move DebugWindow tool to Core (#748) # This is the commit message #236: [GEN][ZH] Unify code of PATCHGET tool (#746) # This is the commit message #237: [CORE] Move PATCHGET tool files to Core (#746) # This is the commit message #238: [GEN][ZH] Unify code of Launcher, DatGen tool (#741) # This is the commit message #239: [CORE] Move Launcher, DatGen tool files to Core (#741) # This is the commit message #240: [GEN] Backport OCL first object returns from Zero Hour (#751) # This is the commit message #241: [GEN] Backport more of WW3D2 from Zero Hour (#757) # This is the commit message #242: Revert "[GEN][ZH] Refactor GameLogic::reset to avoid "vector subscript out of range" debug error (#645)" (#764) This reverts commit bbf0830cb5c108df183613056b319dfb0c35c124. # This is the commit message #243: [ZH] Add range check in removeDrawableFromLookupTable and removeObjectFromLookupTable (#764) # This is the commit message #244: [GEN][ZH] Reset DrawableID on map load to avoid massive id growth over the lifetime of the game (#657) # This is the commit message #245: [GEN][ZH] Fix incorrectly initialized bool GhostObject::m_parentGeometryIsSmall (#767) # This is the commit message #246: [CMAKE] Remove vcpkg toolchain from default windows cmake presets and add new cmake presets with vcpkg toolchain (#769) # This is the commit message #247: [GEN] Add cmake setup for WWAudio and make it compile with VS2022 (#709) # This is the commit message #248: [GEN] Fix legacy function calls to miles in WWAudio (#709) # This is the commit message #249: [GEN] Remove WW3D2 dependency from WWAudio (#709) # This is the commit message #250: [CORE] Move W3DView files to Core and setup independent W3DView executables for Generals and Zero Hour (#709) # This is the commit message #251: [GEN][ZH] Fix drawable assignment in StealthUpdate::changeVisualDisguise() (#730) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #252: [GEN][ZH] Fix uninitialized memory read in DockUpdate::loadDockPositions() (#731) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #253: [GEN][ZH] Fix projectileHandleCollision iterator usage in MissileAIUpdate to conform to STL (#728) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #254: [GEN][ZH] Fix projectileHandleCollision iterator usage in DumbProjectileBehavior to conform to STL (#728) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #255: [GEN][ZH] Fix uninitialized supplyTruck variable in AiPlayer::onUnitProduced() (#653) # This is the commit message #256: [ZH] Fix partly uninitialized cellBounds variable in AIPathfind::classifyFence() (#632) # This is the commit message #257: [GEN][ZH] Fix uninitialized costSoFar variable in AIPathfind::findGoundPath() (#632) # This is the commit message #258: [GEN] Backport optimization in CardinalSpline3DClass::Update_Tangents from Zero Hour (#772) # This is the commit message #259: [GEN] Backport normal direction fix in CollisionMath::Collide for AABox-AABox collision from Zero Hour (#772) # This is the commit message #260: [GEN] Backport CollisionContext normal origin refactor in aabtri_compute_contact_normal from Zero Hour (#772) # This is the commit message #261: [GEN] Backport fix for float division by zero in obb_separation_test function from Zero Hour (#772) # This is the commit message #262: [GEN] Backport changes to normal value calculation in CollisionMath::Collide for OBBox-Tri collision from Zero Hour (#772) # This is the commit message #263: [CMAKE] Fix feature infos of debug options (#768) # This is the commit message #264: [GEN][ZH] Fix wrong class member set to INVALID_DRAWABLE_ID in ParticleUplinkCannonUpdate::createGroundToOrbitLaser() (#729) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #265: [GEN] Backport command line arguments from Zero Hour (#744) # This is the commit message #266: [GEN] Backport WaterTransparencySetting additions from Zero Hour (#777) # This is the commit message #267: [GEN][ZH] Fix replay header mismatch between builds using 32 bit or 64 bit wide time_t (#765) # This is the commit message #268: [ZH][LINUX] Add FFmpegFile for AVIO abstraction (#714) # This is the commit message #269: [ZH][LINUX] Add FFmpegVideoPlayer as video backend (#714) # This is the commit message #270: [ZH][LINUX][CMAKE] Add option to enable FFmpeg support (#714) # This is the commit message #271: [GITHUB] Increment build timeout for FFmpeg (#714) # This is the commit message #272: [GEN][ZH] Fix DEBUG_CRC compile errors (#778) # This is the commit message #273: [GEN] Backport some debug features from Zero Hour (#775) # This is the commit message #274: [CORE] Unify remaining WWMath (#745) # This is the commit message #275: [GEN][ZH] Change _DEBUG macro to RTS_DEBUG (#780) Resolves issue of debug instrumentation requiring debug CRT on windows. # This is the commit message #276: [GEN][ZH] Change _INTERNAL macro to RTS_INTERNAL (#780) # This is the commit message #277: [GEN][ZH] Change _PROFILE macro to RTS_PROFILE (#780) # This is the commit message #278: [GEN][ZH] Change _RELEASE macro to RTS_RELEASE (#780) # This is the commit message #279: [GEN][ZH] Unify all code of WWDownload (#785) # This is the commit message #280: [CORE] Move WWDownload library files to Core (#785) # This is the commit message #281: [GEN][ZH] Remove the unused Wwutil library (#786) # This is the commit message #282: [GEN] Bring ShaderClass::Apply more in line with Zero Hour (#776) # This is the commit message #283: [GEN][ZH] Compile out duplicate serial check in LAN lobby (#789) # This is the commit message #284: [CORE] Build non-vcpkg builds with zlib-1.1.4 again (#770) # This is the commit message #285: [GEN][ZH] Remove all instances of stopAllAmbientsBy() (#793) # This is the commit message #286: [GEN][ZH] Fix uninitialized variable read in ConnectionManager::allCommandsReady() (#792) # This is the commit message #287: [GEN][ZH] Unify code of GameAudio and MilesAudioManager (#782) # This is the commit message #288: [GEN][ZH] Remove obsolete sec file presence checks (#788) # This is the commit message #289: [GEN][ZH] Fix and simplify the use of the log file in RecorderClass (#795) # This is the commit message #290: [GEN] Backport SpecialPowerUpdate changes from Zero Hour (#791) # This is the commit message #291: [GEN][ZH] Implement multi instance support for the game client (#794) # This is the commit message #292: [GEN][ZH] Fix missing rename for RTS_DEBUG, RTS_INTERNAL, RTS_PROFILE (#803) # This is the commit message #293: [GEN][ZH] Fix compile warnings from the use of deprecated register keywords (#806) # This is the commit message #294: [GEN][ZH] Fix compile warnings from implicit unsigned long to HRESULT conversions in Win32DIKeyboard (#807) # This is the commit message #295: [GEN][ZH] Fix compile warnings related to the use of printf and scanf (#808) # This is the commit message #296: [CORE] Move WWAudio library files to Core (#802) # This is the commit message #297: [GEN][ZH] Fix dangling pointer at Player::m_defaultTeam when Team is destroyed (#809) # This is the commit message #298: [CMAKE] Clean up some comments in CMake scripts (#811) # This is the commit message #299: [CMAKE] Use CMAKE_CURRENT_SOURCE_DIR instead of dot for current directories (#812) # This is the commit message #300: [GEN] Add FXShader, BINORMAL, TANGENT chunks from BFME (#813) # This is the commit message #301: [CORE] Move many unified WW3D2 library files to Core (#814) # This is the commit message #302: [GEN][ZH] Fix possible division by zero in W3DCommandBarGenExpDraw() (#810) # This is the commit message #303: [GEN][ZH] Remove obsolete template.h, benchmark.h (#818) # This is the commit message #304: [CORE] Move debug and profile libraries from Zero Hour to Core (#819) # This is the commit message #305: [GEN][ZH] Fix dangling pointer in StealthUpdate::update() when GLA Bomb Truck changes disguise (#816) # This is the commit message #306: [CORE] Unify and move GameEngine's Xfer files to Core (#821) # This is the commit message #307: [GEN] Fix wrong water color on radar (#823) # This is the commit message #308: [GEN][ZH] Fix CRC debug logger deleting logs when shellmap is loaded (#825) # This is the commit message #309: [GEN][ZH] Add endian compat for BIGFileSystems (#798) # This is the commit message #310: [GEN][ZH] Fix buffer overrun and memory leaks in listbox properties of GUIEdit (#796) # This is the commit message #311: [GEN] Backport fast forward feature for replay playback (#827) # This is the commit message #312: [GEN][ZH] Fix material memory leak in ~W3DLaserDraw() (#623) # This is the commit message #313: [GEN][ZH] Fix production queue items memory leak in ~ProductionUpdate() (#623) # This is the commit message #314: [ZH] Fix weather settings memory leak in ~SnowManager() (#623) # This is the commit message #315: [GEN][ZH] Fix particle systems memory leak in ~W3DTankDraw() (#623) # This is the commit message #316: [GEN][ZH] Fix FileSystems memory leak on null filenames (#623) # This is the commit message #317: [GEN] Fix wrong delete function usage in ~MeshModelClass() (#623) # This is the commit message #318: [GEN][ZH] Remove redundant mesh unregister call in ~MeshModelClass() (#623) # This is the commit message #319: [GEN][ZH] Fix DisplayString memory leak in ~W3DDisplay() (#623) # This is the commit message #320: [GEN] Backport several GameEngine additions from Zero Hour (#752) # This is the commit message #321: [GEN][ZH] Fix crash when DEBUG_CRASHING is enabled and loading a replay with unicode characters (#824) # This is the commit message #322: [GEN][ZH] Fix compile error in RecorderClass::cleanUpReplayFile when building RTS_DEBUG without DEBUG_LOGGING (#832) # This is the commit message #323: [GEN][ZH] Demote throw to assert in AsciiString::format_va, UnicodeString::format_va (#835) # This is the commit message #324: [CMAKE] Disable game memory if ASAN is enabled (#833) # This is the commit message #325: [GEN][ZH] Initialize supplyTruck variable (#820) # This is the commit message #326: [GEN][ZH] Fix memory leak in SortingRendererClass::Insert_To_Sorting_Pool() (#844) # This is the commit message #327: [GEN][ZH] Fix memory leak in SpecialAbilityUpdate::isWithinStartAbilityRange() (#845) # This is the commit message #328: [GEN][ZH] Fix game halting when left Alt key is pressed (#837) # This is the commit message #329: [GEN][ZH] Enable use of Wave Editor in release build (#851) Usable with -useWaveEditor command line # This is the commit message #330: [GEN] Backport left click deselect functionality with Alternate Mouse Setup from Zero Hour (#332) # This is the commit message #331: [GEN] Backport Select All Aircraft feature from Zero Hour (#834) # This is the commit message #332: [GEN][ZH] Fix several potential buffer overruns in game code (#849) # This is the commit message #333: [CORE] Fix VC6 compile error in max2w3d pluglib (#859) # This is the commit message #334: [GEN][ZH] Demote throw to assert in InGameUI::message, InGameUI::messageColor (#860) # This is the commit message #335: [GEN][ZH] Demote throw to assert in AsciiString::ensureUniqueBufferOfSize, UnicodeString::ensureUniqueBufferOfSize, Dict::ensureUnique (#861) # This is the commit message #336: [GEN][ZH] Center Game App Window on startup and resolution change (#541) # This is the commit message #337: [GEN][ZH] Fix missing call to va_end in InGameUI::messageColor() (#872) # This is the commit message #338: [GEN][ZH] Fix unsafe calls to _vsnprintf, _vsnwprintf, _snprintf, _snwprintf (#858) # This is the commit message #339: Add python script to refactor most calls to deleteInstance (#870) # This is the commit message #340: [GEN][ZH] Fix undefined behavior with MemoryPoolObject::deleteInstance (#870) # This is the commit message #341: [GEN][ZH] Simplify calls to MemoryPoolObject::deleteInstance (#870) # This is the commit message #342: [GEN][ZH] Remove the now obsolete MEMORY_POOL_DELETEINSTANCE_VISIBILITY macro (#870) # This is the commit message #343: [GEN][ZH] Pause replay on CRC mismatch (#876) # This is the commit message #344: [GEN][ZH] Fix infinite loop in ParticleSystemManager::update (#877) # This is the commit message #345: [GEN][ZH] Fix undefined behavior in WindowLayout::destroyWindows (#878) # This is the commit message #346: [GEN][ZH] Fix compiler warnings for signed/unsigned mismatch of loop indices (#804) # This is the commit message #347: [GEN][ZH] Fix heap-use-after-free in ScoreScaleUpTransition::draw and dangling pointers to GameWindow in WindowTransitions (#848) # This is the commit message #348: [GEN][ZH] Fix crash in W3DBufferManager when a shadow buffer limit is exceeded (#879) # This is the commit message #349: [GEN][ZH] Fix Alt-tabbing crash (#846) # This is the commit message #350: [GEN][ZH] Add additional logging for calls to DX8Wrapper::Reset_Device (#883) # This is the commit message #351: [ZH] Unify code of AsciiString (#799) # This is the commit message #352: [GEN][ZH] Rename MemoryPoolObject::deleteInstance to MemoryPoolObject::deleteInstanceInternal (#889) # This is the commit message #353: [ZH] Implement Headless Mode (#651) # This is the commit message #354: [GEN] Implement Headless Mode (#899) # This is the commit message #355: [GEN][ZH] Revert to uninitialized variable in AiPathFind::findGroundPath for VC6 builds to avoid mismatch with retail builds (#904) # This is the commit message #356: [ZH] Add missing call to IDirect3DSurface8::UnlockRect in W3DSmudge's copyRect (#893) # This is the commit message #357: [GEN][ZH] Prevent executing death modules and spawning new objects to avoid asserts and crashes when unloading a map and destroying all objects (#898) # This is the commit message #358: [GEN][ZH] Fix crash when taking a screenshot while the Game Window clips over the screen edge (#892) # This is the commit message #359: [GEN][ZH] Fix global-buffer-overflow at GUI_COMMAND_EXIT_CONTAINER in ControlBar::processCommandUI() (#922) Co-authored-by: Caball009 <Caball009@users.noreply.github.com> # This is the commit message #360: [GEN][ZH] Fix compiler warnings for redundant parentheses in if statement (#956) # This is the commit message #361: [GEN][ZH] Set correct size for array parameter in BezierSegment function declaration (#952) # This is the commit message #362: [GEN][ZH] Add parentheses around bit operations in locoSetMatches() (#951) # This is the commit message #363: [GEN][ZH] Fix incorrect size argument for memset in FileSystem::getFileInfo() (#949) # This is the commit message #364: [GEN][ZH] Fix incorrect grid resolution update condition in WaterRenderObjClass::setGridResolution() (#950) # This is the commit message #365: [GEN][ZH] Remove obsolete and wrong code in listGroupRoomsCallback() (#946) # This is the commit message #366: [CORE] Remove unused variables in assignment operators of Vector3Randomizer classes (#957) # This is the commit message #367: [GEN][ZH] Remove obsolete copy-protection code (#958) This removes the null safedisc library and all references to it. Since copy protection is already disabled in both the official game and globally in our codebase, this commit doesn't alter any active code. # This is the commit message #368: Fix compiler warnings for const qualifier on value return type (#943) # This is the commit message #369: [ZH] Fix mistakenly ignored test in comma-separated expression in FlightDeckBehavior::buildInfo() (#948) # This is the commit message #370: [GEN][ZH] Fix compiler warnings about missing return values for non-void functions (#955) # This is the commit message #371: [GEN][ZH] Fix array new / scalar delete mismatches in GameEngine, GameEngineDevice (#947) # This is the commit message #372: [GEN][ZH] Fix crash in StateMachine when a chained StateMachine update deletes the executor StateMachine (#890) # This is the commit message #373: [GEN][ZH] Separate ParticleUplinkCannonUpdate's damage radius calculation from LaserUpdate's client update (#874) # This is the commit message #374: [ZH] Fix compiler warning for incorrect include file name (#944) # This is the commit message #375: [GEN][ZH] Fix compiler warnings for issues with string literals (#945) # This is the commit message #376: [GEN][ZH] Fix crash in AIUpdateInterface::privateMoveAwayFromUnit() when a delayed AICommandParms relates to a then deleted object (#964) # This is the commit message #377: [GEN][ZH] Add null pointer tests in AIUpdateInterface::privateCommandButtonObject(), privateGuardObject() (#973) # This is the commit message #378: [GEN][ZH] Fix wrong assert condition in ClientInstance::getInstanceIndex() (#977) # This is the commit message #379: [GEN][ZH] Implement new user data ini files for multi instance clients (#905) # This is the commit message #380: [GEN][ZH] Implement Network Lobby support for multi instance clients (#906) # This is the commit message #381: [ZH] Fix crash in OpenContain::killAllContained() when killed occupants kill the host container (#921) # This is the commit message #382: [GEN][ZH] Implement fake CRC for Generals CD 1.08, Zero Hour CD 1.04 executable compatibility (#965) This change implements fake exe CRC for Generals CD 1.08 and Zero Hour CD 1.04 and allows VC6 builds to matchmake with retail builds in the Network Lobby and Online Lobby. It also suppresses version mismatch warnings in the Replay Load menu when loading compatible replays. # This is the commit message #383: Improve use of RETAIL_COMPATIBLE_CRC macro (#983) # This is the commit message #384: [GEN][ZH] Implement feature to Pause and Step Frames in Replay playback (#969) Press P to Pause and O to Step 1 Frame in Replay playback # This is the commit message #385: [GEN][ZH] Fix missing OLDER REPLAY VERSION dialog when double clicking a replay to load (#984) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #386: [GEN][ZH] Move duplicate code to load replay with into new function (#984) # This is the commit message #387: [GEN][ZH] Implement default key mapping for TOGGLE_FAST_FORWARD_REPLAY (#970) # This is the commit message #388: [GEN][ZH] Add Windows application manifest to tell Windows that the App is DPI aware (#595) # This is the commit message #389: [GEN][ZH] Fix crash when exiting Replay playback while a player places a beacon (#971) # This is the commit message #390: [GEN][ZH] Fix crash when exiting Replay playback while a player places a beacon (2) (#972) # This is the commit message #391: [GEN][ZH] Fix logical errors with RecorderClass::testVersionPlayback() (#989) # This is the commit message #392: [ZH] Mark created files present in the FileSystem to prevent map.ini load failure after Network map transfer (#991) # This is the commit message #393: [CORE] Change StringClass::Peek_Buffer functions to mutable Peek_Buffer and immutable str (#996) # This is the commit message #394: [GEN][ZH] Improve Network logging (#406) Add DEBUG_LOG message when sending packet is incomplete, when an unknown packet is received and when a packet cannot be sent. Add PRINTF_IP_AS_4_INTS macro to simplify printing of IP addresses. Also change logs in LANAPI::update to print proper IP addresses. # This is the commit message #395: [GEN][ZH] Decouple the Game Logic update in ParticleUplinkCannonUpdate from the Orbit To Ground Laser drawable (#976) # This is the commit message #396: [GEN][ZH] Fix ParticleUplinkCannonUpdate mismatch, introduced by previous refactoring (#1012) # This is the commit message #397: [CORE] Remove naked function declaration for WWMath::Inv_Sqrt (#1009) # This is the commit message #398: [GEN][ZH] Remove superfluous ARRAY_SIZE macro in StagingRoomGameInfo.cpp (#1008) # This is the commit message #399: [GEN][ZH] Fix crash on GameEngine shutdown when GameLogic::clearGameData() was not called before (#1001) # This is the commit message #400: [ZH] Remove unnecessary try catch block in ~PlayerList() (#1015) # This is the commit message #401: [GEN][ZH] Fix game crash in AIGroup::friend_moveFormationToPos() (#988) # This is the commit message #402: [GEN][ZH] Prevent dereferencing NULL pointer 'md' in populateRandomStartPosition() when starting a new game without a map (#993) # This is the commit message #403: [GEN][ZH] Prevent dereferencing NULL pointer 'pSL' in GameLogic::startNewGame() when starting a new game without a map (#993) # This is the commit message #404: [GEN][ZH] Move Replay Map info related code from PopulateReplayFileListbox to new function (#992) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #405: [GEN][ZH] Implement new GUI error dialogs when attempting to load a Replay that was deleted or whose map is missing (#992) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #406: [CORE] Fix up RefCountClass, RefCountPtr<T> (#1002) # This is the commit message #407: [CORE] Cleanup wwmath header for consistency (#1013) # This is the commit message #408: [ZH] Fix crash in TunnelContain::killAllContained() when killed occupants kill the host container (#1006) # This is the commit message #409: [GEN][ZH] Fix hollow BOX particles treated as LINE particles in ParticleSystem::computeParticlePosition() (#756) A break statement was in the wrong scope leading to hollow boxes behaving as though they were line systems. # This is the commit message #410: [GEN][ZH] Fix broken List Box when it contains tall rows (#1023) # This is the commit message #411: [GEN][ZH] Improve Replay Menu to show names of missing maps in red color (#1022) Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net> # This is the commit message #412: Update README.md (#515) # This is the commit message #413: Revert "[GEN][ZH] Decouple the Game Logic update in ParticleUplinkCannonUpdate from the Orbit To Ground Laser drawable (#976)" (#1050) This reverts commit ef17abf6928309698a7262c2b178f5a1a07bc880. # This is the commit message #414: [CORE] Fix compiler warnings for incorrect include file names in W3DView (#1040) # This is the commit message #415: [ZH] Fix compiler warnings for incorrect include file names in wdump (#1041) # This is the commit message #416: [GEN][ZH] Move CButtonShowColor header from source to include directory (#1042) # This is the commit message #417: [GEN][ZH] Fix logical expressions for TheGlobalData in TerrainTex and W3DShaderManager (#1044) # This is the commit message #418: [CORE] Fix wrong comparison expression in unused OBBoxClass::operator!= (#1045) # This is the commit message #419: [GEN][ZH] Refactor logical expression in SelectionTranslator::translateGameMessage() (#1046) # This is the commit message #420: [ZH] Refactor logical expression in AcademyStats::init() (#1047) # This is the commit message #421: [GEN][ZH] Initialize all uninitialized variables in AIPathfind (#1043) # This is the commit message #422: [GEN][ZH] Add message with additional information on CRC mismatch in Replay playback (#1052) # This is the commit message #423: [GEN][ZH] Fix Clang, GCC compile errors from static enum declarations (#1053) # This is the commit message #424: [GEN][ZH] Clear and assert GameWindow user data to avoid dangling pointers and memory leaks (#1027) # This is the commit message #425: [GEN][ZH] Prevent crashing from evaluating and saving disabled options in the Options Menu (#1028) # This is the commit message #426: [GEN][ZH] Disable the Firewall Port Override and HTTP Proxy settings from the Options Menu when in-game (#1029) # This is the commit message #427: [GEN][ZH] Prevent a custom Display Resolution from changing when making other changes in the Options Menu (#1030) # This is the commit message #428: [GEN][ZH] Fix crash in OpenContain::processDamageToContained() when killed occupants kill the host container (#1019) # This is the commit message #429: [GEN][ZH] Fix static initialization order for StatDumpClass and LogClass (#1003) # This is the commit message #430: [CORE] Change memory order for std::atomic_flag::test_and_set in FastCriticalSectionClass and ProfileFastCS (#1057) # This is the commit message #431: [GEN][ZH] Refactor non-trivial string objects as variadic function parameter (#1062) # This is the commit message #432: [GEN][ZH] Fix clang compile errors with enums FilterTypes, FilterModes, BodyDamageType (#1071) # This is the commit message #433: [ZH] Set correct fake CRC for Zero Hour CD 1.04 (#1051) # This is the commit message #434: [GEN][ZH] Simplify RecorderClass::appendNextCommand() (#1016) # This is the commit message #435: [ZH] Revert fix for uninitialized cellBounds in Pathfinder::classifyFence() for VC6 builds to avoid mismatching with Retail (#1075) # This is the commit message #436: [GEN][ZH] Remove unnecessary 3 seconds delay from game startup (#1069) # This is the commit message #437: [GEN][ZH] Fix some RTS_DEBUG and RTS_INTERNAL defines (#1070) # This is the commit message #438: [GEN][ZH] Refactor and clean up Command Line parsing (#1068) # This is the commit message #439: [GEN][ZH] Separate ParticleUplinkCannonUpdate's damage radius calculation from LaserUpdate's client update (2) (#1061) # This is the commit message #440: [GEN][ZH] Change reference counter implementation for StateMachine to avoid mismatch with Retail (#1078) # This is the commit message #441: [GEN][ZH] Fix Lan player tooltip (#408) # This is the commit message #442: [CORE] Fix wrong loop increment in GeneralsMatcher::checkMatchesInUserMap() (#1080) # This is the commit message #443: [GEN][ZH] Refactor evacuation code in OpenContain, TunnelContain (#1007) # This is the commit message #444: [GEN][ZH] Prevent IP options from changing when changing the Display Resolution in the Options Menu (#1060) # This is the commit message #445: [GEN][ZH] Significantly improve runtime performance by removing extraneous call to fflush in RecorderClass::writeToFile() (#1076) # This is the commit message #446: [GEN][ZH] Fix erroneous fflush(NULL) in RecorderClass::updateRecord() (#1077) # This is the commit message #447: [GEN][ZH] Fix security issue in map transfer by validating file paths when creating real paths from portable paths (#1058) # This is the commit message #448: [GEN][ZH] Make games compile with clang-cl in VS2022 (#888) # This is the commit message #449: [CORE][GEN][ZH] Make tools compile with clang-cl in VS2022 (#1039) # This is the commit message #450: [GEN][ZH] Fix missing return value of StateMachine::Num_Refs() (#1082) # This is the commit message #451: [CORE] Fix compile error "friend cannot be used with static" in mangler's and matchbot's threadfac.h (#1104) # This is the commit message #452: [GITHUB] Disable VCPKG builds and remove INTERNAL builds to speed up CI (#1115) # This is the commit message #453: [GEN][ZH] Fix dereferencing NULL pointer 'hostStruct' in PingThreadClass::Thread_Function() (#1102) # This is the commit message #454: [ZH] Prevent dereferencing NULL pointer 'ppi' in FlightDeckBehavior::exitObjectViaDoor() (#1107) # This is the commit message #455: [CORE] Prevent dereferencing NULL pointer 't' in Record_Texture_End() (#1108) # This is the commit message #456: [ZH] Remove unnecessary NULL pointer test in ..CrateCollide::executeCrateBehavior (#1109) # This is the commit message #457: [GEN][ZH] Replace TheGlobalData macro with inline variable to make debugging easier (#1118) # This is the commit message #458: [GEN][ZH] Downgrade debug assertion to log for isPathInDirectory (#1128) # This is the commit message #459: [ZH] Fix heap-use-after-free in LayersList::updateUIFromList() when creating a new map in World Builder (#1098) # This is the commit message #460: [GEN] Backport bug fixes in CWorldBuilderDoc::OnNewDocument from Zero Hour (#1099) # This is the commit message #461: [GEN][ZH] Annotate fallthrough between various switch case labels (#1085) # This is the commit message #462: [GEN][ZH] Prevent using uninitialized memory 'offset_u' in W3DTankDraw, W3DTankTruckDraw (#1086) # This is the commit message #463: [GEN][ZH] Prevent using uninitialized memory 'start', 'end' in BridgeScaffoldBehavior::update() (#1088) # This is the commit message #464: [GEN][ZH] Prevent dereferencing NULL pointer 'tex' in WW3DAssetManager::Get_Texture() (#1089) # This is the commit message #465: [GEN][ZH] Prevent reading invalid data in LoadScreen (#1090) # This is the commit message #466: [GEN][ZH] Fix using uninitialized memory 'curVictim' in EMPUpdate (#1094) # This is the commit message #467: [GEN][ZH] Prevent dereferencing NULL pointer 'TheAI' in AI::parseAiDataDefinition() (#1096) # This is the commit message #468: [GEN][ZH] Prevent dereferencing NULL pointer 'that' in PhysicsBehavior::transferVelocityTo() (#1101) # This is the commit message #469: [GEN][ZH] Fix heap-use-after-free in DisconnectManager::update() (#1103) # This is the commit message #470: [GEN][ZH] Prevent buffer overrun while writing to 'new_types', 'new_lensflares' in DazzleRenderObjClass (#1111) # This is the commit message #471: [GEN][ZH] Fix dereferencing NULL pointer 'ext' in DX8Wrapper::_Create_DX8_Surface() (#1112) # This is the commit message #472: [GEN][ZH] Write correct call to super class in constructor of GameSpyGameSlot (#1113) # This is the commit message #473: [GEN][ZH] Remove unnecessary NULL pointer test in UpdateSlotList() (#1120) # This is the commit message #474: [GEN][ZH] Prevent dereferencing NULL pointer 'button' in ScriptActions::doCameoFlash() (#1121) # This is the commit message #475: [GEN][ZH] Prevent using uninitialized memory 'hr' in W3DShaderManager::LoadAndCreateD3DShader() (#1123) # This is the commit message #476: [GEN][ZH] Add missing break keywords between switch labels in W3DProjectedShadow, W3DDisplay, W3DWater (#1125) # This is the commit message #477: [GEN][ZH] Fix dereferencing NULL pointer 'CBScheme->m_buttonQueueImage' in ControlBarSchemeManager::preloadAssets() (#1126) # This is the commit message #478: [GEN][ZH] Fix using uninitialized memory 'window' in GameWindowManagerScript's createGadget (#1127) # This is the commit message #479: [GEN][ZH] Fix incorrect default Resolution selection in the Options Menu when the loaded Resolution does not match the active Display Resolution (#1056) # This is the commit message #480: [CORE] Fix copying of RefCountClass, RefCountValue (#1081) # This is the commit message #481: [GEN][ZH] Prevent unlikely buffer overrun while writing to 'newPts' in PolygonTrigger::reallocate() (#1091) # This is the commit message #482: [GEN][ZH] Fix dereferencing NULL pointer 'victimObj' in WeaponTemplate::estimateWeaponTemplateDamage() (#1093) # This is the commit message #483: [GEN][ZH] Fix using uninitialized memory 'buff' in INI::getNextQuotedAsciiString() (#1097) # This is the commit message #484: [GEN][ZH] Add Replay Simulation feature (#923) Invoked with command line arguments -headless -jobs 1..N -replay ReplayName1 -replay ReplayName2 # This is the commit message #485: [ZH] Prevent dereferencing NULL pointer 'state' in StateMachine::xfer() (#1100) # This is the commit message #486: [GEN][ZH] Remove unnecessary NULL pointer tests in RTS3DScene::RTS3DScene() (#1105) # This is the commit message #487: [GEN][ZH] Suppress compiler warning about dereferencing NULL pointer 'builderObj' in PlaceEventTranslator::translateGameMessage() (#1106) # This is the commit message #488: [GEN][ZH] Remove unnecessary NULL pointer test in CrateCollide::isValidToExecute() (#1110) # This is the commit message #489: [GEN][ZH] Prevent dereferencing NULL pointer 'pbmi' and memory leaks in CreateBMPFile() (#1124) # This is the commit message #490: [GEN][ZH] Prevent using uninitialized memory 'locked_rects' in TextureLoader::Load_Thumbnail() (#1129) # This is the commit message #491: [GEN][ZH] Do not acquire money transaction audio if the play sound parameter is false (#1130) # This is the commit message #492: [GEN][ZH] Prevent using uninitialized memory 'delta' in Dict::ensureUnique() (#1131) # This is the commit message #493: [GEN][ZH] Suppress compiler warning about buffer overrun while writing to 'newIndices' in PopulateLobbyPlayerListbox() (#1132) # This is the commit message #494: [GEN][ZH] Prevent using uninitialized memory 'result' in PartitionData::calcMaxCoiForShape() (#1133) # This is the commit message #495: [GEN][ZH] Prevent using uninitialized memory in PartitionData::updateCellsTouched() (#1134) # This is the commit message #496: [GEN][ZH] Fix GEOMETRY_SPHERE & GEOMETRY_CYLINDER treated as GEOMETRY_BOX in PartitionData::calcMaxCoiForShape() (#1135) # This is the commit message #497: [GEN][ZH] Remove unnecessary NULL pointer test in SaveLoadMenuSystem() (#1136) # This is the commit message #498: [GEN][ZH] Prevent dereferencing NULL pointer 'player' in setObserverWindows() (#1137) # This is the commit message #499: [GEN][ZH] Remove unnecessary NULL pointer test in CommandTranslator::evaluateContextCommand() (#1138) # This is the commit message #500: [GEN][ZH] Suppress compile warning about buffer overrun while writing to 'm_structuresToRepair' in AIPlayer::repairStructure() (#1139) # This is the commit message #501: [GEN][ZH] Prevent dereferencing NULL pointer 'damageSource' in TransitionDamageFX::onBodyDamageStateChange() (#1140) # This is the commit message #502: [GEN][ZH] Prevent dereferencing NULL pointer 'drawable' in BoneFXUpdate::resolveBoneLocations() (#1142) # This is the commit message #503: [GEN][ZH] Prevent dereferencing NULL pointer 'font' in W3DFontLibrary::releaseFontData() (#1143) # This is the commit message #504: [CORE] Prevent using uninitialized memory 'listline' in Cftp::FindFile() (#1144) # This is the commit message #505: [CORE] Prevent using uninitialized memory 'name' in RenderObjPersistFactoryClass::Load() (#1145) # This is the commit message #506: [GEN][ZH] Remove unnecessary NULL pointer test in RTS3DScene::Visibility_Check() (#1146) # This is the commit message #507: [GEN][ZH] Prevent dereferencing NULL pointer 'TheWritableGlobalData' in GameLODManager::applyStaticLODLevel() (#1149) # This is the commit message #508: [GEN][ZH] Prevent reading invalid data from 'm_numLevelPresets' in GameLODManager::newLODPreset() (#1150) # This is the commit message #509: [GEN][ZH] Prevent reading invalid data from 'm_staticGameLODInfo' in GameLODManager::getRecommendedTextureReduction() (#1151) # This is the commit message #510: [GEN][ZH] Prevent dereferencing NULL pointer 'theTemplate' in UpgradeMuxData::getUpgradeActivationMasks() (#1141) # This is the commit message #511: [GEN][ZH] Fix World Builder crashing on drawing scene, introduced by previous change #1146 (#1184) # This is the commit message #512: [GEN][ZH] Remove obsolete benchmark dependency (#1038) # This is the commit message #513: [GEN][ZH] Fix crash when launching the game with an unsupported Display Resolution or when the graphics adapter does not support 800 x 600 (#1055) # This is the commit message #514: [GEN][ZH] Check vector size before accessing first element in World Builder's MapObjectProps and ScorchOptions (#1117) # This is the commit message #515: [GEN][ZH] Prevent dereferencing NULL pointer 'TheControlBar', 'window' in ControlBarCallback (#1148) # This is the commit message #516: [GEN][ZH] Fix potential bug or crash when denying a Buddy Request in the Online Communicator (#1153) # This is the commit message #517: [GEN][ZH] Fix missing break at switch case SPEECH_PLAY in ScriptAction::ParseAction() (#1154) # This is the commit message #518: [GEN][ZH] Prevent using uninitialized memory 'relationDescriber' in ScriptConditions::evaluateEnemySighted() (#1155) # This is the commit message #519: [GEN][ZH] Fix missing unit voice when attacking the ground (#1156) # This is the commit message #520: [GEN][ZH] Fix missing break at switch case GBM_SELECTED in GadgetTabControlSystem() (#1157) # This is the commit message #521: [GEN][ZH] Fix missing break at switch case REVERSESOUNDTRANSITION_FIRESOUND in ReverseSoundTransition::update() (#1158) # This is the commit message #522: [GEN][ZH] Fix missing break at switch case GEM_UPDATE_TEXT in PopupReplaySystem() (#1159) # This is the commit message #523: [GEN][ZH] Fix missing break at switch case GBM_SELECTED in ScoreScreenSystem() (#1160) # This is the commit message #524: [GEN][ZH] Fix missing break at switch case GSM_SLIDER_TRACK in SkirmishGameOptionsMenuSystem() (#1161) # This is the commit message #525: [GEN][ZH] Fix missing break at switch case PeerResponse::PEERRESPONSE_DISCONNECT in WOLGameSetupMenuUpdate(), WOLLobbyMenuUpdate() (#1162) # This is the commit message #526: [GEN][ZH] Fix unannotated fallthrough at switch case GameMessage::MSG_DEFECTOR_HINT in HintSpyTranslator::translateGameMessage() (#1163) # This is the commit message #527: [GEN][ZH] Fix missing break at switch case GameMessage::MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION in GameLogic::logicMessageDispatcher() (#1164) # This is the commit message #528: [GEN][ZH] Fix wrong returned name for D3DTSS_TEXTURETRANSFORMFLAGS in DX8Wrapper::Get_DX8_Texture_Stage_State_Value_Name() (#1165) # This is the commit message #529: [GEN][ZH] Fix missing break at switch case GWM_INPUT_FOCUS in IdleWorkerSystem() (#1166) # This is the commit message #530: [GEN][ZH] Prevent using uninitialized memory 'closestVec' in PartitionManager::getClosestObjects() (#1168) # This is the commit message #531: [GEN][ZH] Fix inaudible UnableToSetRallyPoint audio event when misplacing a Rally Point (#1173) # This is the commit message #532: [CMAKE] Remove obsolete interface libraries, add missing core gameengine include interface library (#1036) # This is the commit message #533: [CORE] Fix memset zero in max2w3d's VectorChannelClass::SaveAdaptiveDelta() (#1195) # This is the commit message #534: [GEN][ZH] Fix CONTINUE button mistakenly shown in Replay Score Screen (#1196) # This is the commit message #535: [GEN][ZH] Fix Retail Mismatch in Release Build when Logging is enabled (#759) # This is the commit message #536: [GEN][ZH] Fix untimely Exe CRC generation in GlobalData (#1197) # This is the commit message #537: [GEN][ZH] Remove unnecessary NULL pointer tests in InGameUI (#1092) # This is the commit message #538: [CORE] Fix dereferencing NULL pointer 'ptemp_obj' in AggregateDefClass::Find_Subobject() (#1147) # This is the commit message #539: [ZH] Fix crash with USA Particle Cannon when the last scripted target waypoint is reached before the end of the firing sequence (#1206) # This is the commit message #540: [GEN][ZH] Prevent duplicate replays from being shown in the Replay Menu (#1208) # This is the commit message #541: [ZH] Fix compiler warning about incorrect order of operations in WorldHeightMap::getPointerToTileData() (#1152) # This is the commit message #542: [ZH] Fix USA Particle Cannon performing incorrect firing sequence after it was scripted to fire along a waypoint path (#1207) # This is the commit message #543: [GEN][ZH] Fix game crash in AIGroup::groupSell() (#1200) # This is the commit message #544: [GEN][ZH] Enable resolutions with aspect ratios different from 4:3 in Options Menu (#460) # This is the commit message #545: [GEN][ZH] Prevent game crash when a play…

vitimiti · 2025-11-11T18:04:20Z

It is going to take me a while to fix this, bare with me

xezon reviewed Nov 6, 2025

View reviewed changes

Core/Tools/WW3D/pluglib/WWmatrix3.cpp Outdated Show resolved Hide resolved

xezon added the Refactor Edits the code with insignificant behavior changes, is never user facing label Nov 6, 2025

Mauller reviewed Nov 7, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp Show resolved Hide resolved

Skyaero42 reviewed Nov 8, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp Outdated Show resolved Hide resolved

Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp Outdated Show resolved Hide resolved

Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp Show resolved Hide resolved

Caball009 reviewed Nov 8, 2025

View reviewed changes

Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp Show resolved Hide resolved

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp Show resolved Hide resolved

Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp Show resolved Hide resolved

Skyaero42 reviewed Nov 10, 2025

View reviewed changes

Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp Show resolved Hide resolved

vitimiti closed this Nov 11, 2025

vitimiti force-pushed the end_return_refactor branch from dcf3884 to ea36351 Compare November 11, 2025 17:16

refactor: Remove return redundant logic. #1811

refactor: Remove return redundant logic. #1811

Uh oh!

Conversation

vitimiti commented Nov 6, 2025

Uh oh!

Skyaero42 commented Nov 6, 2025

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

xezon commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

xezon commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

xezon commented Nov 6, 2025

Uh oh!

vitimiti commented Nov 6, 2025

Uh oh!

xezon commented Nov 7, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vitimiti commented Nov 8, 2025

Uh oh!

vitimiti commented Nov 8, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xezon commented Nov 10, 2025

Uh oh!

vitimiti commented Nov 10, 2025

Uh oh!

Skyaero42 commented Nov 11, 2025

Uh oh!

vitimiti commented Nov 11, 2025

Uh oh!

vitimiti commented Nov 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

refactor: Remove `return` redundant logic. #1811

refactor: Remove `return` redundant logic. #1811