add stl conversion branch

README.md

@@ -1,6 +1,6 @@
 # SWG-SRC#
 
-This repo is only for building the clients and tools. This master branch stlport based, on which it is easier to get things building. Not all targets are complete but the _d client should build despite the errors, as should many of the tools.
+This repo is only for building the clients and tools. This branch is an in-progress conversion to use the MSVC 2013 STL.
 
 
-Many if not all of the server targets will debug with some work too, but the other repo is where server work should be focused.
+Many if not all of the server targets will probably work with work, but please focus server development on the other repo.

src/engine/client/application/AnimationEditor/src/shared/core/FirstAnimationEditor.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "clientUserInterface/FirstClientUserInterface.h"
 #include "swgClientUserInterface/FirstSwgClientUserInterface.h"
 #include <qwidget.h>

src/engine/client/application/ClientEffectEditor/src/shared/core/FirstClientEffectEditor.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "clientUserInterface/FirstClientUserInterface.h"
 #include "swgClientUserInterface/FirstSwgClientUserInterface.h"
 #include <qwidget.h>

src/engine/client/application/Direct3d9/src/win32/Direct3d9.h

@@ -24,7 +24,7 @@ class  VertexBufferVector;
 #include <d3d9.h>
 #include <dxerr9.h>
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 #include "clientGraphics/Texture.def"
 
 class VectorRgba;

src/engine/client/application/Direct3d9/src/win32/Direct3d9_ShaderImplementationData.h

@@ -12,7 +12,7 @@
 
 #include "clientGraphics/ShaderImplementation.h"
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h"
+#include "sharedFoundation/Production.h"
 
 #include <d3d9.h>
 #include <vector>

src/engine/client/application/Direct3d9/src/win32/Direct3d9_StaticShaderData.h

@@ -16,7 +16,7 @@ class Direct3d9_TextureData;
 #include "Direct3d9_VertexShaderUtilities.h"
 #include "clientGraphics/ShaderImplementation.h"
 #include "clientGraphics/StaticShader.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h"
+#include "sharedFoundation/Production.h"
 #include "sharedMath/VectorRgba.h"
 
 #include <vector>

src/engine/client/application/Direct3d9/src/win32/Direct3d9_TextureData.h

@@ -12,7 +12,7 @@
 
 class MemoryBlockManager;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 #include "clientGraphics/Texture.h"
 #include <d3d9.h>
 

src/engine/client/application/Direct3d9/src/win32/FirstDirect3d9.h

@@ -11,7 +11,7 @@
 // ======================================================================
 
 #define COMPILE_DLL 1
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 // ======================================================================
 

src/engine/client/application/Headless/src/shared/FirstHeadless.h

@@ -3,7 +3,7 @@
 
 
 #define COMPILE_DLL 1
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 
 #endif // INCLUDED_FirstHeadless_H

src/engine/client/application/LightningEditor/src/win32/FirstLightningEditor.h

@@ -8,7 +8,7 @@
 #pragma warning (disable:4275) // non dll-interface class 'QPtrVector<class QConnectionList>' used as base for dll-interface class 'QSignalVec'
 #pragma warning (disable:4800) // 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedMessageDispatch/Emitter.h"
 #include "sharedMessageDispatch/Message.h"
 #include "sharedMessageDispatch/Receiver.h"

src/engine/client/application/MayaExporter/src/win32/FirstMayaExporter.h

@@ -17,7 +17,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 // ======================================================================
 

src/engine/client/application/MayaExporter/src/win32/MayaAnimationList.h

@@ -10,8 +10,8 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/LessPointerComparator.h"
 #include <string>
 
 class MDagPath;

src/engine/client/application/MayaExporter/src/win32/MayaCustomizableShaderTemplateWriter.h

@@ -12,7 +12,7 @@
 // ======================================================================
 
 #include "MayaShaderTemplateWriter.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class Messenger;
 class MFnDependencyNode;

