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)
 

Core/Libraries/Source/WWVegas/WWLib/cpudetect.cpp

@@ -792,7 +792,7 @@ void CPUDetectClass::Init_Processor_String()
 			case INTEL_PROCESSOR_PENTIUM4:						str+="Pentium4"; break;
 			}
 		}
-		strncpy(ProcessorString,str.Peek_Buffer(),sizeof(ProcessorString));
+		strncpy(ProcessorString,str.str(),sizeof(ProcessorString));
 	}
 
 }
@@ -959,7 +959,7 @@ void CPUDetectClass::Init_Processor_Log()
 #ifdef WIN32
    SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo));
 #elif defined(_UNIX)
-   SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo.Peek_Buffer()));
+   SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo.str()));
 #endif
 
 	SYSLOG(("Processor: %s\r\n",CPUDetectClass::Get_Processor_String()));
@@ -974,7 +974,7 @@ void CPUDetectClass::Init_Processor_Log()
 #ifdef WIN32
    SYSLOG(("Processor type: %s\r\n", cpu_type));
 #elif defined(_UNIX)
-   SYSLOG(("Processor type: %s\r\n", cpu_type.Peek_Buffer()));
+   SYSLOG(("Processor type: %s\r\n", cpu_type.str()));
 #endif
 
 	SYSLOG(("\r\n"));

Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp

@@ -285,7 +285,7 @@ FileClass * SimpleFileFactoryClass::Get_File( char const *filename )
 				const char *tok;
 				while((tok=strtok(tokstart, ";")) != NULL) {
 					tokstart=NULL;
-					new_name.Format("%s%s",tok,stripped_name.Peek_Buffer());
+					new_name.Format("%s%s",tok,stripped_name.str());
 					file->Set_Name( new_name );	// Call Set_Name to force an allocated name
 					if (file->Open()) {
 						file->Close();

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

@@ -415,7 +415,7 @@ template <class KeyType, class ValueType> inline HashTemplateClass<KeyType,Value
 template <> inline unsigned int HashTemplateKeyClass<StringClass>::Get_Hash_Value(const StringClass& s)
 {
 	unsigned int len=s.Get_Length();
-	unsigned char* buffer=(unsigned char*)s.Peek_Buffer();
+	unsigned const char* buffer=(unsigned const char*)s.str();
 	if (len<8) {
 		unsigned int hval=0;
 		for (unsigned int a=0;a<len;++a) {

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

@@ -138,15 +138,15 @@
 		copying.
 
 		To create a RefCountPtr<T> from a raw pointer, use the global template functions
-		Create_NEW should be used when wrapping a pointer that has just been created with NEW
-		Create_Get should be used when wrapping a pointer that has been returned from a "Get" function
+		Create_NoAddRef should be used when wrapping a pointer that has just been created with NEW
+		Create_NoAddRef should be used when wrapping a pointer that has been returned from a "Get" function
 			(the function added a reference prior to returning the pointer)
-		Create_Peek should be used when wrapping a pointer that has been returned from a "Peek" function
+		Create_AddRef should be used when wrapping a pointer that has been returned from a "Peek" function
 			(the function did not add a reference prior to returning the pointer).
 
-		Create_Get and Create_Peek are provided to allow old code to migrate from manual reference count
+		Create_NoAddRef and Create_AddRef are provided to allow old code to migrate from manual reference count
 		management to RefCountPtr.  New code written with RefCountPtr should rarely if ever use
-		Create_Get and Create_Peek.
+		Create_NoAddRef and Create_AddRef.
 
 		If it is absolutely necessary to extract the raw pointer, use Peek.  Peek does not add a new
 		reference to the object.  Using a Peek'd object after its RefCountPtr has gone out of scope requires
@@ -158,7 +158,7 @@
 
 		Automatic construction of a RefCountPtr from a raw pointer is enabled if 
 		ALLOW_AUTOMATIC_REF_COUNT_PTR_CONSTRUCTION is defined.
-		This may be useful when migrating existing code to use RefCountPtr, but is completely safe,
+		This may be useful when migrating existing code to use RefCountPtr, but is not completely safe,
 		since it is not possible to determine if the pointer is being Get'd or Peek'd.
 		Please note that the constructor WILL add a reference to the object, which errs on the side
 		of leaking references rather than prematurely deleting objects.  Whenever possible, use the
@@ -216,23 +216,25 @@
 					};
 */
 
+
 class DummyPtrType;
 
 template <class T>
 class RefCountPtr
 {
 	public:
-		friend RefCountPtr<T> Create_NEW(T *t) 
-		{
-		  return RefCountPtr<T>(t, RefCountPtr<T>::GET);
-		}
 
-		friend RefCountPtr<T> Create_Get(T *t)
+		// Creates a RefCountPtr<T> and does not increment the reference counter of the passed object.
+		// Is generally used for objects returned by operator new and "Get" functions.
+		static RefCountPtr<T> Create_NoAddRef(T *t)
 		{
+			WWASSERT(t == NULL || t->Num_Refs() >= 1);
 			return RefCountPtr<T>(t, RefCountPtr<T>::GET);
 		}
 
-		friend RefCountPtr<T> Create_Peek(T *t)
+		// Creates a RefCountPtr<T> and increments the reference counter of the passed object.
+		// Is generally used for objects returned by "Peek" functions.
+		static RefCountPtr<T> Create_AddRef(T *t)
 		{
 			return RefCountPtr<T>(t, RefCountPtr<T>::PEEK);
 		}
@@ -371,20 +373,28 @@ class RefCountPtr
 
 		T & operator *(void) const
 		{
-			G_ASSERT(0 != Referent);
+			WWASSERT(0 != Referent);
 			return *Referent;
 		}
 
-		// Note : This should typiccally only be used when mixing code that uses RefCountPtr and 
+		// Note : This should typically only be used when mixing code that uses RefCountPtr and 
 		//   manually managed ref counts on raw points.
-		// Code that consistently uses RefCountPtr should never get ahold of a raw T*
+		// Code that consistently uses RefCountPtr should never get a hold of a raw T*
 		T * Peek(void) const
 		{
 			return Referent;
 		}
 
+		// Releases the held pointer without changing its reference counter.
+		T * Release(void)
+		{
+			T * p = Referent;
+			Referent = 0;
+			return p;
+		}
+
 	private:
-		enum ReferenceHandling { GET, PEEK};
+		enum ReferenceHandling { GET, PEEK };
 
 		RefCountPtr(T * referent, ReferenceHandling reference_handling)
 			: Referent(referent)
@@ -416,7 +426,8 @@ bool operator <(const RefCountPtr<LHS> & lhs, const RefCountPtr<RHS> & rhs)
 template <class RHS>
 bool operator ==(DummyPtrType * dummy, const RefCountPtr<RHS> & rhs)
 {
-	FAIL_IF(0 != dummy) {
+	if (0 != dummy) {
+		WWASSERT(0);
 		return false;
 	}
 
@@ -428,7 +439,8 @@ bool operator ==(DummyPtrType * dummy, const RefCountPtr<RHS> & rhs)
 template <class RHS>
 bool operator !=(DummyPtrType * dummy, const RefCountPtr<RHS> & rhs)
 {
-	FAIL_IF(0 != dummy) {
+	if (0 != dummy) {
+		WWASSERT(0);
 		return true;
 	}
 
@@ -438,7 +450,7 @@ bool operator !=(DummyPtrType * dummy, const RefCountPtr<RHS> & rhs)
 template <class Derived, class Base>
 RefCountPtr<Derived> Static_Cast(const RefCountPtr<Base> & base) 
 {
-	return Create_Peek((Derived *)base.Peek());
+	return RefCountPtr<Derived>::Create_AddRef((Derived *)base.Peek());
 }
 
 #endif

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

@@ -48,6 +48,8 @@
 #include "LISTNODE.H"
 #endif
 
+#include "wwdebug.h"
+
 class RefCountClass;
 
 
@@ -148,7 +150,7 @@ class RefCountClass
 																				Dec_Total_Refs(this);
 																				#endif
 																				NumRefs--; 
-																				assert(NumRefs >= 0); 
+																				WWASSERT(NumRefs >= 0); 
 																				if (NumRefs == 0) const_cast<RefCountClass*>(this)->Delete_This(); 
 																			}
 
@@ -182,7 +184,7 @@ class RefCountClass
 		#ifndef NDEBUG
 		Remove_Active_Ref(this);	
 		#endif
-		assert(NumRefs == 0);
+		WWASSERT(NumRefs == 0);
 	}
 
 private: