Merge branch 'main' of https://github.com/TheSuperHackers/GeneralsGameCode into weekly-release

Author: fbraz3

CMakeLists.txt

@@ -63,7 +63,6 @@ if (IS_VS6_BUILD)
     # If there is a desire to make this work, then a fixed max sdk needs to be created.
     add_subdirectory(Dependencies/MaxSDK)
 endif()
-add_subdirectory(Dependencies/SafeDisc)
 add_subdirectory(Dependencies/Utility)
 add_subdirectory(resources)
 

Core/GameEngine/CMakeLists.txt

@@ -21,7 +21,6 @@ set(GAMEENGINE_SRC
 #    Include/Common/CDManager.h
 #    Include/Common/ClientUpdateModule.h
 #    Include/Common/CommandLine.h
-#    Include/Common/CopyProtection.h
 #    Include/Common/crc.h
 #    Include/Common/CRCDebug.h
 #    Include/Common/CriticalSection.h
@@ -43,6 +42,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/FunctionLexicon.h
 #    Include/Common/GameAudio.h
 #    Include/Common/GameCommon.h
+    Include/Common/GameDefines.h
 #    Include/Common/GameEngine.h
 #    Include/Common/GameLOD.h
 #    Include/Common/GameMemory.h
@@ -631,7 +631,6 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/AsciiString.cpp
 #    Source/Common/System/BuildAssistant.cpp
 #    Source/Common/System/CDManager.cpp
-#    Source/Common/System/CopyProtection.cpp
 #    Source/Common/System/CriticalSection.cpp
 #    Source/Common/System/DataChunk.cpp
 #    Source/Common/System/Debug.cpp

Core/GameEngine/Include/Common/GameDefines.h

@@ -0,0 +1,34 @@
+/*
+**	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
+
+// Note: Retail compatibility must not be broken before this project officially does.
+// Use RETAIL_COMPATIBLE_CRC and RETAIL_COMPATIBLE_XFER_SAVE to guard breaking changes.
+
+#ifndef RETAIL_COMPATIBLE_CRC
+#define RETAIL_COMPATIBLE_CRC (1) // Game is expected to be CRC compatible with retail Generals 1.08, Zero Hour 1.04
+#endif
+
+#ifndef RETAIL_COMPATIBLE_XFER_SAVE
+#define RETAIL_COMPATIBLE_XFER_SAVE (1) // Game is expected to be Xfer Save 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/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp

@@ -228,7 +228,7 @@ Is_In_Param_List
 			// OutputDebugString( "\n" );
 
 			// if ( stricmp( string.Peek_Buffer(), param_to_check ) == 0 ) // Breaks with whitespaces
-			if ( strstr( string.Peek_Buffer(), param_to_check ) != 0 )
+			if ( strstr( string.str(), param_to_check ) != 0 )
 			{
 			 	return( true );
 			}
@@ -447,7 +447,7 @@ AnimatedSoundMgrClass::Get_Embedded_Sound_Name (HAnimClass *anim)
 		return NULL;
 	}
 
-	return list->BoneName.Peek_Buffer();
+	return list->BoneName.str();
 }
 
 
@@ -527,7 +527,7 @@ AnimatedSoundMgrClass::Trigger_Sound
 						//
 						// Stop the audio
 						//
-						SoundLibrary->Stop_Playing_Audio( sound_list->List[index]->SoundName.Peek_Buffer() );
+						SoundLibrary->Stop_Playing_Audio( sound_list->List[index]->SoundName.str() );
 					}
 					else
 					{
@@ -536,11 +536,11 @@ AnimatedSoundMgrClass::Trigger_Sound
 						//
 						if (sound_list->List[index]->Is2D == true) 
 						{
-							SoundLibrary->Play_2D_Audio(sound_list->List[index]->SoundName.Peek_Buffer());
+							SoundLibrary->Play_2D_Audio(sound_list->List[index]->SoundName.str());
 						} 
 						else 
 						{
-							SoundLibrary->Play_3D_Audio(sound_list->List[index]->SoundName.Peek_Buffer(), tm);
+							SoundLibrary->Play_3D_Audio(sound_list->List[index]->SoundName.str(), tm);
 						}
 					}
 

Core/Libraries/Source/WWVegas/WW3D2/rendobj.h

@@ -452,9 +452,9 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	virtual void					Scale(float scale) 															{ };
 	virtual void					Scale(float scalex, float scaley, float scalez)						{ };
  	virtual void					Set_ObjectScale(float scale) { ObjectScale=scale;}	//set's a scale factor that's factored into transform matrix.									{ScaleFactor=scale; };
-	const float						Get_ObjectScale( void ) const { return ObjectScale; };
+	float							Get_ObjectScale( void ) const { return ObjectScale; };
  	void							Set_ObjectColor(unsigned int color) { ObjectColor=color;}	//the color that was used to modify the asset for player team color (for Generals). -MW
-	const unsigned int				Get_ObjectColor( void ) const { return ObjectColor; };
+	unsigned int					Get_ObjectColor( void ) const { return ObjectColor; };
 
    virtual int						Get_Sort_Level(void) const													{ return 0; /* SORT_LEVEL_NONE */ }
    virtual void					Set_Sort_Level(int level)													{ }

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