src/engine/client/application/MayaExporter/src/win32/MayaMeshReader.h

@@ -12,7 +12,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "sharedMath/Vector.h"
 
 #include "maya/MDagPath.h"

src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateBuilder.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 #include "MayaUtility.h"
 

src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateWriter.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 #include "MayaUtility.h"
 

src/engine/client/application/MayaExporter/src/win32/MayaUtility.h

@@ -12,7 +12,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 #include "ExporterDefines.h"
 

src/engine/client/application/MayaExporter/src/win32/MeshBuilder.h

@@ -12,7 +12,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
 #include "sharedMath/VectorArgb.h"
 #include "ExporterDefines.h"
 #include "DoubleVector.h"

src/engine/client/application/MayaExporter/src/win32/ShaderPrimitiveSetWriter.h

@@ -12,11 +12,11 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/CrcLowerString.h"
 #include "clientGraphics/Graphics.def"
 #include "clientGraphics/ShaderPrimitiveSet.def"
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h"
+#include "sharedFoundation/StlForwardDeclaration.h"
 
 #include <vector>
 #include "sharedMath/Vector.h"

src/engine/client/application/MayaExporter/src/win32/SkeletalMeshGeneratorWriter.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class  CrcLowerString;
 class  Iff;

src/engine/client/application/MayaExporter/src/win32/StaticMeshBuilder.h

@@ -12,13 +12,13 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "clientGraphics/Graphics.def"
 #include "MeshBuilder.h"
 #include <string>
 #include <vector>
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/CrcLowerString.h"
 #include "sharedMath/Transform.h"
 
 class Iff;

src/engine/client/application/MayaExporter/src/win32/VertexIndexer.h

@@ -16,7 +16,7 @@ class SystemVertexBuffer;
 class VertexBufferFormat;
 class VertexBufferWriteIterator;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
 #include "sharedMath/Vector.h"
 #include "sharedMath/PackedArgb.h"
 

src/engine/client/application/Miff/src/win32/parser.yac

@@ -29,6 +29,7 @@
 #include <wchar.h>			/* for wide character (16bit) strings */
 
 #include <stdio.h>
