refactor(utils): Move STLUtils.h to WWLib (#1679)

Author: xezon

Core/GameEngine/CMakeLists.txt

@@ -114,7 +114,6 @@ 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/Libraries/Source/WWVegas/WW3D2/rendobj.cpp

@@ -1243,7 +1243,7 @@ PersistClass *	RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
 	// if the object we saved didn't have a name, replace it with null
 	if (strlen(name) == 0) {
 		static int count = 0;
-		if ( ++count < 10 ) {
+		if ( count++ < 10 ) {
 			WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!"));
 			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}
@@ -1254,7 +1254,7 @@ PersistClass *	RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
 
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
+		if ( count++ < 10 ) {
 			WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!",name));
 			WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object."));
 			WWDEBUG_SAY(("Replacing it with a NULL render object!"));

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

@@ -372,7 +372,7 @@ WWAudioClass::Get_Sound_Buffer (const char *filename, bool is_3d)
 			buffer = Create_Sound_Buffer (*file, filename, is_3d);
 		} else {
 			static int count = 0;
-			if ( ++count < 10 ) {
+			if ( count++ < 10 ) {
 				WWDEBUG_SAY(( "Sound \"%s\" not found", filename ));
 			}
 		}
@@ -807,7 +807,7 @@ WWAudioClass::Create_3D_Sound
 				sound_obj->Set_Buffer (buffer);
 			} else {
 				static int count = 0;
-				if ( ++count < 10 ) {
+				if ( count++ < 10 ) {
 					WWDEBUG_SAY(( "Sound File not Found \"%s\"", filename ));
 				}
 			}

Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt

@@ -106,6 +106,7 @@ set(WWLIB_SRC
     SLNODE.H
     stimer.cpp
     stimer.h
+    STLUtils.h
     straw.cpp
     STRAW.H
     stringex.h

Core/GameEngine/Include/Common/STLUtils.h renamed to Core/Libraries/Source/WWVegas/WWLib/STLUtils.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "STLUtils.h"
 #include "stringex.h"
 
 

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

@@ -58,7 +58,6 @@ class STLSpecialAlloc;
 #include "Common/UnicodeString.h"
 #include "Common/GameCommon.h"
 #include "Common/GameMemory.h"
-#include "Common/STLUtils.h"
 
 //-----------------------------------------------------------------------------
 

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

@@ -1395,7 +1395,7 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 	*/
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
+		if ( count++ < 10 ) {
 			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
 			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}

Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp

@@ -58,7 +58,6 @@ class STLSpecialAlloc;
 #include "Common/UnicodeString.h"
 #include "Common/GameCommon.h"
 #include "Common/GameMemory.h"
-#include "Common/STLUtils.h"
 
 //-----------------------------------------------------------------------------
 

GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h

@@ -1498,7 +1498,7 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 	*/
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
+		if ( count++ < 10 ) {
 			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
 			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}