@@ -113,7 +113,7 @@ static void Record_Texture_End()
 //				if (tfc->Get_Texture_Flash()) flash="F";
 //			}
 
-			working_string.Format("%4.4d  %3.3d   %3.3d     %s ",id,texture_statistics[a].usage_count,texture_statistics[a].change_count,flash.Peek_Buffer());
+			working_string.Format("%4.4d  %3.3d   %3.3d     %s ",id,texture_statistics[a].usage_count,texture_statistics[a].change_count,flash.str());
 			texture_statistics_string+=working_string;
 
 			StringClass error="";

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

@@ -86,9 +86,9 @@ bool	W3DExclusionListClass::Is_Excluded(HAnimClass * hanim) const
 {
 	// For HAnims, the name to check is the one trailing the '.'
 	StringClass copy = hanim->Get_Name();
-	char * root_name = copy.Peek_Buffer();
+	const char * root_name = copy.str();
 
-	char * tmp = strchr(root_name,'.');
+	const char * tmp = strchr(root_name,'.');
 	if (tmp) {
 		return Is_Excluded(tmp + 1);
 	} else { 

Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h

@@ -386,7 +386,7 @@ class WWAudioClass
 	// Note:  The cache sizes are in kilo-bytes.  The default
 	// is currently set to 1MB.
 	//
-	bool					Set_Cache_Size (int kbytes = DEF_CACHE_SIZE)	{ m_MaxCacheSize = (kbytes * 1024); }
+	void					Set_Cache_Size (int kbytes = DEF_CACHE_SIZE)	{ m_MaxCacheSize = (kbytes * 1024); }
 	int					Get_Cache_Size (void) const						{ return m_MaxCacheSize / 1024; }
 	int					Get_Current_Cache_Size (void) const				{ return m_CurrentCacheSize; }
 

Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp

@@ -202,7 +202,7 @@ void WWProfileHierachyNodeClass::Write_To_File(FileClass* file,int recursion)
 		for (i=0;i<recursion;++i) { string+="\t"; }
 		work.Format("%s\t%d\t%f\r\n",Name,TotalCalls,TotalTime*1000.0f);
 		string+=work;
-		file->Write(string.Peek_Buffer(),string.Get_Length());
+		file->Write(string.str(),string.Get_Length());
 	}
 	if (Child) {
 		Child->Write_To_File(file,recursion+1);
@@ -577,7 +577,7 @@ void	WWProfileManager::End_Collecting(const char* filename)
 				"Total frames: %d, average frame time: %fms\r\n"
 				"All frames taking more than twice the average frame time are marked with keyword SPIKE.\r\n\r\n",
 				ProfileCollectVector.Count(),avg_frame_time*1000.0f);
-			file->Write(str.Peek_Buffer(),str.Get_Length());
+			file->Write(str.str(),str.Get_Length());
 
 			HashTemplateIterator<StringClass,unsigned> ite(ProfileStringHash);
 			for (ite.First();!ite.Is_Done();ite.Next()) {
@@ -591,18 +591,18 @@ void	WWProfileManager::End_Collecting(const char* filename)
 					if (name[i]==';') name[i]=':';
 				}
 				str.Format("ID: %d %s\r\n",ite.Peek_Value(),name);
-				file->Write(str.Peek_Buffer(),str.Get_Length());
+				file->Write(str.str(),str.Get_Length());
 			}
 
 			str.Format("\r\n\r\n");
-			file->Write(str.Peek_Buffer(),str.Get_Length());
+			file->Write(str.str(),str.Get_Length());
 
 			for (i=0;i<ProfileCollectVector.Count();++i) {
 				float frame_time=ProfileCollectVector[i]->Get_Total_Time();
 				str.Format("FRAME: %d %2.2f %s ",i,frame_time*1000.0f,frame_time>avg_frame_time*2.0f ? "SPIKE" : "OK");
 				ProfileCollectVector[i]->Add_To_String_Compact(str,0);
 				str+="\r\n";
-				file->Write(str.Peek_Buffer(),str.Get_Length());
+				file->Write(str.str(),str.Get_Length());
 			}
 
 			//

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -47,6 +47,8 @@
 #include <Utility/compat.h>
 #include <Utility/stdint_adapter.h>
 
+#include <Utility/CppMacros.h>
+
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.
 #pragma warning(disable : 4530)