refactor: Move refcount.h include into WWCommon.h

xezon · xezon · commit 171e74cccafa · 2025-11-04T23:20:54.000+01:00
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
@@ -40,7 +40,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "simplevec.h"
 #include "vector3.h"
 #include "Vector3i.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h
@@ -35,7 +35,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "vector4.h"
 #include "widestring.h"
 #include "rect.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h
@@ -39,11 +39,9 @@
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
 #include "hash.h"
 #include "mempool.h"
-#include <refcount.h>
 #include <SLIST.h>
 #include <Vector.h>
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h
@@ -39,7 +39,6 @@
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
 #include "SLIST.h"
 #include "Vector.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
@@ -46,7 +46,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "projector.h"
-#include "refcount.h"
 #include "matrixmapper.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
@@ -36,8 +36,8 @@
 
 #pragma once
 
+#include "always.h"
 #include "render2d.h"
-#include "refcount.h"
 #include "Vector.h"
 #include "vector2i.h"
 #include "wwstring.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h
@@ -41,7 +41,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "sphere.h"
 #include "coltype.h"
 #include "aabox.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "Vector.h"
 #include "vector3.h"
 #include "w3derr.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
@@ -38,8 +38,8 @@
 
 #pragma once
 
+#include "always.h"
 #include "ww3dformat.h"
-#include "refcount.h"
 
 struct IDirect3DSurface8;
 class Vector2i;
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h
@@ -41,9 +41,9 @@
 #pragma warning (pop)
 
 //#include <malloc.h>
+#include "always.h"
 #include "vector3.h"
 #include "matrix3d.h"
-#include "refcount.h"
 #include "RAWFILE.h"
 #include "SoundSceneObj.h"
 #include "Vector.h"
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h
@@ -40,7 +40,7 @@
 #include "mss.h"
 #pragma warning (pop)
 
-#include "refcount.h"
+#include "always.h"
 
 
 // Forward declarations
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h
@@ -36,9 +36,9 @@
 
 #pragma once
 
+#include "always.h"
 #include "SoundSceneObj.h"
 #include "cullsys.h"
-#include "refcount.h"
 #include "mempool.h"
 #include "multilist.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h
@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "WWAudio.h"
 #include "bittype.h"
 #include "persist.h"
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp
@@ -30,12 +30,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
+#include "always.h"
 #include "Threads.h"
-#include "refcount.h"
 #include "Utils.h"
 #include <process.h>
-#include "wwdebug.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "refcount.h"
 #include "STLUtils.h"
 #include "stringex.h"
 #include <Utility/stdio_adapter.h>
diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h
@@ -109,13 +109,20 @@
 	#define MSGW3DNEWARRAY(MSG)			new( MSG, 0 )
 	#define W3DNEW									new("W3D_" __FILE__, 0)
 	#define W3DNEWARRAY							new("W3A_" __FILE__, 0)
+
+	#define NEW_REF( C, P )					( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
+	#define SET_REF_OWNER( P )			( RefCountClass::Set_Ref_Owner( P, __FILE__, __LINE__ ) )
 #else
 	#define MSGW3DNEW(MSG)					new
 	#define MSGW3DNEWARRAY(MSG)			new
 	#define W3DNEW									new
 	#define W3DNEWARRAY							new
+
+	#define NEW_REF( C, P )					( W3DNEW C P )
+	#define SET_REF_OWNER( P )			P
 #endif
 
+
 // ----------------------------------------------------------------------------
 extern void* createW3DMemPool(const char *poolName, int allocationSize);
 extern void* allocateFromW3DMemPool(void* p, int allocationSize);
@@ -187,7 +194,7 @@ class W3DMPO
 ** Define the MIN and MAX macros.
 ** NOTE: Joe used to #include <minmax.h> in the various compiler header files.  This
 ** header defines 'min' and 'max' macros which conflict with the surrender code so
-** I'm relpacing all occurances of 'min' and 'max with 'MIN' and 'MAX'.  For code which
+** I'm replacing all occurrences of 'min' and 'max with 'MIN' and 'MAX'.  For code which
 ** is out of our domain (e.g. Max sdk) I'm declaring template functions for 'min' and 'max'
 */
 #define NOMINMAX
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ntree.h b/Core/Libraries/Source/WWVegas/WWLib/ntree.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "wwstring.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.h b/Core/Libraries/Source/WWVegas/WWLib/refcount.h
@@ -36,9 +36,8 @@
 
 #pragma once
 
