Merge branch 'main' of https://github.com/Caball009/GeneralsGameCode

Author: Caball009

.github/workflows/build-toolchain.yml

@@ -48,9 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build\${{ inputs.preset }}\_deps
-          key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('cmake/**/*.cmake', '**/CMakeLists.txt') }}
-          restore-keys: |
-            cmake-deps-${{ inputs.preset }}-
+          key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
 
       - name: Download VC6 Portable from Cloudflare R2
         if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}

CMakePresets.json

@@ -9,13 +9,13 @@
         {
             "name": "vc6",
             "displayName": "Windows 32bit VC6 Release",
-            "generator": "NMake Makefiles",
+            "generator": "Ninja",
             "hidden": false,
             "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
-                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
+                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "",
                 "CMAKE_BUILD_TYPE": "Release",
                 "RTS_FLAGS": "/W3"
             },

CONTRIBUTING.md

@@ -0,0 +1,143 @@
+# How to contribute as a developer
+
+To contribute, fork this repository to create your own copy that you can clone locally and push back to. You can use your fork to create pull requests for your code to be merged into this repository.
+
+## Code guidelines
+
+### Scope of code changes
+
+Code edits only touch the lines of code that serve the intended goal of the change. Big refactors should not be combined with logical changes, because these can become very difficult to review. If a change requires a refactor, create a commit for the refactor before (or after) creating a commit for the change. A Pull Request can contain multiple commits and can be merged with **Rebase and Merge** if these commits are meant to be preserved on the main branch. Otherwise, method of merging will be **Squash and Merge**.
+
+### Style of code changes
+
+Code edits should fit the nearby code in ways that the code style reads consistent, unless the original code style is bad. The original game code uses c++98, or a deviation thereof, and is simple to read. Prefer not to use newer language features unless required to implement the desired change. Prefer to use newer language features when they are considerably more robust or make the code easier to understand or maintain.
+
+### Language style guide
+
+*Work in progress. Needs a maintainer. Can be built upon existing Code guidelines, such as the "Google C++ Style Guide".*
+
+### Precedence of code changes
+
+Changes to Zero Hour take precedence over Generals, if applicable. When the changed code is not shared by both titles, then the change needs to be created for Zero Hour first, and then recreated for Generals. The implementation of a change for both titles needs to be identical or as close as possible. Preferably the Generals replica of a change comes with the same Pull Request. The Generals replica can be created after the Zero Hour code review has finished.
+
+
+## Change documentation
+
+User facing changes need to be documented in code, Pull Requests and change logs. All documentation ideally is written in the present tense, and not the past.
+
+Good:
+
+> Fixes particle effect of USA Missile Defender
+
+Bad:
+
+> Fixed particle effect of USA Missile Defender
+
+When a text refers to a faction unit, structure, upgrade or similar, then the unit should be worded without any abbrevations and should be prefixed with the faction name. Valid faction names are USA, China, GLA, Boss, Civilian. Subfaction names can be appended too, for example GLA Stealth.
+
+Good:
+
+> Fixes particle effect of USA Missile Defender
+
+Bad:
+
+> Fixes particle effect of MD
+
+
+### Code documentation
+
+User facing changes need to be accompanied by comment(s) where the change is made. Maintenance related changes, such as compilation fixes, typically do not need commenting, unless the next reader can benefit from a special explanation. The comment can be put at the begin of the changed file, class, function or block. It must be clear from the change description what has changed.
+
+The expected comment format is
+
+```
+// TheSuperHackers @keyword author DD/MM/YYYY A meaningful description for this change.
+```
+
+The `TheSuperHackers` word and `@keyword` are mandatory. `author` and date can be omitted when preferred.
+
+| Keyword          | Use-case                                                    |
+|------------------|-------------------------------------------------------------|
+| @bugfix          | Fixes a bug                                                 |
+| @fix             | Fixes something, but is not a user facing bug               |
+| @compile         | Addresses a compile warning or error                        |
+| @feature         | Adds something new                                          |
+| @performance     | Improves performance                                        |
+| @refactor        | Moves or rewrites code, but does not change the behaviour   |
+| @tweak           | Changes values or settings                                  |
+| @info            | Writes useful information for the next reader               |
+| @todo            | Adds a note for something left to do if really necessary    |
+
+Block comment sample
+
+```
+    // TheSuperHackers @bugfix JAJames 17/03/2025 Fix uninitialized memory access and add more Windows versions.
+    memset(&os_info,0,sizeof(os_info));
+```
+
+Optionally, the pull request number can be appended to the comment. This can only be done after the pull request has been created.
+
+```
+// TheSuperHackers @bugfix JAJames 17/03/2025 Fix uninitialized memory access and add more Windows versions. (#123)
+```
+
+### Pull request documentation
+
+The title of a new Pull Request, and/or commit(s) within, begin with a **[GEN]** and/or **[ZH]** tag, depending on the game(s) it targets. If a change does not target a game, then a tag is not necessary. Furthermore, the title consists of a concise and descriptive sentence about the change and/or commit, beginning with an uppercase letter and ending without a dot. The title ideally begins with a word that describes the action that the change takes, for example `Fix *this*`, `Change *that*`, `Add *those*`, `Refactor *thing*`.
+
+Good:
+```
+[GEN][ZH] Fix uninitialized memory access in Get_OS_Info
+```
+
+Bad:
+```
+Minimal changes for successful build.
+```
+
+Currently established commit title tags are
+
+* [GEN]
+* [ZH]
+* [CORE]
+* [CMAKE]
+* [GITHUB]
+* [LINUX]
+
+If the Pull Request is meant to be merged with rebase, then a note for **Merge with Rebase** should be added to the top of the text body, to help identify the correct merge action when it is ready for merge. All commits of the Pull Request need to be properly named and need the number of the Pull Request added as a suffix in parentheses. Example: **(#333)**. All commits need to be able to compile on their own without dependencies in newer commits of the same Pull Request. Prefer to create changes for **Squash and Merge**, as this will simplify things.
+
+The text body begins with links to related issue report(s) and/or Pull Request(s) if applicable.
+
+To write a link use the following format:
+
+```
+* Fixes #222
+* Closes #333
+* Relates to #555
+* Follow up for #666
+```
+
+Links are commonly used for
+
+* closing a related issue report or task when this pull request is merged
+* closing another pull request when this pull request is merged
+
+Some keywords are interpreted by GitHub. Read about it [here](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+The text body continues with a description of the change in appropriate detail. This serves to educate reviewers and visitors to get a good understanding of the change without the need to study and understand the associated changed files. If the change is controversial or affects gameplay in a considerable way, then a rationale text needs to be appended. The rationale explains why the given change makes sense.
+
+
+### Pull request merging rules
+
+Please be mindful when merging changes. There are pitfalls in regards to the commit title consistency.
+
+When attempting to **Squash and Merge** a Pull Request that contains a single commit, then GitHub will default generate a commit title from that single commit. Typically this is undesired, when the new commit title is meant to be kept in sync with the Pull Request title rather than the Pull Request commit title. The generated commit title may need to be adjusted before merging the Pull Request.
+
+When attempting to **Squash and Merge** a Pull Request that contains multiple commits, the GitHub will default generate a commit title from the Pull Request title. Additionally it will generate a commit description from the multiple commits that are part of the Pull Request. The generated commit description generally needs to be cleared before merging the Pull Request to keep the commit title clean.
+
+When attempting to **Rebase and Merge** a Pull Request, then all commits will transfer with the same names to the main branch. Verify that all commit titles are properly crafted, with tags where applicable, trailing Pull Request numbers in parentheses and no unnecessary commit descriptions (texts below the commit title).
+
+
+### Change log documentation
+
+*Work in progress.*

Core/GameEngine/CMakeLists.txt

@@ -112,6 +112,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/StateMachine.h
 #    Include/Common/StatsCollector.h
 #    Include/Common/STLTypedefs.h
+    Include/Common/STLUtils.h
 #    Include/Common/StreamingArchiveFile.h
 #    Include/Common/SubsystemInterface.h
 #    Include/Common/SystemInfo.h

Core/GameEngine/Include/Common/GameDefines.h

@@ -29,6 +29,14 @@
 #define RETAIL_COMPATIBLE_XFER_SAVE (1) // Game is expected to be Xfer Save compatible with retail Generals 1.08, Zero Hour 1.04
 #endif
 
+// This is essentially synonymous for RETAIL_COMPATIBLE_CRC. There is a lot wrong with AIGroup, such as use-after-free, double-free, leaks,
+// but we cannot touch it much without breaking retail compatibility. Do not shy away from using massive hacks when fixing issues with AIGroup,
+// but put them behind this macro.
+
+#ifndef RETAIL_COMPATIBLE_AIGROUP
+#define RETAIL_COMPATIBLE_AIGROUP (1) // AIGroup logic is expected to be CRC compatible with retail Generals 1.08, Zero Hour 1.04
+#endif
+
 #ifndef ENABLE_GAMETEXT_SUBSTITUTES
 #define ENABLE_GAMETEXT_SUBSTITUTES (1) // The code can provide substitute texts when labels and strings are missing in the STR or CSF translation file
 #endif

Core/GameEngine/Include/Common/STLUtils.h

@@ -0,0 +1,61 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <Utility/CppMacros.h>
+#include <utility>
+
+namespace stl
+{
+
+// Finds first matching element in vector-like container and erases it.
+template <typename Container>
+bool find_and_erase(Container& container, const typename Container::value_type& value)
+{
+	typename Container::const_iterator it = container.begin();
+	for (; it != container.end(); ++it)
+	{
+		if (*it == value)
+		{
+			container.erase(it);
+			return true;
+		}
+	}
+	return false;
+}
+
+// Finds first matching element in vector-like container and removes it by swapping it with the last element.
+// This is generally faster than erasing from a vector, but will change the element sorting.
+template <typename Container>
+bool find_and_erase_unordered(Container& container, const typename Container::value_type& value)
+{
+	typename Container::iterator it = container.begin();
+	for (; it != container.end(); ++it)
+	{
+		if (*it == value)
+		{
+			*it = CPP_11(std::move)(container.back());
+			container.pop_back();
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace stl

Core/Tools/W3DView/W3DView.cpp

@@ -472,7 +472,7 @@ CAboutDlg::OnInitDialog (void)
 				version_minor = pversion_info->dwFileVersionLS;
 			}
 		}
-		SAFE_DELETE (pblock);
+		SAFE_DELETE_ARRAY(pblock);
 	}
 
 	// Put the version string into the dialog

Generals/Code/GameEngine/Include/Common/GameEngine.h

@@ -85,6 +85,8 @@ class GameEngine : public SubsystemInterface
 
 protected:
 
+	virtual void resetSubsystems( void );
+
 	virtual FileSystem *createFileSystem( void );								///< Factory for FileSystem classes
 	virtual LocalFileSystem *createLocalFileSystem( void ) = 0;	///< Factory for LocalFileSystem classes
 	virtual ArchiveFileSystem *createArchiveFileSystem( void ) = 0;	///< Factory for ArchiveFileSystem classes

Generals/Code/GameEngine/Include/Common/Player.h

@@ -608,7 +608,7 @@ class Player : public Snapshot
 	// add to the player's current selection this hotkey team.
 	void processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg);
 
-	// returns an AIGroup object that is the currently selected group.
+	// fills an AIGroup object that is the currently selected group.
 	void getCurrentSelectionAsAIGroup(AIGroup *group);
 
 	// sets the currently selected group to be the given AIGroup

Generals/Code/GameEngine/Include/Common/Radar.h

@@ -190,9 +190,8 @@ class Radar : public Snapshot,
  	Bool tryEvent( RadarEventType event, const Coord3D *pos );	///< try to make a "stealth" event
 
 	// adding and removing objects from the radar
-	void addObject( Object *obj );													///< add object to radar
-	void removeObject( Object *obj );												///< remove object from radar
-	void examineObject( Object *obj );											///< re-examine object and resort if needed
+	virtual bool addObject( Object *obj );									///< add object to radar
+	virtual bool removeObject( Object *obj );								///< remove object from radar
 
 	// radar options
 	void hide( Bool hide ) { m_radarHidden = hide; }				///< hide/unhide the radar