+#include <ctype.h>
 
 /*----------------------------------------------------------------**
 ** debug options, turn these on to TEST ONLY!  don't leave these  **

src/engine/client/application/NpcEditor/src/win32/FirstNpcEditor.h

@@ -10,7 +10,7 @@
 
 // ============================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "_precompile.h"
 
 // ============================================================================

src/engine/client/application/ParticleEditor/src/win32/FirstParticleEditor.h

@@ -8,7 +8,7 @@
 #pragma warning (disable:4275) // non dll-interface class 'QPtrVector<class QConnectionList>' used as base for dll-interface class 'QSignalVec'
 #pragma warning (disable:4800) // 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedMessageDispatch/Emitter.h"
 #include "sharedMessageDispatch/Message.h"
 #include "sharedMessageDispatch/Receiver.h"

src/engine/client/application/ParticleEditor/src/win32/GameWidget.cpp

@@ -80,6 +80,7 @@
 
 #include <dinput.h>
 #include <map>
+#include <algorithm>
 
 // ======================================================================
 namespace

src/engine/client/application/ParticleEditor/src/win32/ParticleEditor.rc

@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "../../../../../../external/3rd/library/atlmfc/include/afxres.h"
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

src/engine/client/application/QuestEditor/src/win32/FirstQuestEditor.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 // ----------------------------------------------------------------------
 

src/engine/client/application/RemoteDebugTool/src/shared/FirstRemoteDebugTool.h

@@ -10,8 +10,8 @@
 
 // ----------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/SetupSharedFoundation.h"
 
 // ----------------------------------------------------------------------
 #endif //FirstRemoteDebugTool_H

src/engine/client/application/ShaderBuilder/src/win32/FirstShaderBuilder.h

@@ -30,7 +30,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 #pragma warning (disable: 4702 4786)
 

src/engine/client/application/ShaderBuilder/src/win32/Node.h

@@ -8,7 +8,7 @@
 // ======================================================================
 
 class Iff;
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 #include "clientGraphics\VertexBufferFormat.h"
 #include <vector>
 

src/engine/client/application/ShipComponentEditor/src/win32/FirstShipComponentEditor.h

@@ -11,7 +11,7 @@
 #pragma warning (disable:4510) // default constructor could not be generated
 #pragma warning (disable:4610) // user defined constructor required
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 //#include "sharedMessageDispatch/Emitter.h"
 //#include "sharedMessageDispatch/Message.h"
 //#include "sharedMessageDispatch/Receiver.h"

src/engine/client/application/SoundEditor/src/win32/FirstSoundEditor.h

@@ -11,7 +11,7 @@
 #pragma warning (disable:4510) // default constructor could not be generated
 #pragma warning (disable:4610) // user defined constructor required
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 //#include "sharedMessageDispatch/Emitter.h"
 //#include "sharedMessageDispatch/Message.h"
 //#include "sharedMessageDispatch/Receiver.h"

src/engine/client/application/SwooshEditor/src/win32/FirstSwooshEditor.h

@@ -8,7 +8,7 @@
 #pragma warning (disable:4275) // non dll-interface class 'QPtrVector<class QConnectionList>' used as base for dll-interface class 'QSignalVec'
 #pragma warning (disable:4800) // 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedMessageDispatch/Emitter.h"
 #include "sharedMessageDispatch/Message.h"
 #include "sharedMessageDispatch/Receiver.h"

src/engine/client/application/SwooshEditor/src/win32/SwooshEditorIoWin.h

@@ -10,7 +10,7 @@
 
 #include "sharedIoWin/IoWin.h"
 #include "sharedMath/Transform.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 
 class AppearanceTemplate;
 class MainWindow;

src/engine/client/application/TemplateEditor/src/shared/FirstTemplateEditor.h

@@ -15,7 +15,7 @@
 
 #include "sharedFoundationTypes/FoundationTypes.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedTemplate/FirstSharedTemplate.h"
 #include "sharedMessageDispatch/Emitter.h"
 #include "sharedMessageDispatch/Message.h"

src/engine/client/application/TerrainEditor/src/win32/DialogControlPointEditor.h

@@ -12,7 +12,7 @@
 
 //===================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "Resource.h"
 #include "sharedMath/Vector2d.h"
 

src/engine/client/application/TerrainEditor/src/win32/EditorTerrain.h

@@ -22,7 +22,7 @@ class AffectorRibbon;
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "sharedMath/Plane.h"
 #include "sharedTerrain/TerrainGenerator.h"
 

src/engine/client/application/TerrainEditor/src/win32/FirstTerrainEditor.h

@@ -29,7 +29,7 @@
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "NumberEdit.h"
 //-------------------------------------------------------------------
 

src/engine/client/application/TerrainEditor/src/win32/FloraGroupFrame.h

@@ -15,7 +15,7 @@
 class FloraMeshView;
 class FloraTreeView;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 
 //-------------------------------------------------------------------
 

src/engine/client/application/TerrainEditor/src/win32/FloraTreeView.h

@@ -14,7 +14,7 @@
 
 class FloraGroup;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 
 //-------------------------------------------------------------------
 

src/engine/client/application/TerrainEditor/src/win32/MapView.h

@@ -21,7 +21,7 @@ class TerrainEditorDoc;
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "EditorTerrain.h"
 #include "sharedMath/Rectangle2d.h"
 #include "sharedTerrain/TerrainGenerator.h"

src/engine/client/application/TerrainEditor/src/win32/RadialGroupFrame.h

@@ -15,7 +15,7 @@ class RadialView;
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 
 //-------------------------------------------------------------------
 

src/engine/client/application/TerrainEditor/src/win32/ShaderGroupFrame.h

@@ -15,7 +15,7 @@
 class ShaderTreeView;
 class ShaderView;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 
 //-------------------------------------------------------------------
 

src/engine/client/application/TerrainEditor/src/win32/TerrainEditorDoc.h

@@ -13,7 +13,7 @@
 //-------------------------------------------------------------------
 
 #include "sharedMath/Rectangle2d.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "PropertyView.h"
 #include "sharedTerrain/TerrainGenerator.h"
 

src/engine/client/application/TerrainEditor/src/win32/TerrainGeneratorHelper.h

@@ -12,7 +12,7 @@
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "sharedTerrain/TerrainGenerator.h"
 
 class AffectorBoundaryPoly;

src/engine/client/application/TextureBuilder/src/win32/BlueprintWriter.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 enum TextureFormat;
 

src/engine/client/application/TextureBuilder/src/win32/FirstTextureBuilder.h

@@ -24,7 +24,7 @@
 #include <afxcview.h>
 #include <afxdtctl.h>       // MFC support for Internet Explorer 4 Common Controls
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 #include <memory>               // for std::auto_ptr
 

src/engine/client/application/TextureBuilder/src/win32/ImageSlotElement.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 #include "VariableContainerElement.h"
 
 class Exporter;

src/engine/client/application/TextureBuilder/src/win32/PaletteColorVariableElement.h

@@ -13,7 +13,7 @@
 
 class PaletteArgb;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h"
+#include "sharedFoundation/PersistentCrcString.h"
 #include "IntVariableElement.h"
 
 #include <string>

src/engine/client/application/ViewIff/src/win32/FirstViewIff.h

@@ -29,7 +29,7 @@
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 //-------------------------------------------------------------------
 

src/engine/client/application/ViewIff/src/win32/IffDoc.h

@@ -12,8 +12,8 @@
 
 //-------------------------------------------------------------------
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/ArrayList.h"
+#include "sharedFoundation/Tag.h"
 
 class Iff;
 

src/engine/client/application/Viewer/src/win32/FirstViewer.h

@@ -18,7 +18,7 @@
 #include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
 #include <afxcview.h>
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 // ======================================================================
 

src/engine/client/application/Viewer/src/win32/LightListDialog.h

@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // LightListDialog dialog
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h"
+#include "sharedFoundation/ArrayList.h"
 #include "clientObject/LightManager.h"
 
 class LightListDialog : public CDialog

src/engine/client/application/WorldSnapshotViewer/src/win32/FirstWorldSnapshotViewer.h

@@ -20,7 +20,7 @@
 #include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
 #include <afxcview.h>
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 //===================================================================
 

src/engine/client/library/clientAnimation/src/shared/core/FirstClientAnimation.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 
 // ======================================================================
 

src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScript.h

@@ -15,9 +15,9 @@
 //       not included in much.  I think it is not worth making the extra
 //       allocations to hide STL containers in this case.
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedFoundation/Watcher.h"
 #include "sharedObject/Object.h"       // "`What!?!' you say?  You'll see nothing below that would lead you to expect this, but Object is required (via ~Watcher<Object> --- why is that needed for this declaration?).
 
 #include <map>

src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScriptTemplate.h

@@ -15,9 +15,9 @@
 //       memory allocations at construction time.  I think this is acceptable
 //       because only a small amount of code includes this class.
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/Tag.h"
 
 #include <vector>
 

src/engine/client/library/clientAnimation/src/shared/playback/StopActionTemplate.h

@@ -14,7 +14,7 @@
 // ======================================================================
 
 #include "clientAnimation/PlaybackActionTemplate.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
 
 class Iff;
 

src/engine/client/library/clientAnimation/src/shared/playback/TimerPlaybackActionTemplate.h

@@ -12,7 +12,7 @@
 // ======================================================================
 
 #include "clientAnimation/PlaybackActionTemplate.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class Iff;
 

src/engine/client/library/clientAudio/src/shared/FirstClientAudio.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
 #include "sharedMemoryManager/FirstSharedMemoryManager.h"
 

src/engine/client/library/clientAudio/src/win32/Audio.cpp

@@ -39,6 +39,7 @@
 #include <limits>
 #include <list>
 #include <map>
+#include <algorithm>
 
 #if PRODUCTION == 0
 #include "clientAudio/SwgAudioCapture.h"

src/engine/client/library/clientAudio/src/win32/Sample2d.h

@@ -9,7 +9,7 @@
 #define INCLUDED_Sample2d_H
 
 #include "clientAudio/Audio.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h"
+#include "sharedFoundation/CrcString.h"
 
 class Sound2d;
 

src/engine/client/library/clientAudio/src/win32/Sample3d.h

@@ -9,7 +9,7 @@
 #define INCLUDED_Sample3d_H
 
 #include "clientAudio/Audio.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h"
+#include "sharedFoundation/CrcString.h"
 
 //-----------------------------------------------------------------------------
 class Sample3d

src/engine/client/library/clientAudio/src/win32/SampleStream.h

@@ -9,7 +9,7 @@
 #define INCLUDED_SampleStream_H
 
 #include "clientAudio/Audio.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h"
+#include "sharedFoundation/CrcString.h"
 
 //-----------------------------------------------------------------------------
 class SampleStream

src/engine/client/library/clientAudio/src/win32/Sound2.h

@@ -11,7 +11,7 @@
 #include "clientAudio/Audio.h"
 #include "clientAudio/SoundId.h"
 #include "clientAudio/SampleId.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 #include "sharedMath/Vector.h"
 #include "sharedObject/Object.h"
 

src/engine/client/library/clientAudio/src/win32/Sound2dTemplate.h

@@ -10,7 +10,7 @@
 
 #include "clientAudio/Audio.h"
 #include "clientAudio/SoundTemplate.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class Iff;
 

src/engine/client/library/clientAudio/src/win32/Sound3dTemplate.h

@@ -9,7 +9,7 @@
 #define SOUND3DTEMPLATE_H
 
 #include "clientAudio/Sound2dTemplate.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class Iff;
 

src/engine/client/library/clientAudio/src/win32/SoundId.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDED_SoundId_H
 #define INCLUDED_SoundId_H
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h"
+#include "sharedFoundation/TemporaryCrcString.h"
 
 // ============================================================================
 //

src/engine/client/library/clientAudio/src/win32/SoundTemplate.h

@@ -9,7 +9,7 @@
 #define SOUNDTEMPLATE_H
 
 #include "clientAudio/Audio.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h"
+#include "sharedFoundation/PersistentCrcString.h"
 
 class Iff;
 class Sound2;

src/engine/client/library/clientAudio/src/win32/SoundTemplateList.h

@@ -14,7 +14,7 @@ class Sound2;
 class SoundTemplate;
 class Iff;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 // ======================================================================
 

src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h

@@ -8,7 +8,7 @@
 #ifndef AUDIOCAPTURE_SWGAUDIOCAPTURE_H
 #define AUDIOCAPTURE_SWGAUDIOCAPTURE_H
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h"
+#include "sharedFoundation/Production.h"
 
 #if PRODUCTION == 0
 

src/engine/client/library/clientBugReporting/src/shared/FirstClientBugReporting.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
 #include "sharedMemoryManager/FirstSharedMemoryManager.h"
 

src/engine/client/library/clientDirectInput/src/shared/FirstClientDirectInput.h

@@ -10,7 +10,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
 #include "sharedMemoryManager/FirstSharedMemoryManager.h"
 

src/engine/client/library/clientGame/src/shared/appearance/ClientGameAppearanceEvents.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h"
+#include "sharedFoundation/LabelHash.h"
 
 // ======================================================================
 

src/engine/client/library/clientGame/src/shared/appearance/FadingTextAppearance.cpp

@@ -26,6 +26,7 @@
 #include "dpvsObject.hpp"
 #include "dpvsModel.hpp"
 
+#include <algorithm>
 // ======================================================================
 
 bool FadingTextAppearance::ms_enabled = true;

src/engine/client/library/clientGame/src/shared/appearance/GlowAppearance.h

@@ -10,7 +10,7 @@
 
 //======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
+#include "sharedFoundation/Timer.h"
 #include "sharedObject/Appearance.h"
 
 class ShaderTemplate;

src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearance.h

@@ -18,8 +18,8 @@ class Segment3d;
 
 #include "clientAudio/SoundId.h"
 #include "sharedCollision/BoxExtent.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/Watcher.h"
 #include "sharedObject/Appearance.h"
 #include "sharedObject/Object.h"
 #include <vector>

src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearanceTemplate.h

@@ -15,8 +15,8 @@ class BeamAppearance;
 class MemoryBlockManager;
 class Shader;
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/PersistentCrcString.h"
 #include "sharedMath/PackedArgb.h"
 #include "sharedObject/AppearanceTemplate.h"
 

src/engine/client/library/clientGame/src/shared/appearance/LightsaberCollisionManager.cpp

@@ -96,7 +96,7 @@ namespace LightsaberCollisionManagerNamespace
 	bool             s_installed;
 	BladeInfoVector  s_blades;
 
-	typedef std::hash_map<NetworkId, float, NetworkId::Hash> ClashList;
+	typedef std::hash_map<NetworkId, float, NetworkId::NetHash> ClashList;
 	ClashList s_clashList;
 	const float s_clashTimeMin = 0.2f;
 	const float s_clashTimeMax = 0.5f;

src/engine/client/library/clientGame/src/shared/camera/CockpitCamera.h

@@ -13,8 +13,8 @@
 // ======================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedFoundation/Watcher.h"
 
 class AppearanceTemplate;
 class Iff;

src/engine/client/library/clientGame/src/shared/camera/DebugPortalCamera.h

@@ -13,7 +13,7 @@
 //===================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 
 class DeadReckoningModel;
 class Object;

src/engine/client/library/clientGame/src/shared/camera/FlyByCamera.h

@@ -12,8 +12,8 @@
 // ======================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedFoundation/Watcher.h"
 
 class MessageQueue;
 

src/engine/client/library/clientGame/src/shared/camera/FreeCamera.h

@@ -11,7 +11,7 @@
 //-------------------------------------------------------------------
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 
 class CellProperty;
 class Object;

src/engine/client/library/clientGame/src/shared/camera/FreeChaseCamera.h

@@ -13,7 +13,7 @@
 //===================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 #include "swgSharedUtility/Postures.h"
 #include "swgSharedUtility/States.h"
 

src/engine/client/library/clientGame/src/shared/camera/ShipTurretCamera.h

@@ -12,7 +12,7 @@
 // ======================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 
 class MessageQueue;
 

src/engine/client/library/clientGame/src/shared/camera/StructurePlacementCamera.h

@@ -13,7 +13,7 @@
 //===================================================================
 
 #include "clientObject/GameCamera.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 #include "sharedObject/LotType.h"
 
 class Object;

src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffect.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
 #include "sharedMath/Transform.h"
 #include "sharedMath/Vector.h"
 

src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffectManager.cpp

@@ -1224,7 +1224,7 @@ void ClientEffectManager::createClientTrackingProjectileObjectToObject(std::stri
 
 // ----------------------------------------------------------------------
 
-void ClientEffectManager::createClientTrackingProjectileObjectToLocation(const _STL::string &weaponObjectTemplateName, const CellProperty *const cellProperty, const Object &source, const _STL::string &sourceHardpoint, const Vector &endLoc, const float speed, const float expiration, const bool hasTrail, const uint32 trailArgb)
+void ClientEffectManager::createClientTrackingProjectileObjectToLocation(const std::string &weaponObjectTemplateName, const CellProperty *const cellProperty, const Object &source, const std::string &sourceHardpoint, const Vector &endLoc, const float speed, const float expiration, const bool hasTrail, const uint32 trailArgb)
 {
 	if (!cellProperty)
 		return;
@@ -1287,7 +1287,7 @@ void ClientEffectManager::createClientTrackingProjectileObjectToLocation(const _
 
 // ----------------------------------------------------------------------
 
-void ClientEffectManager::createClientTrackingProjectileLocationToObject(const _STL::string &weaponObjectTemplateName, const CellProperty *const cellProperty, const Vector &startLoc, const Object &target, const _STL::string &targetHardpoint, const float speed, const float expiration, const bool hasTrail, const uint32 trailArgb)
+void ClientEffectManager::createClientTrackingProjectileLocationToObject(const std::string &weaponObjectTemplateName, const CellProperty *const cellProperty, const Vector &startLoc, const Object &target, const std::string &targetHardpoint, const float speed, const float expiration, const bool hasTrail, const uint32 trailArgb)
 {
 	if (!cellProperty)
 		return;

src/engine/client/library/clientGame/src/shared/combat/ClientCombatActionInfo.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkId.h"
 #include "sharedMath/Vector.h"
 
 class Object;

src/engine/client/library/clientGame/src/shared/combat/ClientCombatPlaybackManager.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h"
+#include "sharedFoundation/Tag.h"
 
 class ClientCombatActionInfo;
 class CrcLowerString;

src/engine/client/library/clientGame/src/shared/combat/GroundCombatActionManager.h

@@ -10,7 +10,7 @@
 
 //======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Watcher.h"
 #include <vector>
 
 //======================================================================

src/engine/client/library/clientGame/src/shared/command/ClientCommandQueueEntry.h

@@ -11,7 +11,7 @@
 //======================================================================
 
 #include "Unicode.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkId.h"
 
 class Command;
 

src/engine/client/library/clientGame/src/shared/controller/BannerController.cpp

@@ -17,6 +17,7 @@
 #include "sharedObject/Object.h"
 #include "sharedRandom/Random.h"
 
+#include <algorithm>
 // ======================================================================
 
 namespace BannerControllerNamespace

src/engine/client/library/clientGame/src/shared/controller/ClientController.h

@@ -11,7 +11,7 @@
 
 // ======================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
+#include "sharedFoundation/Timer.h"
 #include "sharedMath/Transform.h"
 #include "sharedObject/NetworkController.h"
 

src/engine/client/library/clientGame/src/shared/controller/FlagController.cpp

@@ -17,6 +17,8 @@
 #include "sharedObject/Object.h"
 #include "sharedRandom/Random.h"
 
+#include <algorithm>
+
 // ======================================================================
 
 namespace FlagControllerNamespace

src/engine/client/library/clientGame/src/shared/controller/PlayerCreatureController.h

@@ -13,9 +13,9 @@
 // ======================================================================
 
 #include "clientGame/CreatureController.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedFoundation/Watcher.h"
 #include "sharedObject/Object.h"
 
 struct MatchMakingCharacterResult;

src/engine/client/library/clientGame/src/shared/controller/RemoteCreatureController.h

@@ -13,8 +13,8 @@
 //===================================================================
 
 #include "clientGame/CreatureController.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedFoundation/Watcher.h"
 
 class AlignToHardpointAction;
 class CellProperty;

src/engine/client/library/clientGame/src/shared/controller/WanderController.h

@@ -12,7 +12,7 @@
 
 //===================================================================
 
-#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h"
+#include "sharedFoundation/Timer.h"
 #include "sharedObject/Controller.h"
 #include "sharedMath/Vector.h"
 

src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp

@@ -507,7 +507,7 @@ ClientObject * AuctionManagerClient::getClientObjectForAuction (const NetworkId
 			obj->endBaselines ();
 		}
 
-		s_objects.insert (std::make_pair (itemId, obj));
+		s_objects.insert (std::make_pair(itemId, obj));
 		return obj;
 	}