-#include "always.h"
 #include "LISTNODE.h"
-#include "wwdebug.h"
+#include "WWDebug/wwdebug.h"
 
 class RefCountClass;
 
@@ -51,14 +50,6 @@ struct ActiveRefStruct
 	int						Line;
 };
 
-#define	NEW_REF( C, P )						( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
-#define	SET_REF_OWNER( P )				(		RefCountClass::Set_Ref_Owner( P,       __FILE__, __LINE__ ) )
-
-#else
-
-#define	NEW_REF( C, P )					( W3DNEW C P )
-#define	SET_REF_OWNER( P )			P
-
 #endif // RTS_DEBUG
 
 
@@ -137,14 +128,14 @@ class RefCountClass
 #ifdef RTS_DEBUG
 	void Add_Ref(void) const;
 #else
-	WWINLINE void Add_Ref(void) const							{ NumRefs++; }
+	void Add_Ref(void) const							{ NumRefs++; }
 #endif
 
 	/*
 	** Release_Ref, call this function when you no longer need the pointer
 	** to this object.
 	*/
-	WWINLINE void		Release_Ref(void) const
+	void Release_Ref(void) const
 	{
 #ifdef RTS_DEBUG
 		Dec_Total_Refs(this);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 
 
 /*
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h
@@ -36,9 +36,8 @@
 
 #pragma once
 
-#include "wwdebug.h"
+#include "always.h"
 #include "stdlib.h"
-#include "refcount.h"
 #include "aabox.h"
 
 class CullableClass;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h
@@ -41,7 +41,6 @@
 #include "always.h"
 #include "simplevec.h"
 #include "wwstring.h"
-#include "refcount.h"
 #include "multilist.h"
 #include "wwmath.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h
@@ -37,7 +37,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "postloadable.h"
 
 class PersistFactoryClass;
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
@@ -36,7 +36,6 @@
 
 
 #include "pointerremap.h"
-#include "refcount.h"
 #include "wwdebug.h"
 
 
diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h
@@ -34,8 +34,6 @@
 #include "Common/Snapshot.h"
 #include "Common/Xfer.h"
 
-#include "refcount.h"
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h
@@ -34,7 +34,6 @@
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
-#include "refcount.h"
 #include "ref_ptr.h"
 
 class AIGroup;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
@@ -40,7 +40,6 @@
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "sphere.h"
 
 class DX8Wrapper;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
@@ -41,7 +41,6 @@
 #include "always.h"
 #include "wwstring.h"
 #include "simplevec.h"
-#include "refcount.h"
 #include "Vector.h"
 #include "dx8list.h"
 #include "shader.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
@@ -40,7 +40,6 @@
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "dx8fvf.h"
 
 const unsigned dynamic_fvf_type=D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_TEX2|D3DFVF_DIFFUSE;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
@@ -39,10 +39,9 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "w3d_file.h"
 #include "w3derr.h"
-#include "wwdebug.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "ww3d.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
@@ -38,9 +38,8 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "shader.h"
-#include "wwdebug.h"
 
 
 class TextureClass;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
@@ -39,7 +39,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "bittype.h"
 #include "simplevec.h"
 #include "sharebuf.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -35,7 +35,6 @@
 #include "render2d.h"
 #include "mutex.h"
 #include "ww3d.h"
-#include "refcount.h"
 #include "font3d.h"
 #include "rect.h"
 #include "texture.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h
@@ -37,7 +37,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "vector3.h"
 #include "robjlist.h"
 #include "wwdebug.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h
@@ -37,7 +37,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "chunkio.h"
 #include "surfaceclass.h"
 #include "ww3dformat.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -38,7 +38,6 @@
 
 #include "always.h"
 
-#include "refcount.h"
 #include "vector3.h"
 #include "w3d_file.h"
 #include "meshbuild.h"
diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h
@@ -26,7 +26,6 @@
 #include "../../GameEngine/Include/Common/MapObject.h"
 #include "../../GameEngine/Include/Common/GameCommon.h"
 #include "../../GameEngine/Include/GameLogic/SidesList.h"
-#include "refcount.h"
 #include <vector>
 
 class PolygonTrigger;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
@@ -34,8 +34,6 @@
 #include "Common/Snapshot.h"
 #include "Common/Xfer.h"
 
-#include "refcount.h"
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
@@ -34,7 +34,6 @@
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
-#include "refcount.h"
 #include "ref_ptr.h"
 
 class AIGroup;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h
