diff --git a/README.md b/README.md index ecd959076..39799fd8b 100644 --- a/README.md +++ b/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. diff --git a/src/engine/client/application/AnimationEditor/src/shared/core/FirstAnimationEditor.h b/src/engine/client/application/AnimationEditor/src/shared/core/FirstAnimationEditor.h index 3f1b56264..c3893dab4 100644 --- a/src/engine/client/application/AnimationEditor/src/shared/core/FirstAnimationEditor.h +++ b/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 diff --git a/src/engine/client/application/ClientEffectEditor/src/shared/core/FirstClientEffectEditor.h b/src/engine/client/application/ClientEffectEditor/src/shared/core/FirstClientEffectEditor.h index 3d85ac04b..c9c3c63a4 100644 --- a/src/engine/client/application/ClientEffectEditor/src/shared/core/FirstClientEffectEditor.h +++ b/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 diff --git a/src/engine/client/application/Direct3d9/src/win32/Direct3d9.h b/src/engine/client/application/Direct3d9/src/win32/Direct3d9.h index 31a41ddc1..4d154d4bd 100644 --- a/src/engine/client/application/Direct3d9/src/win32/Direct3d9.h +++ b/src/engine/client/application/Direct3d9/src/win32/Direct3d9.h @@ -24,7 +24,7 @@ class VertexBufferVector; #include #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "clientGraphics/Texture.def" class VectorRgba; diff --git a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_ShaderImplementationData.h b/src/engine/client/application/Direct3d9/src/win32/Direct3d9_ShaderImplementationData.h index edd417a3d..7ea695afc 100644 --- a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_ShaderImplementationData.h +++ b/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 #include diff --git a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_StaticShaderData.h b/src/engine/client/application/Direct3d9/src/win32/Direct3d9_StaticShaderData.h index 23616b3c1..b298f7bb9 100644 --- a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_StaticShaderData.h +++ b/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 diff --git a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_TextureData.h b/src/engine/client/application/Direct3d9/src/win32/Direct3d9_TextureData.h index 792b955b6..9e85b3221 100644 --- a/src/engine/client/application/Direct3d9/src/win32/Direct3d9_TextureData.h +++ b/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 diff --git a/src/engine/client/application/Direct3d9/src/win32/FirstDirect3d9.h b/src/engine/client/application/Direct3d9/src/win32/FirstDirect3d9.h index 81a506ea4..1ff205874 100644 --- a/src/engine/client/application/Direct3d9/src/win32/FirstDirect3d9.h +++ b/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" // ====================================================================== diff --git a/src/engine/client/application/Headless/src/shared/FirstHeadless.h b/src/engine/client/application/Headless/src/shared/FirstHeadless.h index 77c9ee316..89eb05cb6 100644 --- a/src/engine/client/application/Headless/src/shared/FirstHeadless.h +++ b/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 \ No newline at end of file diff --git a/src/engine/client/application/LightningEditor/src/win32/FirstLightningEditor.h b/src/engine/client/application/LightningEditor/src/win32/FirstLightningEditor.h index 64272d51d..173282989 100644 --- a/src/engine/client/application/LightningEditor/src/win32/FirstLightningEditor.h +++ b/src/engine/client/application/LightningEditor/src/win32/FirstLightningEditor.h @@ -8,7 +8,7 @@ #pragma warning (disable:4275) // non dll-interface class 'QPtrVector' 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" diff --git a/src/engine/client/application/MayaExporter/src/win32/FirstMayaExporter.h b/src/engine/client/application/MayaExporter/src/win32/FirstMayaExporter.h index dc90d575b..33d1d3e53 100644 --- a/src/engine/client/application/MayaExporter/src/win32/FirstMayaExporter.h +++ b/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" // ====================================================================== diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaAnimationList.h b/src/engine/client/application/MayaExporter/src/win32/MayaAnimationList.h index 2e226ef9a..d911e221b 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaAnimationList.h +++ b/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 class MDagPath; diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaCustomizableShaderTemplateWriter.h b/src/engine/client/application/MayaExporter/src/win32/MayaCustomizableShaderTemplateWriter.h index 3e63e3077..d3e403a03 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaCustomizableShaderTemplateWriter.h +++ b/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; diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaMeshReader.h b/src/engine/client/application/MayaExporter/src/win32/MayaMeshReader.h index 0a84a4066..88af7be34 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaMeshReader.h +++ b/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" diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateBuilder.h b/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateBuilder.h index 1443f33db..1a2c70a38 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateBuilder.h +++ b/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" diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateWriter.h b/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateWriter.h index 5f57fb4f8..7a035513e 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaShaderTemplateWriter.h +++ b/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" diff --git a/src/engine/client/application/MayaExporter/src/win32/MayaUtility.h b/src/engine/client/application/MayaExporter/src/win32/MayaUtility.h index 9439402af..7bc6223ea 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MayaUtility.h +++ b/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" diff --git a/src/engine/client/application/MayaExporter/src/win32/MeshBuilder.h b/src/engine/client/application/MayaExporter/src/win32/MeshBuilder.h index dbf2d3369..a05e837c9 100644 --- a/src/engine/client/application/MayaExporter/src/win32/MeshBuilder.h +++ b/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" diff --git a/src/engine/client/application/MayaExporter/src/win32/ShaderPrimitiveSetWriter.h b/src/engine/client/application/MayaExporter/src/win32/ShaderPrimitiveSetWriter.h index 2148a50d4..3ce8f648e 100644 --- a/src/engine/client/application/MayaExporter/src/win32/ShaderPrimitiveSetWriter.h +++ b/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 #include "sharedMath/Vector.h" diff --git a/src/engine/client/application/MayaExporter/src/win32/SkeletalMeshGeneratorWriter.h b/src/engine/client/application/MayaExporter/src/win32/SkeletalMeshGeneratorWriter.h index 4a1c351d4..de10ad293 100644 --- a/src/engine/client/application/MayaExporter/src/win32/SkeletalMeshGeneratorWriter.h +++ b/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; diff --git a/src/engine/client/application/MayaExporter/src/win32/StaticMeshBuilder.h b/src/engine/client/application/MayaExporter/src/win32/StaticMeshBuilder.h index 51044735a..59be1992d 100644 --- a/src/engine/client/application/MayaExporter/src/win32/StaticMeshBuilder.h +++ b/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 #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" #include "sharedMath/Transform.h" class Iff; diff --git a/src/engine/client/application/MayaExporter/src/win32/VertexIndexer.h b/src/engine/client/application/MayaExporter/src/win32/VertexIndexer.h index 3cacf9b12..103f326d6 100644 --- a/src/engine/client/application/MayaExporter/src/win32/VertexIndexer.h +++ b/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" diff --git a/src/engine/client/application/Miff/src/win32/parser.yac b/src/engine/client/application/Miff/src/win32/parser.yac index 8412cbea6..1bfec252c 100644 --- a/src/engine/client/application/Miff/src/win32/parser.yac +++ b/src/engine/client/application/Miff/src/win32/parser.yac @@ -29,6 +29,7 @@ #include /* for wide character (16bit) strings */ #include +#include /*----------------------------------------------------------------** ** debug options, turn these on to TEST ONLY! don't leave these ** diff --git a/src/engine/client/application/NpcEditor/src/win32/FirstNpcEditor.h b/src/engine/client/application/NpcEditor/src/win32/FirstNpcEditor.h index abc6f8ff9..c45b363d9 100644 --- a/src/engine/client/application/NpcEditor/src/win32/FirstNpcEditor.h +++ b/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" // ============================================================================ diff --git a/src/engine/client/application/ParticleEditor/src/win32/FirstParticleEditor.h b/src/engine/client/application/ParticleEditor/src/win32/FirstParticleEditor.h index e5f3b2c3d..374d26671 100644 --- a/src/engine/client/application/ParticleEditor/src/win32/FirstParticleEditor.h +++ b/src/engine/client/application/ParticleEditor/src/win32/FirstParticleEditor.h @@ -8,7 +8,7 @@ #pragma warning (disable:4275) // non dll-interface class 'QPtrVector' 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" diff --git a/src/engine/client/application/ParticleEditor/src/win32/GameWidget.cpp b/src/engine/client/application/ParticleEditor/src/win32/GameWidget.cpp index 6341c6903..15b68a191 100644 --- a/src/engine/client/application/ParticleEditor/src/win32/GameWidget.cpp +++ b/src/engine/client/application/ParticleEditor/src/win32/GameWidget.cpp @@ -80,6 +80,7 @@ #include #include +#include // ====================================================================== namespace diff --git a/src/engine/client/application/ParticleEditor/src/win32/ParticleEditor.rc b/src/engine/client/application/ParticleEditor/src/win32/ParticleEditor.rc index 599165f82..384ba1e56 100644 --- a/src/engine/client/application/ParticleEditor/src/win32/ParticleEditor.rc +++ b/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 diff --git a/src/engine/client/application/QuestEditor/src/win32/FirstQuestEditor.h b/src/engine/client/application/QuestEditor/src/win32/FirstQuestEditor.h index 2d0ab638f..3f46deae5 100644 --- a/src/engine/client/application/QuestEditor/src/win32/FirstQuestEditor.h +++ b/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" // ---------------------------------------------------------------------- diff --git a/src/engine/client/application/RemoteDebugTool/src/shared/FirstRemoteDebugTool.h b/src/engine/client/application/RemoteDebugTool/src/shared/FirstRemoteDebugTool.h index 1fb487737..82898d419 100644 --- a/src/engine/client/application/RemoteDebugTool/src/shared/FirstRemoteDebugTool.h +++ b/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 diff --git a/src/engine/client/application/ShaderBuilder/src/win32/FirstShaderBuilder.h b/src/engine/client/application/ShaderBuilder/src/win32/FirstShaderBuilder.h index 2fdb172cf..de60e3a33 100644 --- a/src/engine/client/application/ShaderBuilder/src/win32/FirstShaderBuilder.h +++ b/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) diff --git a/src/engine/client/application/ShaderBuilder/src/win32/Node.h b/src/engine/client/application/ShaderBuilder/src/win32/Node.h index 07f69e8e1..a32948862 100644 --- a/src/engine/client/application/ShaderBuilder/src/win32/Node.h +++ b/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 diff --git a/src/engine/client/application/ShipComponentEditor/src/win32/FirstShipComponentEditor.h b/src/engine/client/application/ShipComponentEditor/src/win32/FirstShipComponentEditor.h index 5f0c705a8..a6975cbf6 100644 --- a/src/engine/client/application/ShipComponentEditor/src/win32/FirstShipComponentEditor.h +++ b/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" diff --git a/src/engine/client/application/SoundEditor/src/win32/FirstSoundEditor.h b/src/engine/client/application/SoundEditor/src/win32/FirstSoundEditor.h index 91373deb6..9b27c2581 100644 --- a/src/engine/client/application/SoundEditor/src/win32/FirstSoundEditor.h +++ b/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" diff --git a/src/engine/client/application/SwooshEditor/src/win32/FirstSwooshEditor.h b/src/engine/client/application/SwooshEditor/src/win32/FirstSwooshEditor.h index 93f513236..bf474c85c 100644 --- a/src/engine/client/application/SwooshEditor/src/win32/FirstSwooshEditor.h +++ b/src/engine/client/application/SwooshEditor/src/win32/FirstSwooshEditor.h @@ -8,7 +8,7 @@ #pragma warning (disable:4275) // non dll-interface class 'QPtrVector' 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" diff --git a/src/engine/client/application/SwooshEditor/src/win32/SwooshEditorIoWin.h b/src/engine/client/application/SwooshEditor/src/win32/SwooshEditorIoWin.h index 923d51162..115d4cb42 100644 --- a/src/engine/client/application/SwooshEditor/src/win32/SwooshEditorIoWin.h +++ b/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; diff --git a/src/engine/client/application/TemplateEditor/src/shared/FirstTemplateEditor.h b/src/engine/client/application/TemplateEditor/src/shared/FirstTemplateEditor.h index 8e9b065d9..030a5904b 100644 --- a/src/engine/client/application/TemplateEditor/src/shared/FirstTemplateEditor.h +++ b/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" diff --git a/src/engine/client/application/TerrainEditor/src/win32/DialogControlPointEditor.h b/src/engine/client/application/TerrainEditor/src/win32/DialogControlPointEditor.h index f6280955b..1a5a7ab4c 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/DialogControlPointEditor.h +++ b/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" diff --git a/src/engine/client/application/TerrainEditor/src/win32/EditorTerrain.h b/src/engine/client/application/TerrainEditor/src/win32/EditorTerrain.h index c0adb7392..3f71847b4 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/EditorTerrain.h +++ b/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" diff --git a/src/engine/client/application/TerrainEditor/src/win32/FirstTerrainEditor.h b/src/engine/client/application/TerrainEditor/src/win32/FirstTerrainEditor.h index 9e3368cdc..6af0928c3 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/FirstTerrainEditor.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/TerrainEditor/src/win32/FloraGroupFrame.h b/src/engine/client/application/TerrainEditor/src/win32/FloraGroupFrame.h index fbd84182d..4334942c9 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/FloraGroupFrame.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/TerrainEditor/src/win32/FloraTreeView.h b/src/engine/client/application/TerrainEditor/src/win32/FloraTreeView.h index 6fda61ddf..4fef7200c 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/FloraTreeView.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/TerrainEditor/src/win32/MapView.h b/src/engine/client/application/TerrainEditor/src/win32/MapView.h index f61dca9d4..90c183bb1 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/MapView.h +++ b/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" diff --git a/src/engine/client/application/TerrainEditor/src/win32/RadialGroupFrame.h b/src/engine/client/application/TerrainEditor/src/win32/RadialGroupFrame.h index cc0b2b30a..a17e015b8 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/RadialGroupFrame.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/TerrainEditor/src/win32/ShaderGroupFrame.h b/src/engine/client/application/TerrainEditor/src/win32/ShaderGroupFrame.h index b2d879cf3..c40f887aa 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/ShaderGroupFrame.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/TerrainEditor/src/win32/TerrainEditorDoc.h b/src/engine/client/application/TerrainEditor/src/win32/TerrainEditorDoc.h index 3bf881938..b422e8824 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/TerrainEditorDoc.h +++ b/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" diff --git a/src/engine/client/application/TerrainEditor/src/win32/TerrainGeneratorHelper.h b/src/engine/client/application/TerrainEditor/src/win32/TerrainGeneratorHelper.h index 80eff5d7f..fefd37e1e 100644 --- a/src/engine/client/application/TerrainEditor/src/win32/TerrainGeneratorHelper.h +++ b/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; diff --git a/src/engine/client/application/TextureBuilder/src/win32/BlueprintWriter.h b/src/engine/client/application/TextureBuilder/src/win32/BlueprintWriter.h index 1014b47d5..c4347a93f 100644 --- a/src/engine/client/application/TextureBuilder/src/win32/BlueprintWriter.h +++ b/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; diff --git a/src/engine/client/application/TextureBuilder/src/win32/FirstTextureBuilder.h b/src/engine/client/application/TextureBuilder/src/win32/FirstTextureBuilder.h index 230755511..05e1c927d 100644 --- a/src/engine/client/application/TextureBuilder/src/win32/FirstTextureBuilder.h +++ b/src/engine/client/application/TextureBuilder/src/win32/FirstTextureBuilder.h @@ -24,7 +24,7 @@ #include #include // MFC support for Internet Explorer 4 Common Controls -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include // for std::auto_ptr diff --git a/src/engine/client/application/TextureBuilder/src/win32/ImageSlotElement.h b/src/engine/client/application/TextureBuilder/src/win32/ImageSlotElement.h index e0443536d..9b506b24c 100644 --- a/src/engine/client/application/TextureBuilder/src/win32/ImageSlotElement.h +++ b/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; diff --git a/src/engine/client/application/TextureBuilder/src/win32/PaletteColorVariableElement.h b/src/engine/client/application/TextureBuilder/src/win32/PaletteColorVariableElement.h index 798fa2cd8..2bb1c4d2e 100644 --- a/src/engine/client/application/TextureBuilder/src/win32/PaletteColorVariableElement.h +++ b/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 diff --git a/src/engine/client/application/ViewIff/src/win32/FirstViewIff.h b/src/engine/client/application/ViewIff/src/win32/FirstViewIff.h index f85b8e19c..6e9ebf74d 100644 --- a/src/engine/client/application/ViewIff/src/win32/FirstViewIff.h +++ b/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" //------------------------------------------------------------------- diff --git a/src/engine/client/application/ViewIff/src/win32/IffDoc.h b/src/engine/client/application/ViewIff/src/win32/IffDoc.h index 76e2dd21f..3cee390fa 100644 --- a/src/engine/client/application/ViewIff/src/win32/IffDoc.h +++ b/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; diff --git a/src/engine/client/application/Viewer/src/win32/FirstViewer.h b/src/engine/client/application/Viewer/src/win32/FirstViewer.h index 036c8b22c..f2f5634e5 100644 --- a/src/engine/client/application/Viewer/src/win32/FirstViewer.h +++ b/src/engine/client/application/Viewer/src/win32/FirstViewer.h @@ -18,7 +18,7 @@ #include // MFC support for Internet Explorer 4 Common Controls #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/client/application/Viewer/src/win32/LightListDialog.h b/src/engine/client/application/Viewer/src/win32/LightListDialog.h index 66afead56..641e209eb 100644 --- a/src/engine/client/application/Viewer/src/win32/LightListDialog.h +++ b/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 diff --git a/src/engine/client/application/WorldSnapshotViewer/src/win32/FirstWorldSnapshotViewer.h b/src/engine/client/application/WorldSnapshotViewer/src/win32/FirstWorldSnapshotViewer.h index 9142e2221..57f75ad31 100644 --- a/src/engine/client/application/WorldSnapshotViewer/src/win32/FirstWorldSnapshotViewer.h +++ b/src/engine/client/application/WorldSnapshotViewer/src/win32/FirstWorldSnapshotViewer.h @@ -20,7 +20,7 @@ #include // MFC support for Internet Explorer 4 Common Controls #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" //=================================================================== diff --git a/src/engine/client/library/clientAnimation/src/shared/core/FirstClientAnimation.h b/src/engine/client/library/clientAnimation/src/shared/core/FirstClientAnimation.h index d5536aba0..7793ffe7b 100644 --- a/src/engine/client/library/clientAnimation/src/shared/core/FirstClientAnimation.h +++ b/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" // ====================================================================== diff --git a/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScript.h b/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScript.h index 5330606c5..8ef840871 100644 --- a/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScript.h +++ b/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 --- why is that needed for this declaration?). #include diff --git a/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScriptTemplate.h b/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScriptTemplate.h index 60d3dae5f..afcc4f086 100644 --- a/src/engine/client/library/clientAnimation/src/shared/playback/PlaybackScriptTemplate.h +++ b/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 diff --git a/src/engine/client/library/clientAnimation/src/shared/playback/StopActionTemplate.h b/src/engine/client/library/clientAnimation/src/shared/playback/StopActionTemplate.h index 25a6d0604..ae017691d 100644 --- a/src/engine/client/library/clientAnimation/src/shared/playback/StopActionTemplate.h +++ b/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; diff --git a/src/engine/client/library/clientAnimation/src/shared/playback/TimerPlaybackActionTemplate.h b/src/engine/client/library/clientAnimation/src/shared/playback/TimerPlaybackActionTemplate.h index 000ea8dc2..a71376931 100644 --- a/src/engine/client/library/clientAnimation/src/shared/playback/TimerPlaybackActionTemplate.h +++ b/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; diff --git a/src/engine/client/library/clientAudio/src/shared/FirstClientAudio.h b/src/engine/client/library/clientAudio/src/shared/FirstClientAudio.h index bf8b971cc..e9e3ac636 100644 --- a/src/engine/client/library/clientAudio/src/shared/FirstClientAudio.h +++ b/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" diff --git a/src/engine/client/library/clientAudio/src/win32/Audio.cpp b/src/engine/client/library/clientAudio/src/win32/Audio.cpp index fec020190..7ef0d6f37 100644 --- a/src/engine/client/library/clientAudio/src/win32/Audio.cpp +++ b/src/engine/client/library/clientAudio/src/win32/Audio.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #if PRODUCTION == 0 #include "clientAudio/SwgAudioCapture.h" diff --git a/src/engine/client/library/clientAudio/src/win32/Sample2d.h b/src/engine/client/library/clientAudio/src/win32/Sample2d.h index ccd80a711..f84fb0955 100644 --- a/src/engine/client/library/clientAudio/src/win32/Sample2d.h +++ b/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; diff --git a/src/engine/client/library/clientAudio/src/win32/Sample3d.h b/src/engine/client/library/clientAudio/src/win32/Sample3d.h index a4c1e262f..0999033a7 100644 --- a/src/engine/client/library/clientAudio/src/win32/Sample3d.h +++ b/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 diff --git a/src/engine/client/library/clientAudio/src/win32/SampleStream.h b/src/engine/client/library/clientAudio/src/win32/SampleStream.h index a315e1cb3..85bd092ec 100644 --- a/src/engine/client/library/clientAudio/src/win32/SampleStream.h +++ b/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 diff --git a/src/engine/client/library/clientAudio/src/win32/Sound2.h b/src/engine/client/library/clientAudio/src/win32/Sound2.h index 2bfaf2429..93bb9e66e 100644 --- a/src/engine/client/library/clientAudio/src/win32/Sound2.h +++ b/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" diff --git a/src/engine/client/library/clientAudio/src/win32/Sound2dTemplate.h b/src/engine/client/library/clientAudio/src/win32/Sound2dTemplate.h index 812a6756b..c58491780 100644 --- a/src/engine/client/library/clientAudio/src/win32/Sound2dTemplate.h +++ b/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; diff --git a/src/engine/client/library/clientAudio/src/win32/Sound3dTemplate.h b/src/engine/client/library/clientAudio/src/win32/Sound3dTemplate.h index adc228377..8a4daa605 100644 --- a/src/engine/client/library/clientAudio/src/win32/Sound3dTemplate.h +++ b/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; diff --git a/src/engine/client/library/clientAudio/src/win32/SoundId.h b/src/engine/client/library/clientAudio/src/win32/SoundId.h index 3906ebecf..f35115e10 100644 --- a/src/engine/client/library/clientAudio/src/win32/SoundId.h +++ b/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" // ============================================================================ // diff --git a/src/engine/client/library/clientAudio/src/win32/SoundTemplate.h b/src/engine/client/library/clientAudio/src/win32/SoundTemplate.h index 2d0637d1b..119a700f9 100644 --- a/src/engine/client/library/clientAudio/src/win32/SoundTemplate.h +++ b/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; diff --git a/src/engine/client/library/clientAudio/src/win32/SoundTemplateList.h b/src/engine/client/library/clientAudio/src/win32/SoundTemplateList.h index 9ba0f5d8b..b151fff2b 100644 --- a/src/engine/client/library/clientAudio/src/win32/SoundTemplateList.h +++ b/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" // ====================================================================== diff --git a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h b/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h index eaae0531e..638c0e202 100644 --- a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h +++ b/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 diff --git a/src/engine/client/library/clientBugReporting/src/shared/FirstClientBugReporting.h b/src/engine/client/library/clientBugReporting/src/shared/FirstClientBugReporting.h index ead9fdfd1..bf84c3d3a 100644 --- a/src/engine/client/library/clientBugReporting/src/shared/FirstClientBugReporting.h +++ b/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" diff --git a/src/engine/client/library/clientDirectInput/src/shared/FirstClientDirectInput.h b/src/engine/client/library/clientDirectInput/src/shared/FirstClientDirectInput.h index f81a8284e..73b13b0dd 100644 --- a/src/engine/client/library/clientDirectInput/src/shared/FirstClientDirectInput.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/appearance/ClientGameAppearanceEvents.h b/src/engine/client/library/clientGame/src/shared/appearance/ClientGameAppearanceEvents.h index 78e133024..5e4e1a861 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/ClientGameAppearanceEvents.h +++ b/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" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/appearance/FadingTextAppearance.cpp b/src/engine/client/library/clientGame/src/shared/appearance/FadingTextAppearance.cpp index e02a95775..10ed77e14 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/FadingTextAppearance.cpp +++ b/src/engine/client/library/clientGame/src/shared/appearance/FadingTextAppearance.cpp @@ -26,6 +26,7 @@ #include "dpvsObject.hpp" #include "dpvsModel.hpp" +#include // ====================================================================== bool FadingTextAppearance::ms_enabled = true; diff --git a/src/engine/client/library/clientGame/src/shared/appearance/GlowAppearance.h b/src/engine/client/library/clientGame/src/shared/appearance/GlowAppearance.h index e3219ec0e..2f3c7a14d 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/GlowAppearance.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearance.h b/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearance.h index ae1c46ab7..d13799139 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearance.h +++ b/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 diff --git a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearanceTemplate.h b/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearanceTemplate.h index 8a75aae78..8f24349e0 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberAppearanceTemplate.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberCollisionManager.cpp b/src/engine/client/library/clientGame/src/shared/appearance/LightsaberCollisionManager.cpp index 91ed7df01..e16001fbe 100644 --- a/src/engine/client/library/clientGame/src/shared/appearance/LightsaberCollisionManager.cpp +++ b/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 ClashList; + typedef std::hash_map ClashList; ClashList s_clashList; const float s_clashTimeMin = 0.2f; const float s_clashTimeMax = 0.5f; diff --git a/src/engine/client/library/clientGame/src/shared/camera/CockpitCamera.h b/src/engine/client/library/clientGame/src/shared/camera/CockpitCamera.h index e6245814c..64317def1 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/CockpitCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/camera/DebugPortalCamera.h b/src/engine/client/library/clientGame/src/shared/camera/DebugPortalCamera.h index 2fc733a00..70043e824 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/DebugPortalCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/camera/FlyByCamera.h b/src/engine/client/library/clientGame/src/shared/camera/FlyByCamera.h index ae3a3eb8f..1ca6e2f32 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/FlyByCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/camera/FreeCamera.h b/src/engine/client/library/clientGame/src/shared/camera/FreeCamera.h index 9a350697e..2d9687331 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/FreeCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/camera/FreeChaseCamera.h b/src/engine/client/library/clientGame/src/shared/camera/FreeChaseCamera.h index cab852c39..c054b6668 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/FreeChaseCamera.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/camera/ShipTurretCamera.h b/src/engine/client/library/clientGame/src/shared/camera/ShipTurretCamera.h index afebc8510..5e6cdcdc3 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/ShipTurretCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/camera/StructurePlacementCamera.h b/src/engine/client/library/clientGame/src/shared/camera/StructurePlacementCamera.h index 84cd17ef4..c2fa0f6fd 100644 --- a/src/engine/client/library/clientGame/src/shared/camera/StructurePlacementCamera.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffect.h b/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffect.h index 38b724579..956ed4bb4 100644 --- a/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffect.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffectManager.cpp b/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffectManager.cpp index 12131f3a4..c25b83f12 100644 --- a/src/engine/client/library/clientGame/src/shared/clientEffect/ClientEffectManager.cpp +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/combat/ClientCombatActionInfo.h b/src/engine/client/library/clientGame/src/shared/combat/ClientCombatActionInfo.h index f036bf393..011a9498a 100644 --- a/src/engine/client/library/clientGame/src/shared/combat/ClientCombatActionInfo.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/combat/ClientCombatPlaybackManager.h b/src/engine/client/library/clientGame/src/shared/combat/ClientCombatPlaybackManager.h index 24e7d036b..511de4425 100644 --- a/src/engine/client/library/clientGame/src/shared/combat/ClientCombatPlaybackManager.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/combat/GroundCombatActionManager.h b/src/engine/client/library/clientGame/src/shared/combat/GroundCombatActionManager.h index 6813114fd..cb9a48579 100644 --- a/src/engine/client/library/clientGame/src/shared/combat/GroundCombatActionManager.h +++ b/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 //====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/command/ClientCommandQueueEntry.h b/src/engine/client/library/clientGame/src/shared/command/ClientCommandQueueEntry.h index 2857c09bf..fe87f3f36 100644 --- a/src/engine/client/library/clientGame/src/shared/command/ClientCommandQueueEntry.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/controller/BannerController.cpp b/src/engine/client/library/clientGame/src/shared/controller/BannerController.cpp index f9caae8c3..acd5372d0 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/BannerController.cpp +++ b/src/engine/client/library/clientGame/src/shared/controller/BannerController.cpp @@ -17,6 +17,7 @@ #include "sharedObject/Object.h" #include "sharedRandom/Random.h" +#include // ====================================================================== namespace BannerControllerNamespace diff --git a/src/engine/client/library/clientGame/src/shared/controller/ClientController.h b/src/engine/client/library/clientGame/src/shared/controller/ClientController.h index bf81b6d75..56b524ba4 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/ClientController.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/controller/FlagController.cpp b/src/engine/client/library/clientGame/src/shared/controller/FlagController.cpp index e7d36efc6..bd22fedc6 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/FlagController.cpp +++ b/src/engine/client/library/clientGame/src/shared/controller/FlagController.cpp @@ -17,6 +17,8 @@ #include "sharedObject/Object.h" #include "sharedRandom/Random.h" +#include + // ====================================================================== namespace FlagControllerNamespace diff --git a/src/engine/client/library/clientGame/src/shared/controller/PlayerCreatureController.h b/src/engine/client/library/clientGame/src/shared/controller/PlayerCreatureController.h index 4bdfb6876..85b974483 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/PlayerCreatureController.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/controller/RemoteCreatureController.h b/src/engine/client/library/clientGame/src/shared/controller/RemoteCreatureController.h index 88441a2ab..f9c4ba391 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/RemoteCreatureController.h +++ b/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; diff --git a/src/engine/client/library/clientGame/src/shared/controller/WanderController.h b/src/engine/client/library/clientGame/src/shared/controller/WanderController.h index 6f904a251..ccc22be22 100644 --- a/src/engine/client/library/clientGame/src/shared/controller/WanderController.h +++ b/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" diff --git a/src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp b/src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp index 52e584807..8d604ef1e 100644 --- a/src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp +++ b/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; } diff --git a/src/engine/client/library/clientGame/src/shared/core/ClientDataTemplateList.h b/src/engine/client/library/clientGame/src/shared/core/ClientDataTemplateList.h index 7000d8dfb..1e6eb20bb 100644 --- a/src/engine/client/library/clientGame/src/shared/core/ClientDataTemplateList.h +++ b/src/engine/client/library/clientGame/src/shared/core/ClientDataTemplateList.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcString; class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/core/CutScene.cpp b/src/engine/client/library/clientGame/src/shared/core/CutScene.cpp index 1b3ef78f9..a77a438a8 100644 --- a/src/engine/client/library/clientGame/src/shared/core/CutScene.cpp +++ b/src/engine/client/library/clientGame/src/shared/core/CutScene.cpp @@ -73,7 +73,8 @@ namespace CutSceneNamespace const std::string &areaName = areaCutScenesTable.getStringValue("areaName", areaRow); const std::string &cutSceneName = areaCutScenesTable.getStringValue("cutSceneName", areaRow); - s_areaCutSceneLookup.push_back(); + //BUG ? this was empty before...not sure if string or other + s_areaCutSceneLookup.push_back(s_areaCutSceneLookup.back()); StringPair &lookup = s_areaCutSceneLookup.back(); lookup.first = areaName; lookup.second = cutSceneName; diff --git a/src/engine/client/library/clientGame/src/shared/core/FirstClientGame.h b/src/engine/client/library/clientGame/src/shared/core/FirstClientGame.h index b16dc7e70..94e41a1a0 100644 --- a/src/engine/client/library/clientGame/src/shared/core/FirstClientGame.h +++ b/src/engine/client/library/clientGame/src/shared/core/FirstClientGame.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "_precompile.h" #include "StringId.h" diff --git a/src/engine/client/library/clientGame/src/shared/core/HyperspaceIoWin.h b/src/engine/client/library/clientGame/src/shared/core/HyperspaceIoWin.h index 7ce56ede8..4c855667e 100644 --- a/src/engine/client/library/clientGame/src/shared/core/HyperspaceIoWin.h +++ b/src/engine/client/library/clientGame/src/shared/core/HyperspaceIoWin.h @@ -13,7 +13,7 @@ //------------------------------------------------------------------- #include "sharedIoWin/IoWin.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/CockpitCamera.h" #include diff --git a/src/engine/client/library/clientGame/src/shared/customization/SlotCustomizationVariable.h b/src/engine/client/library/clientGame/src/shared/customization/SlotCustomizationVariable.h index f38197f06..1a4864e2e 100644 --- a/src/engine/client/library/clientGame/src/shared/customization/SlotCustomizationVariable.h +++ b/src/engine/client/library/clientGame/src/shared/customization/SlotCustomizationVariable.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/RangedIntCustomizationVariable.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/deadReckoning/FollowCreatureController.h b/src/engine/client/library/clientGame/src/shared/deadReckoning/FollowCreatureController.h index 3fa2e5b54..bb6556830 100644 --- a/src/engine/client/library/clientGame/src/shared/deadReckoning/FollowCreatureController.h +++ b/src/engine/client/library/clientGame/src/shared/deadReckoning/FollowCreatureController.h @@ -13,8 +13,8 @@ //=================================================================== #include "clientGame/RemoteCreatureController.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" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/deadReckoning/WanderCreatureController.h b/src/engine/client/library/clientGame/src/shared/deadReckoning/WanderCreatureController.h index 2eff0a602..7873cded9 100644 --- a/src/engine/client/library/clientGame/src/shared/deadReckoning/WanderCreatureController.h +++ b/src/engine/client/library/clientGame/src/shared/deadReckoning/WanderCreatureController.h @@ -13,7 +13,7 @@ //=================================================================== #include "clientGame/RemoteCreatureController.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/dynamics/ProjectileDynamics.h b/src/engine/client/library/clientGame/src/shared/dynamics/ProjectileDynamics.h index f2de0f7f3..7d031d098 100644 --- a/src/engine/client/library/clientGame/src/shared/dynamics/ProjectileDynamics.h +++ b/src/engine/client/library/clientGame/src/shared/dynamics/ProjectileDynamics.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/SimpleDynamics.h" #include "sharedMath/Vector.h" diff --git a/src/engine/client/library/clientGame/src/shared/dynamics/WingDynamics.h b/src/engine/client/library/clientGame/src/shared/dynamics/WingDynamics.h index a3c097756..ed3a5c93c 100644 --- a/src/engine/client/library/clientGame/src/shared/dynamics/WingDynamics.h +++ b/src/engine/client/library/clientGame/src/shared/dynamics/WingDynamics.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/Dynamics.h" #include "sharedMath/Transform.h" diff --git a/src/engine/client/library/clientGame/src/shared/network/GameNetwork.h b/src/engine/client/library/clientGame/src/shared/network/GameNetwork.h index 6f4c27f5e..dfc3b70f9 100644 --- a/src/engine/client/library/clientGame/src/shared/network/GameNetwork.h +++ b/src/engine/client/library/clientGame/src/shared/network/GameNetwork.h @@ -7,8 +7,8 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/StationId.h" #include namespace MessageDispatch diff --git a/src/engine/client/library/clientGame/src/shared/object/ClientCollisionProperty.h b/src/engine/client/library/clientGame/src/shared/object/ClientCollisionProperty.h index 38b2a852b..4df86d3d9 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ClientCollisionProperty.h +++ b/src/engine/client/library/clientGame/src/shared/object/ClientCollisionProperty.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedCollision/CollisionProperty.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/ClientWaypointObject.h b/src/engine/client/library/clientGame/src/shared/object/ClientWaypointObject.h index a8ebf4af5..501aff789 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ClientWaypointObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/ClientWaypointObject.h @@ -9,7 +9,7 @@ #include "clientGame/IntangibleObject.h" #include "Archive/AutoDeltaVariableCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedMathArchive/VectorArchive.h" class SharedWaypointObjectTemplate; diff --git a/src/engine/client/library/clientGame/src/shared/object/Countermeasure.h b/src/engine/client/library/clientGame/src/shared/object/Countermeasure.h index e164e53e9..1e929e18b 100644 --- a/src/engine/client/library/clientGame/src/shared/object/Countermeasure.h +++ b/src/engine/client/library/clientGame/src/shared/object/Countermeasure.h @@ -11,7 +11,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/Object.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/CreatureObject.cpp b/src/engine/client/library/clientGame/src/shared/object/CreatureObject.cpp index 0f6a7d72b..c19682807 100644 --- a/src/engine/client/library/clientGame/src/shared/object/CreatureObject.cpp +++ b/src/engine/client/library/clientGame/src/shared/object/CreatureObject.cpp @@ -6634,7 +6634,7 @@ void CreatureObject::verifyWornAppearanceItems() for(int i = 0; i < skeleAppearance->getWearableCount(); ++i) { TangibleObject const * currentItem = dynamic_cast(skeleAppearance->getWearableObject(i)); - wornAppearanceMap.insert(std::make_pair(currentItem->getNetworkId(), currentItem)); + wornAppearanceMap.insert(std::make_pair(currentItem->getNetworkId(), currentItem)); } for (unsigned int k = 0; k < m_wearableAppearanceData.size(); ++k) // go through our streamed wearables diff --git a/src/engine/client/library/clientGame/src/shared/object/CreatureObject.h b/src/engine/client/library/clientGame/src/shared/object/CreatureObject.h index 62faea9e1..00d41c3f7 100644 --- a/src/engine/client/library/clientGame/src/shared/object/CreatureObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/CreatureObject.h @@ -16,7 +16,7 @@ #include "Archive/AutoDeltaSet.h" #include "clientGame/TangibleObject.h" #include "clientObject/ShadowBlobObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedGame/Buff.h" #include "sharedGame/CraftingDataArchive.h" #include "sharedGame/ShipChassisSlotType.h" diff --git a/src/engine/client/library/clientGame/src/shared/object/DynamicDebrisObject.h b/src/engine/client/library/clientGame/src/shared/object/DynamicDebrisObject.h index 2cb93a8ae..4d44d7b64 100644 --- a/src/engine/client/library/clientGame/src/shared/object/DynamicDebrisObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/DynamicDebrisObject.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Object.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/object/GameLight.h b/src/engine/client/library/clientGame/src/shared/object/GameLight.h index 55494d416..627d99429 100644 --- a/src/engine/client/library/clientGame/src/shared/object/GameLight.h +++ b/src/engine/client/library/clientGame/src/shared/object/GameLight.h @@ -11,7 +11,7 @@ //------------------------------------------------------------------- #include "clientGraphics/Light.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" //------------------------------------------------------------------- diff --git a/src/engine/client/library/clientGame/src/shared/object/GroupObject.h b/src/engine/client/library/clientGame/src/shared/object/GroupObject.h index 90c9c4bf2..8282a48d6 100644 --- a/src/engine/client/library/clientGame/src/shared/object/GroupObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/GroupObject.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaVector.h" #include "clientGame/UniverseObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedMathArchive/VectorArchive.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/ManufactureSchematicObject.h b/src/engine/client/library/clientGame/src/shared/object/ManufactureSchematicObject.h index dba4ecbc3..a8a7097b3 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ManufactureSchematicObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/ManufactureSchematicObject.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaMap.h" #include "clientGame/IntangibleObject.h" #include "sharedObject/CachedNetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/NonTrackingProjectile.h b/src/engine/client/library/clientGame/src/shared/object/NonTrackingProjectile.h index 2ae3cc621..005ac5f3d 100644 --- a/src/engine/client/library/clientGame/src/shared/object/NonTrackingProjectile.h +++ b/src/engine/client/library/clientGame/src/shared/object/NonTrackingProjectile.h @@ -18,7 +18,7 @@ class MemoryBlockManager; #include "clientGame/Projectile.h" #include "clientGame/WeaponObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h index 746d10c1f..b9decd1bf 100644 --- a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h @@ -14,9 +14,9 @@ #include "archive/AutoDeltaSet.h" #include "archive/AutoDeltaVector.h" #include "clientGame/IntangibleObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/BitArray.h" +#include "sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/Production.h" #include "sharedGame/CollectionsDataTable.h" #include "sharedGame/CraftingDataArchive.h" #include "sharedGame/MatchMakingId.h" diff --git a/src/engine/client/library/clientGame/src/shared/object/Projectile.h b/src/engine/client/library/clientGame/src/shared/object/Projectile.h index 698aadbec..3aa2dbed1 100644 --- a/src/engine/client/library/clientGame/src/shared/object/Projectile.h +++ b/src/engine/client/library/clientGame/src/shared/object/Projectile.h @@ -17,9 +17,9 @@ class ClientEffectTemplate; //=================================================================== #include "sharedObject/Object.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/ProjectileBeam.h b/src/engine/client/library/clientGame/src/shared/object/ProjectileBeam.h index 493e5d6f6..21a01eba0 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ProjectileBeam.h +++ b/src/engine/client/library/clientGame/src/shared/object/ProjectileBeam.h @@ -16,9 +16,9 @@ class ClientEffectTemplate; //=================================================================== #include "sharedObject/Object.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ShipProjectileMissHitData.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/ShipObject.h b/src/engine/client/library/clientGame/src/shared/object/ShipObject.h index 5d05bc3be..ef661e24f 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ShipObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/ShipObject.h @@ -16,7 +16,7 @@ #include "clientGame/CreatureObject.h" #include "clientGame/TangibleObject.h" #include "clientGame/ShipWeaponStatus.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h" +#include "sharedFoundation/BitArray.h" #include "sharedGame/ShipChassisSlotType.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/ShipObjectDestruction.h b/src/engine/client/library/clientGame/src/shared/object/ShipObjectDestruction.h index f7f481da3..eead8aaa7 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ShipObjectDestruction.h +++ b/src/engine/client/library/clientGame/src/shared/object/ShipObjectDestruction.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientAudio/SoundId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" #include diff --git a/src/engine/client/library/clientGame/src/shared/object/ShipObjectEffects.h b/src/engine/client/library/clientGame/src/shared/object/ShipObjectEffects.h index 493f53c29..844b95dd9 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ShipObjectEffects.h +++ b/src/engine/client/library/clientGame/src/shared/object/ShipObjectEffects.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Watcher.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/CachedNetworkId.h" class ShipObject; diff --git a/src/engine/client/library/clientGame/src/shared/object/ShipProjectile.h b/src/engine/client/library/clientGame/src/shared/object/ShipProjectile.h index fd40c0946..de6931c59 100644 --- a/src/engine/client/library/clientGame/src/shared/object/ShipProjectile.h +++ b/src/engine/client/library/clientGame/src/shared/object/ShipProjectile.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class ShipDamageMessage; diff --git a/src/engine/client/library/clientGame/src/shared/object/SunTrackingObject.h b/src/engine/client/library/clientGame/src/shared/object/SunTrackingObject.h index f033be3ce..b3f5d070b 100644 --- a/src/engine/client/library/clientGame/src/shared/object/SunTrackingObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/SunTrackingObject.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h b/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h index 73a196f7a..42017147e 100644 --- a/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h @@ -17,8 +17,8 @@ #include "Archive/AutoDeltaVariableCallback.h" #include "Archive/AutoDeltaVector.h" #include "clientGame/ClientObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/Watcher.h" #include "sharedGame/SharedTangibleObjectTemplate.h" #include "sharedMathArchive/VectorArchive.h" #include "sharedObject/CachedNetworkId.h" diff --git a/src/engine/client/library/clientGame/src/shared/object/TrackingProjectile.h b/src/engine/client/library/clientGame/src/shared/object/TrackingProjectile.h index c484f001a..a61dabbd5 100644 --- a/src/engine/client/library/clientGame/src/shared/object/TrackingProjectile.h +++ b/src/engine/client/library/clientGame/src/shared/object/TrackingProjectile.h @@ -21,7 +21,7 @@ class WeaponObject; #include "clientGame/Projectile.h" #include "clientGame/WeaponObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" //=================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/object/TurretObject.h b/src/engine/client/library/clientGame/src/shared/object/TurretObject.h index b6db510dd..a15348478 100644 --- a/src/engine/client/library/clientGame/src/shared/object/TurretObject.h +++ b/src/engine/client/library/clientGame/src/shared/object/TurretObject.h @@ -13,8 +13,8 @@ //=================================================================== #include "clientGame/Projectile.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" #include "sharedObject/Object.h" class ClientWeaponObjectTemplate; diff --git a/src/engine/client/library/clientGame/src/shared/object/VehicleHoverDynamicsClient.h b/src/engine/client/library/clientGame/src/shared/object/VehicleHoverDynamicsClient.h index 6706a31b2..5f7ccc490 100644 --- a/src/engine/client/library/clientGame/src/shared/object/VehicleHoverDynamicsClient.h +++ b/src/engine/client/library/clientGame/src/shared/object/VehicleHoverDynamicsClient.h @@ -14,8 +14,8 @@ #include "sharedGame/VehicleHoverDynamics.h" #include "clientAudio/SoundId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/Watcher.h" +#include "sharedFoundation/TemporaryCrcString.h" class ParticleEffectAppearance; class SoundId; diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile.h b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile.h index b663b0c16..0a3cbb6c1 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile.h +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile.h @@ -13,8 +13,8 @@ //=================================================================== #include "sharedGame/SharedObjectTemplateClientData.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/LessPointerComparator.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class Breakpoint; class ClientEffectTemplate; diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Banner.h b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Banner.h index 5fd8835fa..0267b489b 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Banner.h +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Banner.h @@ -16,7 +16,7 @@ class AppearanceTemplate; #include "clientGame/ClientDataFile.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== /** diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Flag.h b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Flag.h index 993fd4aad..80a8ce51a 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Flag.h +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_Flag.h @@ -16,7 +16,7 @@ class AppearanceTemplate; #include "clientGame/ClientDataFile.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== /** diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.cpp b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.cpp index f706eaebd..77b0ea928 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.cpp +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.cpp @@ -14,6 +14,7 @@ #include "clientGame/ClientObject.h" #include "sharedObject/Appearance.h" +#include //====================================================================== InterpolatedSoundRuntime::InterpolatedSoundRuntime() : diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.h b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.h index 778d9372b..f7395d3ef 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.h +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_InterpolatedSoundRuntime.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class ClientObject; class InterpolatedSound; diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.cpp b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.cpp index 91c7a990a..6ef2e56eb 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.cpp +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.cpp @@ -14,6 +14,7 @@ #include "clientAudio/Sound2d.h" #include "sharedObject/Object.h" +#include //====================================================================== VehicleThrusterSoundRuntimeData ::VehicleThrusterSoundRuntimeData() : diff --git a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.h b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.h index 551b4d816..e91baa66d 100644 --- a/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.h +++ b/src/engine/client/library/clientGame/src/shared/objectTemplate/ClientDataFile_VehicleThrusterSoundRuntimeData.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientAudio/SoundId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class Object; class VehicleThrusterSoundData; diff --git a/src/engine/client/library/clientGame/src/shared/playback/AlignToHardpointActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/AlignToHardpointActionTemplate.h index d6bf2a6fa..472b6ca8c 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/AlignToHardpointActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/AlignToHardpointActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/ArcTargetActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/ArcTargetActionTemplate.h index 72c775cc5..1bca32be5 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/ArcTargetActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/ArcTargetActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/ChangePostureActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/ChangePostureActionTemplate.h index 431a7a891..6fb7028c5 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/ChangePostureActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/ChangePostureActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/ChangeScaleActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/ChangeScaleActionTemplate.h index a548ed0b2..dd0d0b0d6 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/ChangeScaleActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/ChangeScaleActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/CloneWeaponActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/CloneWeaponActionTemplate.h index 0571ff11c..f42b99324 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/CloneWeaponActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/CloneWeaponActionTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/playback/FaceTargetActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/FaceTargetActionTemplate.h index 26697b17a..a81678a1d 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/FaceTargetActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/FaceTargetActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/FireProjectileAction.h b/src/engine/client/library/clientGame/src/shared/playback/FireProjectileAction.h index e4b48a167..0a1a6cc23 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/FireProjectileAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/FireProjectileAction.h @@ -14,8 +14,8 @@ class CallbackAnimationNotification; #include "clientAnimation/PlaybackAction.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/TemporaryCrcString.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/playback/FireProjectileActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/FireProjectileActionTemplate.h index d7e096d4b..96b12177e 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/FireProjectileActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/FireProjectileActionTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/Vector.h" diff --git a/src/engine/client/library/clientGame/src/shared/playback/FireTurretActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/FireTurretActionTemplate.h index 58de2d682..a47e3e27f 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/FireTurretActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/FireTurretActionTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobAction.h b/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobAction.h index 889fc8532..deba66207 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobAction.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackAction.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/TemporaryCrcString.h" #include "sharedMath/Vector.h" class CallbackAnimationNotification; diff --git a/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobActionTemplate.h index f0bd13571..7bc40d8ab 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/GrenadeLobActionTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetAction.h b/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetAction.h index 7cd820ac5..afc5fd791 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetAction.h @@ -9,8 +9,8 @@ // ====================================================================== #include "clientAnimation/PlaybackAction.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" class CrcString; class CreatureController; diff --git a/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetActionTemplate.h index 65abe7d94..e1f975555 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/HardpointTargetActionTemplate.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" class Iff; class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/playback/HomingTargetActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/HomingTargetActionTemplate.h index 04c11314c..500728374 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/HomingTargetActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/HomingTargetActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemAction.h b/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemAction.h index 29acdc81a..126c5ecae 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemAction.h @@ -14,9 +14,9 @@ #include "clientAnimation/PlaybackAction.h" #include "clientAudio/SoundId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Timer.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" class CellObject; diff --git a/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemActionTemplate.h index 1c8168c1c..8dc3c25bd 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/PlayParticleSystemActionTemplate.h @@ -13,7 +13,7 @@ #include "clientAnimation/PlaybackActionTemplate.h" #include "sharedFile/Iff.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/playback/PlaySkeletalAnimationActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/PlaySkeletalAnimationActionTemplate.h index 10bbbe7ab..213faae32 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/PlaySkeletalAnimationActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/PlaySkeletalAnimationActionTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/playback/PushCreatureActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/PushCreatureActionTemplate.h index af6c1f2e9..fd82a2702 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/PushCreatureActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/PushCreatureActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/StartTrailsActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/StartTrailsActionTemplate.h index cb6b3ae33..1f984cd2e 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/StartTrailsActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/StartTrailsActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/StopTrailsActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/StopTrailsActionTemplate.h index 3584fe56c..3c0973d56 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/StopTrailsActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/StopTrailsActionTemplate.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; diff --git a/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectAction.h b/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectAction.h index 41246ea50..c080182ea 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectAction.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackAction.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/Object.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectActionTemplate.h index c6d17a954..06f205121 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/TemporaryAttachedObjectActionTemplate.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" class Iff; class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordAction.h b/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordAction.h index 01aef1fd5..4e15b46f5 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordAction.h @@ -14,9 +14,9 @@ // ====================================================================== #include "clientAnimation/PlaybackAction.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/Watcher.h" class MemoryBlockManager; class Object; diff --git a/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordActionTemplate.h index cdc6ad93b..584def416 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/ThrowSwordActionTemplate.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class Iff; class MemoryBlockManager; diff --git a/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.cpp b/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.cpp index 1367bbf34..84258c502 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.cpp +++ b/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.cpp @@ -26,6 +26,7 @@ #include "sharedObject/MemoryBlockManagedObject.h" #include "sharedRandom/Random.h" +#include // ====================================================================== namespace UseLightningActionNamespace diff --git a/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.h b/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.h index c4497443b..bc72594c1 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.h +++ b/src/engine/client/library/clientGame/src/shared/playback/UseLightningAction.h @@ -13,9 +13,9 @@ #include "clientAnimation/PlaybackAction.h" #include "clientAudio/SoundId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" #include diff --git a/src/engine/client/library/clientGame/src/shared/playback/UseLightningActionTemplate.h b/src/engine/client/library/clientGame/src/shared/playback/UseLightningActionTemplate.h index 180d295c6..98663aa7b 100644 --- a/src/engine/client/library/clientGame/src/shared/playback/UseLightningActionTemplate.h +++ b/src/engine/client/library/clientGame/src/shared/playback/UseLightningActionTemplate.h @@ -12,8 +12,8 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" class Iff; diff --git a/src/engine/client/library/clientGame/src/shared/scene/GroundScene.h b/src/engine/client/library/clientGame/src/shared/scene/GroundScene.h index f3c9d2381..cadf0188f 100644 --- a/src/engine/client/library/clientGame/src/shared/scene/GroundScene.h +++ b/src/engine/client/library/clientGame/src/shared/scene/GroundScene.h @@ -9,8 +9,8 @@ //------------------------------------------------------------------- #include "clientGame/NetworkScene.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/Timer.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/PackedArgb.h" #include "sharedMath/Vector.h" diff --git a/src/engine/client/library/clientGame/src/shared/scene/Intro.h b/src/engine/client/library/clientGame/src/shared/scene/Intro.h index 792cbc393..b20a0c75e 100644 --- a/src/engine/client/library/clientGame/src/shared/scene/Intro.h +++ b/src/engine/client/library/clientGame/src/shared/scene/Intro.h @@ -14,8 +14,8 @@ #include "clientAudio/SoundId.h" #include "sharedIoWin/IoWin.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/Timer.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/scene/OverheadMap.h b/src/engine/client/library/clientGame/src/shared/scene/OverheadMap.h index ae9e0cb53..506fa1500 100644 --- a/src/engine/client/library/clientGame/src/shared/scene/OverheadMap.h +++ b/src/engine/client/library/clientGame/src/shared/scene/OverheadMap.h @@ -14,7 +14,7 @@ #include "UIEventCallback.h" #include "clientGame/PlanetMapManagerClient.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedMath/Vector.h" class Camera; diff --git a/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_Musician.h b/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_Musician.h index 3ac75f9ff..e3c4e974a 100644 --- a/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_Musician.h +++ b/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_Musician.h @@ -11,7 +11,7 @@ #include "clientAudio/SoundId.h" #include "clientGame/PlayerMusicManager.h" #include "clientGame/PlayerMusicManager_ParticleSystem.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class CreatureObject; diff --git a/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_ParticleSystem.h b/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_ParticleSystem.h index 8c372176f..e68d60a47 100644 --- a/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_ParticleSystem.h +++ b/src/engine/client/library/clientGame/src/shared/scene/PlayerMusicManager_ParticleSystem.h @@ -9,7 +9,7 @@ #define INCLUDED_PlayerMusicManager_ParticleSystem_H #include "clientGame/PlayerMusicManager.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class CreatureObject; class Object; diff --git a/src/engine/client/library/clientGame/src/shared/space/NebulaShellShaderPrimitive.h b/src/engine/client/library/clientGame/src/shared/space/NebulaShellShaderPrimitive.h index 3ebe24cbe..64c21da3f 100644 --- a/src/engine/client/library/clientGame/src/shared/space/NebulaShellShaderPrimitive.h +++ b/src/engine/client/library/clientGame/src/shared/space/NebulaShellShaderPrimitive.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientGraphics/ShaderPrimitive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/Sphere.h" class NebulaVisualQuad; diff --git a/src/engine/client/library/clientGame/src/shared/space/NebulaVisualQuad.h b/src/engine/client/library/clientGame/src/shared/space/NebulaVisualQuad.h index ce3c74f74..160a6eb2c 100644 --- a/src/engine/client/library/clientGame/src/shared/space/NebulaVisualQuad.h +++ b/src/engine/client/library/clientGame/src/shared/space/NebulaVisualQuad.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/Sphere.h" #include "sharedMath/Transform.h" #include "sharedMath/VectorArgb.h" diff --git a/src/engine/client/library/clientGame/src/shared/space/ShipWeaponGroupsForShip.h b/src/engine/client/library/clientGame/src/shared/space/ShipWeaponGroupsForShip.h index 2a8fc5b1a..7ff9c6cd1 100644 --- a/src/engine/client/library/clientGame/src/shared/space/ShipWeaponGroupsForShip.h +++ b/src/engine/client/library/clientGame/src/shared/space/ShipWeaponGroupsForShip.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Iff; class ShipWeaponGroup; diff --git a/src/engine/client/library/clientGame/src/shared/space/ShipWeaponStatus.h b/src/engine/client/library/clientGame/src/shared/space/ShipWeaponStatus.h index 5d96373c9..aacb710a0 100644 --- a/src/engine/client/library/clientGame/src/shared/space/ShipWeaponStatus.h +++ b/src/engine/client/library/clientGame/src/shared/space/ShipWeaponStatus.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/CachedNetworkId.h" #include "sharedMath/Vector.h" // ====================================================================== diff --git a/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientInstallationSynchronizedUi.h b/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientInstallationSynchronizedUi.h index da6d9a3a4..69e7a1ba3 100644 --- a/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientInstallationSynchronizedUi.h +++ b/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientInstallationSynchronizedUi.h @@ -11,7 +11,7 @@ #include "clientGame/ClientSynchronizedUi.h" #include "sharedUtility/InstallationResourceDataArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "Archive/AutoDeltaVariableCallback.h" #include "Archive/AutoDeltaVector.h" diff --git a/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientSynchronizedUi.h b/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientSynchronizedUi.h index a18682fbd..9dfef9a29 100644 --- a/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientSynchronizedUi.h +++ b/src/engine/client/library/clientGame/src/shared/synchronizedUi/ClientSynchronizedUi.h @@ -11,7 +11,7 @@ #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class BaselinesMessage; class DeltasMessage; diff --git a/src/engine/client/library/clientGame/src/shared/test/DynamicNormalMapTest.h b/src/engine/client/library/clientGame/src/shared/test/DynamicNormalMapTest.h index 7e848f283..33627d117 100644 --- a/src/engine/client/library/clientGame/src/shared/test/DynamicNormalMapTest.h +++ b/src/engine/client/library/clientGame/src/shared/test/DynamicNormalMapTest.h @@ -13,7 +13,7 @@ //=================================================================== #include "clientGame/TestIoWin.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class Shader; class Texture; diff --git a/src/engine/client/library/clientGame/src/shared/trading/ClientSecureTradeManager.h b/src/engine/client/library/clientGame/src/shared/trading/ClientSecureTradeManager.h index 30db3bc4d..2f3f4e5d8 100644 --- a/src/engine/client/library/clientGame/src/shared/trading/ClientSecureTradeManager.h +++ b/src/engine/client/library/clientGame/src/shared/trading/ClientSecureTradeManager.h @@ -16,7 +16,7 @@ class ClientObject; class CreatureObject; class CachedNetworkId; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" //---------------------------------------------------------------------- diff --git a/src/engine/client/library/clientGraphics/src/shared/FirstClientGraphics.h b/src/engine/client/library/clientGraphics/src/shared/FirstClientGraphics.h index 3b1ab77be..a1ab3806d 100644 --- a/src/engine/client/library/clientGraphics/src/shared/FirstClientGraphics.h +++ b/src/engine/client/library/clientGraphics/src/shared/FirstClientGraphics.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/GraphicsOptionTags.h b/src/engine/client/library/clientGraphics/src/shared/GraphicsOptionTags.h index d24215342..81bcc3d3e 100644 --- a/src/engine/client/library/clientGraphics/src/shared/GraphicsOptionTags.h +++ b/src/engine/client/library/clientGraphics/src/shared/GraphicsOptionTags.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/LodDistanceTable.cpp b/src/engine/client/library/clientGraphics/src/shared/LodDistanceTable.cpp index 783a821d0..0773813e4 100644 --- a/src/engine/client/library/clientGraphics/src/shared/LodDistanceTable.cpp +++ b/src/engine/client/library/clientGraphics/src/shared/LodDistanceTable.cpp @@ -12,6 +12,7 @@ #include "sharedFile/Iff.h" #include +#include // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderEffect.h b/src/engine/client/library/clientGraphics/src/shared/ShaderEffect.h index 69cf4b429..e7018a085 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderEffect.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderEffect.h @@ -15,7 +15,7 @@ class ShaderImplementation; class StaticShaderTemplate; class VertexBufferFormat; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderImplementation.h b/src/engine/client/library/clientGraphics/src/shared/ShaderImplementation.h index ea8b41153..c5bb7dea0 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderImplementation.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderImplementation.h @@ -21,8 +21,8 @@ class ShaderImplementationPassStage; class ShaderImplementationPassVertexShader; class StaticShaderTemplate; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/PersistentCrcString.h" #include "clientGraphics/VertexBufferFormat.h" #include diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSet.h b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSet.h index 482862a7a..a8b549e40 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSet.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSet.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/Vector.h" class Appearance; diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTags.h b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTags.h index f405b9988..b9d762a92 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTags.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTags.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ShaderPrimitiveSetTags_H #define INCLUDED_ShaderPrimitiveSetTags_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" namespace ShaderPrimitiveSetTags { diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTemplate.h b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTemplate.h index d83f08ec3..008a4fdfa 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTemplate.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSetTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h" +#include "sharedFoundation/StlForwardDeclaration.h" #include "sharedMath/Vector.h" class Appearance; diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSorter.h b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSorter.h index e6a655da5..0decf01a4 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSorter.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderPrimitiveSorter.h @@ -21,7 +21,8 @@ class StaticShader; class Texture; class Vector; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" +#include // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderTemplate.h b/src/engine/client/library/clientGraphics/src/shared/ShaderTemplate.h index daae13a9b..1ac9e9057 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderTemplate.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderTemplate.h @@ -13,7 +13,7 @@ class CustomizationVariable; class Shader; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/ShaderTemplateList.h b/src/engine/client/library/clientGraphics/src/shared/ShaderTemplateList.h index 064ca2491..6ed92bb37 100644 --- a/src/engine/client/library/clientGraphics/src/shared/ShaderTemplateList.h +++ b/src/engine/client/library/clientGraphics/src/shared/ShaderTemplateList.h @@ -17,7 +17,7 @@ class Shader; class ShaderTemplate; class StaticShader; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/SimplePolyPrimitive.cpp b/src/engine/client/library/clientGraphics/src/shared/SimplePolyPrimitive.cpp index bd80bcf24..4f8bba113 100644 --- a/src/engine/client/library/clientGraphics/src/shared/SimplePolyPrimitive.cpp +++ b/src/engine/client/library/clientGraphics/src/shared/SimplePolyPrimitive.cpp @@ -17,6 +17,7 @@ #include "sharedObject/Appearance.h" #include "sharedMath/Transform.h" +#include // ---------------------------------------------------------------------- SimplePolyPrimitive::SimplePolyPrimitive( Appearance const & owner, VertexList const & verts, VectorArgb const & color ) diff --git a/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.cpp b/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.cpp index 1ce7c711d..24ef60f2e 100644 --- a/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.cpp +++ b/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.cpp @@ -22,6 +22,7 @@ #include "sharedFoundation/MemoryBlockManager.h" #include +#include // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.h b/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.h index 780a31197..c9e695e16 100644 --- a/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.h +++ b/src/engine/client/library/clientGraphics/src/shared/StaticShaderTemplate.h @@ -18,7 +18,7 @@ class Texture; class VertexBufferFormat; #include "clientGraphics/ShaderTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/SwgVideoCapture.h b/src/engine/client/library/clientGraphics/src/shared/SwgVideoCapture.h index ae23711ed..a6b8c3457 100644 --- a/src/engine/client/library/clientGraphics/src/shared/SwgVideoCapture.h +++ b/src/engine/client/library/clientGraphics/src/shared/SwgVideoCapture.h @@ -8,7 +8,7 @@ #ifndef VIDEOCAPTURE_SWGVIDEOCAPTURE_H #define VIDEOCAPTURE_SWGVIDEOCAPTURE_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" #if PRODUCTION == 0 diff --git a/src/engine/client/library/clientGraphics/src/shared/SystemVertexBuffer.cpp b/src/engine/client/library/clientGraphics/src/shared/SystemVertexBuffer.cpp index df4a5a8cb..8743d39fa 100644 --- a/src/engine/client/library/clientGraphics/src/shared/SystemVertexBuffer.cpp +++ b/src/engine/client/library/clientGraphics/src/shared/SystemVertexBuffer.cpp @@ -14,6 +14,7 @@ #include "sharedSynchronization/Mutex.h" #include +#include // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/shared/VertexBuffer.h b/src/engine/client/library/clientGraphics/src/shared/VertexBuffer.h index fbe591bc1..0c67d7c86 100644 --- a/src/engine/client/library/clientGraphics/src/shared/VertexBuffer.h +++ b/src/engine/client/library/clientGraphics/src/shared/VertexBuffer.h @@ -18,7 +18,7 @@ class VertexBufferReadIterator; // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "clientGraphics/VertexBufferFormat.h" #include "clientGraphics/VertexBufferDescriptor.h" diff --git a/src/engine/client/library/clientGraphics/src/shared/Video.h b/src/engine/client/library/clientGraphics/src/shared/Video.h index 02f559fcc..ebb547abf 100644 --- a/src/engine/client/library/clientGraphics/src/shared/Video.h +++ b/src/engine/client/library/clientGraphics/src/shared/Video.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/client/library/clientGraphics/src/win32/Graphics.h b/src/engine/client/library/clientGraphics/src/win32/Graphics.h index b80639afe..d41340c55 100644 --- a/src/engine/client/library/clientGraphics/src/win32/Graphics.h +++ b/src/engine/client/library/clientGraphics/src/win32/Graphics.h @@ -50,7 +50,7 @@ class VertexBufferVectorGraphicsData; #include "clientGraphics/Graphics.def" #include "clientGraphics/Texture.def" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/VectorArgb.h" // ================================================================== diff --git a/src/engine/client/library/clientObject/src/shared/appearance/MarkerAppearanceTemplate.h b/src/engine/client/library/clientObject/src/shared/appearance/MarkerAppearanceTemplate.h index 707ec583d..f1285bc04 100644 --- a/src/engine/client/library/clientObject/src/shared/appearance/MarkerAppearanceTemplate.h +++ b/src/engine/client/library/clientObject/src/shared/appearance/MarkerAppearanceTemplate.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/AppearanceTemplate.h" class Iff; diff --git a/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.cpp b/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.cpp index 8e410dc80..48fdeb10d 100644 --- a/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.cpp +++ b/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.cpp @@ -33,7 +33,7 @@ #include "dpvsObject.hpp" #include - +#include // ====================================================================== // RibbonAppearance::LocalShaderPrimitive // ====================================================================== diff --git a/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.h b/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.h index f0dacc97b..3d042df59 100644 --- a/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.h +++ b/src/engine/client/library/clientObject/src/shared/appearance/RibbonAppearance.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Appearance.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientObject/src/shared/appearance/RibbonTrailAppearance.h b/src/engine/client/library/clientObject/src/shared/appearance/RibbonTrailAppearance.h index 4d6bdbb04..ec4fbdf6b 100644 --- a/src/engine/client/library/clientObject/src/shared/appearance/RibbonTrailAppearance.h +++ b/src/engine/client/library/clientObject/src/shared/appearance/RibbonTrailAppearance.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Appearance.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientObject/src/shared/appearance/TrailAppearance.h b/src/engine/client/library/clientObject/src/shared/appearance/TrailAppearance.h index 5566fdf4d..20163a398 100644 --- a/src/engine/client/library/clientObject/src/shared/appearance/TrailAppearance.h +++ b/src/engine/client/library/clientObject/src/shared/appearance/TrailAppearance.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Appearance.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientObject/src/shared/camera/GameCamera.h b/src/engine/client/library/clientObject/src/shared/camera/GameCamera.h index 1e7d8a57f..5e648fe9c 100644 --- a/src/engine/client/library/clientObject/src/shared/camera/GameCamera.h +++ b/src/engine/client/library/clientObject/src/shared/camera/GameCamera.h @@ -15,7 +15,7 @@ //=================================================================== #include "clientGraphics/RenderWorldCamera.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedMath/VectorArgb.h" //=================================================================== diff --git a/src/engine/client/library/clientObject/src/shared/camera/ObjectListCamera.h b/src/engine/client/library/clientObject/src/shared/camera/ObjectListCamera.h index c051d9593..0165a9f71 100644 --- a/src/engine/client/library/clientObject/src/shared/camera/ObjectListCamera.h +++ b/src/engine/client/library/clientObject/src/shared/camera/ObjectListCamera.h @@ -16,7 +16,7 @@ class ObjectList; class Texture; #include "clientGraphics/Camera.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" // ====================================================================== diff --git a/src/engine/client/library/clientObject/src/shared/camera/ObjectWatcherListCamera.h b/src/engine/client/library/clientObject/src/shared/camera/ObjectWatcherListCamera.h index 6f5ad8f3f..f6318cf6f 100644 --- a/src/engine/client/library/clientObject/src/shared/camera/ObjectWatcherListCamera.h +++ b/src/engine/client/library/clientObject/src/shared/camera/ObjectWatcherListCamera.h @@ -16,7 +16,7 @@ class ObjectWatcherList; class Texture; #include "clientGraphics/Camera.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" // ====================================================================== diff --git a/src/engine/client/library/clientObject/src/shared/core/FirstClientObject.h b/src/engine/client/library/clientObject/src/shared/core/FirstClientObject.h index 790142c49..6a5e36a9a 100644 --- a/src/engine/client/library/clientObject/src/shared/core/FirstClientObject.h +++ b/src/engine/client/library/clientObject/src/shared/core/FirstClientObject.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" diff --git a/src/engine/client/library/clientObject/src/shared/graphics/LightManager.h b/src/engine/client/library/clientObject/src/shared/graphics/LightManager.h index c7647538b..f86b72359 100644 --- a/src/engine/client/library/clientObject/src/shared/graphics/LightManager.h +++ b/src/engine/client/library/clientObject/src/shared/graphics/LightManager.h @@ -12,7 +12,7 @@ //------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h" +#include "sharedFoundation/ArrayList.h" #include "sharedMath/Vector.h" #include "sharedMath/VectorArgb.h" diff --git a/src/engine/client/library/clientObject/src/shared/object/HardpointObject.h b/src/engine/client/library/clientObject/src/shared/object/HardpointObject.h index 22a064ced..4b3211ab9 100644 --- a/src/engine/client/library/clientObject/src/shared/object/HardpointObject.h +++ b/src/engine/client/library/clientObject/src/shared/object/HardpointObject.h @@ -12,8 +12,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Object.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientObject/src/shared/object/ReticleManager.h b/src/engine/client/library/clientObject/src/shared/object/ReticleManager.h index 03490ca0a..0ee5ebbf2 100644 --- a/src/engine/client/library/clientObject/src/shared/object/ReticleManager.h +++ b/src/engine/client/library/clientObject/src/shared/object/ReticleManager.h @@ -11,7 +11,7 @@ #define INCLUDED_ReticleManager_H // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Appearance; class ReticleObject; diff --git a/src/engine/client/library/clientObject/src/shared/object/TimerObject.h b/src/engine/client/library/clientObject/src/shared/object/TimerObject.h index c8eb5dc3a..4628c7dd5 100644 --- a/src/engine/client/library/clientObject/src/shared/object/TimerObject.h +++ b/src/engine/client/library/clientObject/src/shared/object/TimerObject.h @@ -13,9 +13,9 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Object.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientParticle/src/shared/FirstClientParticle.h b/src/engine/client/library/clientParticle/src/shared/FirstClientParticle.h index 9fa957685..68fb591c2 100644 --- a/src/engine/client/library/clientParticle/src/shared/FirstClientParticle.h +++ b/src/engine/client/library/clientParticle/src/shared/FirstClientParticle.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_FirstClientParticle_H #define INCLUDED_FirstClientParticle_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/client/library/clientParticle/src/shared/LightningAppearance.h b/src/engine/client/library/clientParticle/src/shared/LightningAppearance.h index bdac265b2..0993a40ee 100644 --- a/src/engine/client/library/clientParticle/src/shared/LightningAppearance.h +++ b/src/engine/client/library/clientParticle/src/shared/LightningAppearance.h @@ -11,7 +11,7 @@ #include "clientAudio/SoundId.h" #include "clientParticle/LightningBolt.h" #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/VectorArgb.h" #include "sharedObject/Appearance.h" #include "sharedObject/MemoryBlockManagedObject.h" diff --git a/src/engine/client/library/clientParticle/src/shared/LightningAppearanceTemplate.h b/src/engine/client/library/clientParticle/src/shared/LightningAppearanceTemplate.h index ebf3310bd..491d39a3f 100644 --- a/src/engine/client/library/clientParticle/src/shared/LightningAppearanceTemplate.h +++ b/src/engine/client/library/clientParticle/src/shared/LightningAppearanceTemplate.h @@ -10,7 +10,7 @@ #include "clientParticle/ColorRamp.h" #include "clientParticle/ParticleTexture.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/VectorArgb.h" #include "sharedMath/WaveForm.h" #include "sharedObject/AppearanceTemplate.h" diff --git a/src/engine/client/library/clientParticle/src/shared/Particle.h b/src/engine/client/library/clientParticle/src/shared/Particle.h index 8772c5589..8d848ea69 100644 --- a/src/engine/client/library/clientParticle/src/shared/Particle.h +++ b/src/engine/client/library/clientParticle/src/shared/Particle.h @@ -10,7 +10,7 @@ #include "clientParticle/ColorRamp.h" #include "clientParticle/ParticleAttachment.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Vector.h" #include "sharedMath/WaveForm.h" diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleAttachment.h b/src/engine/client/library/clientParticle/src/shared/ParticleAttachment.h index c0dd059ac..f25bdc9ee 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleAttachment.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleAttachment.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ParticleAttachment_H #define INCLUDED_ParticleAttachment_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Object.h" class ParticleEffectAppearance; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleAttachmentDescription.h b/src/engine/client/library/clientParticle/src/shared/ParticleAttachmentDescription.h index 799098e2d..efcad5aa1 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleAttachmentDescription.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleAttachmentDescription.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ParticleAttachmentDescription_H #define INCLUDED_ParticleAttachmentDescription_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include class AppearanceTemplate; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleDescription.h b/src/engine/client/library/clientParticle/src/shared/ParticleDescription.h index 256200d92..e75d2ef78 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleDescription.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleDescription.h @@ -9,7 +9,7 @@ #define INCLUDED_ParticleDescription_H #include "clientParticle/ColorRamp.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/WaveForm.h" class ParticleAttachmentDescription; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleDescriptionMesh.h b/src/engine/client/library/clientParticle/src/shared/ParticleDescriptionMesh.h index 310df86ea..1bb5c21aa 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleDescriptionMesh.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleDescriptionMesh.h @@ -9,7 +9,7 @@ #define INCLUDED_ParticleDescriptionMesh_H #include "clientParticle/ParticleDescription.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" #include "sharedMath/WaveForm.h" class AppearanceTemplate; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearance.h b/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearance.h index c0d17ab27..252676814 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearance.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearance.h @@ -10,7 +10,7 @@ #include "clientParticle/ParticleEffectDescription.h" #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/VectorArgb.h" #include "sharedObject/Appearance.h" diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearanceTemplate.h b/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearanceTemplate.h index 89dffe70b..397b60fa7 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearanceTemplate.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleEffectAppearanceTemplate.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ParticleEffectAppearanceTemplate_H #define INCLUDED_ParticleEffectAppearanceTemplate_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedObject/AppearanceTemplate.h" class Appearance; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleEmitter.h b/src/engine/client/library/clientParticle/src/shared/ParticleEmitter.h index 56e946b0c..937bb4e11 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleEmitter.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleEmitter.h @@ -10,8 +10,8 @@ #include "clientAudio/SoundId.h" #include "clientParticle/ParticleGenerator.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 "sharedMath/Transform.h" #include "sharedMath/VectorArgb.h" #include "sharedMath/WaveForm.h" diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleEmitterGroup.h b/src/engine/client/library/clientParticle/src/shared/ParticleEmitterGroup.h index 6a1772c3e..476b949cb 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleEmitterGroup.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleEmitterGroup.h @@ -9,8 +9,8 @@ #define INCLUDED_ParticleEmitterGroup_H #include "clientParticle/ParticleGenerator.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/MemoryBlockManagedObject.h" class Iff; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleTexture.h b/src/engine/client/library/clientParticle/src/shared/ParticleTexture.h index 918f36066..1863c20c0 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleTexture.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleTexture.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ParticleTexture_H #define INCLUDED_ParticleTexture_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class Iff; class ShaderTemplate; diff --git a/src/engine/client/library/clientParticle/src/shared/ParticleTiming.h b/src/engine/client/library/clientParticle/src/shared/ParticleTiming.h index 58bc7623e..e5d0d41f3 100644 --- a/src/engine/client/library/clientParticle/src/shared/ParticleTiming.h +++ b/src/engine/client/library/clientParticle/src/shared/ParticleTiming.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ParticleTiming_H #define INCLUDED_ParticleTiming_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class Iff; diff --git a/src/engine/client/library/clientParticle/src/shared/SwooshAppearance.h b/src/engine/client/library/clientParticle/src/shared/SwooshAppearance.h index acd445bba..a96f6b5bc 100644 --- a/src/engine/client/library/clientParticle/src/shared/SwooshAppearance.h +++ b/src/engine/client/library/clientParticle/src/shared/SwooshAppearance.h @@ -11,8 +11,8 @@ #include "clientAudio/SoundId.h" #include "clientParticle/SwooshAppearanceTemplate.h" #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/VectorArgb.h" #include "sharedObject/Appearance.h" #include "sharedObject/MemoryBlockManagedObject.h" diff --git a/src/engine/client/library/clientParticle/src/shared/SwooshAppearanceTemplate.h b/src/engine/client/library/clientParticle/src/shared/SwooshAppearanceTemplate.h index 2d9b46a29..deeb2c151 100644 --- a/src/engine/client/library/clientParticle/src/shared/SwooshAppearanceTemplate.h +++ b/src/engine/client/library/clientParticle/src/shared/SwooshAppearanceTemplate.h @@ -10,8 +10,8 @@ #include "clientParticle/ColorRamp.h" #include "clientParticle/ParticleTexture.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/VectorArgb.h" #include "sharedMath/WaveForm.h" #include "sharedObject/AppearanceTemplate.h" diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationEnvironment.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationEnvironment.h index dda6b9e0e..3004cfe3c 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationEnvironment.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationEnvironment.h @@ -17,7 +17,7 @@ class Object; class SkeletalAppearance2; class Vector; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== /** diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationNotification.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationNotification.h index b56e14355..cc1e07b53 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationNotification.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/AnimationNotification.h @@ -18,7 +18,7 @@ class SkeletalAnimation; class TrackAnimationController; class TransformAnimationResolver; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CallbackAnimationNotification.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CallbackAnimationNotification.h index 934b719a5..07e236ad7 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CallbackAnimationNotification.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CallbackAnimationNotification.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/AnimationNotification.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CompressedKeyframeAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CompressedKeyframeAnimationTemplate.h index 219256258..ff987da8d 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CompressedKeyframeAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/CompressedKeyframeAnimationTemplate.h @@ -19,7 +19,7 @@ #include "clientSkeletalAnimation/KeyframeSkeletalAnimationTemplateDef.h" #include "clientSkeletalAnimation/SkeletalAnimationTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" #include "sharedMath/CompressedQuaternion.h" #include "sharedMath/Vector.h" diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/DirectionSkeletalAnimation.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/DirectionSkeletalAnimation.h index 6da58665a..a9883223b 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/DirectionSkeletalAnimation.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/DirectionSkeletalAnimation.h @@ -16,7 +16,7 @@ // Most code that works with animations works with the base SkeletalAnimation class. #include "clientSkeletalAnimation/SkeletalAnimation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/KeyframeSkeletalAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/KeyframeSkeletalAnimationTemplate.h index 4928e00f8..951b46bb4 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/KeyframeSkeletalAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/KeyframeSkeletalAnimationTemplate.h @@ -17,7 +17,7 @@ #include "clientSkeletalAnimation/KeyframeSkeletalAnimationTemplateDef.h" #include "clientSkeletalAnimation/SkeletalAnimationTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" #include "sharedMath/Quaternion.h" #include "sharedMath/Vector.h" diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimation.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimation.h index 1d164ff40..5f0a8bb61 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimation.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimation.h @@ -14,7 +14,7 @@ class PriorityBlendAnimationTemplate; #include "clientSkeletalAnimation/BasePriorityBlendAnimation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== /** diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimationTemplate.h index baa1adeb8..dc451e43f 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/PriorityBlendAnimationTemplate.h @@ -19,7 +19,7 @@ class TransformNameMap; class XmlTreeNode; #include "clientSkeletalAnimation/SkeletalAnimationTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SinglePrioritySkeletalAnimation.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SinglePrioritySkeletalAnimation.h index 125fd44cf..ff78f060e 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SinglePrioritySkeletalAnimation.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SinglePrioritySkeletalAnimation.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/SkeletalAnimation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplate.h index e84c52d08..0ebcd3c94 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplate.h @@ -18,7 +18,7 @@ class SkeletalAnimation; class SkeletalAnimationTemplateUiFactory; class TransformNameMap; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.cpp b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.cpp index 78bcb5845..564bb67d1 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.cpp +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.cpp @@ -117,7 +117,7 @@ void SkeletalAnimationTemplateList::deregisterXmlCreateFunction(char const *elem //-- look for it XmlCreationFunctionMap::iterator it = s_xmlCreationFunctions.find(elementName); - FATAL(it == ms_creationFunctions->end(), ("Failed to deregister animation's xml create function for element [%s] --- element not registered.", elementName)); + //FATAL(it == ms_creationFunctions->end(), ("Failed to deregister animation's xml create function for element [%s] --- element not registered.", elementName)); s_xmlCreationFunctions.erase(it); } diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.h index 7946f9612..2c2df461b 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/SkeletalAnimationTemplateList.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class CrcString; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/StringSelectorSkeletalAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/StringSelectorSkeletalAnimationTemplate.h index 9fd21e3fd..ca958a306 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/StringSelectorSkeletalAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/StringSelectorSkeletalAnimationTemplate.h @@ -19,7 +19,7 @@ class Iff; class SkeletalAnimationTemplate; class XmlTreeNode; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimation.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimation.h index 1a91ccec5..17fc46ad7 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimation.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimation.h @@ -16,7 +16,7 @@ class TimeScaleSkeletalAnimationTemplate; #include "clientSkeletalAnimation/SkeletalAnimation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimationTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimationTemplate.h index dd6f71476..d433600fb 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimationTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/animation/TimeScaleSkeletalAnimationTemplate.h @@ -16,7 +16,7 @@ class MemoryBlockManager; class XmlTreeNode; #include "clientSkeletalAnimation/SkeletalAnimationTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/CompositeMesh.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/CompositeMesh.h index 69287903c..227b611cb 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/CompositeMesh.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/CompositeMesh.h @@ -11,7 +11,7 @@ // ================================================================== // forward declarations -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class Appearance; class Camera; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodMeshGeneratorTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodMeshGeneratorTemplate.h index 609c28776..afebe4325 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodMeshGeneratorTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodMeshGeneratorTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/MeshGeneratorTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodSkeletonTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodSkeletonTemplate.h index a69f9f464..226fce990 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodSkeletonTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/LodSkeletonTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/SkeletonTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshConstructionHelper.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshConstructionHelper.h index a9802a42a..f9df8f37c 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshConstructionHelper.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshConstructionHelper.h @@ -11,7 +11,7 @@ // ================================================================== // includes -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // forward declarations diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplate.h index 8827aa392..d6958cb85 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplate.h @@ -10,7 +10,7 @@ // ================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class BasicMeshGeneratorTemplate; class CrcString; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplateList.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplateList.h index 467094028..661a6d345 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplateList.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/MeshGeneratorTemplateList.h @@ -11,7 +11,7 @@ // ================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcString; class Iff; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/OwnerProxyShader.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/OwnerProxyShader.h index 7c154faec..8a5d43624 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/OwnerProxyShader.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/OwnerProxyShader.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientGraphics/Shader.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class MemoryBlockManager; class OwnerProxyShaderTemplate; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.cpp b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.cpp index 8140b588f..7d15c91f6 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.cpp +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.cpp @@ -2673,7 +2673,8 @@ void SkeletalAppearance2::wear(Object *object) m_wornAppearanceObjects = new WatcherObjectVectorVector; // Add appearance to list of worn appearances. - m_wornAppearanceObjects->push_back(); + //THIS IS PROBABLY A BUG + m_wornAppearanceObjects->push_back(m_wornAppearanceObjects->back()); ObjectWatcherVectorPair & back = m_wornAppearanceObjects->back(); back.first = object; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.h index 2a8e02365..7485f7340 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalAppearance2.h @@ -12,7 +12,7 @@ // ================================================================== #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/Appearance.h" #include @@ -43,9 +43,9 @@ namespace DPVS class SphereModel; } -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Watcher.h" +#include "sharedFoundation/CrcLowerString.h" // ================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalMeshGeneratorTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalMeshGeneratorTemplate.h index 6611a9537..f946d9659 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalMeshGeneratorTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletalMeshGeneratorTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/BasicMeshGeneratorTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/Skeleton.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/Skeleton.h index f0ef750bc..b8da96afa 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/Skeleton.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/Skeleton.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class BoxExtent; class CrcString; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplate.h index 4550a9be2..35db75fa4 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplate.h @@ -12,7 +12,7 @@ // ================================================================== #include "clientSkeletalAnimation/SkeletonTemplateDef.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class BasicSkeletonTemplate; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplateList.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplateList.h index 489c3d38b..cd92e0069 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplateList.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SkeletonTemplateList.h @@ -11,7 +11,7 @@ // ================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcString; class Iff; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SoftwareBlendSkeletalShaderPrimitive.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SoftwareBlendSkeletalShaderPrimitive.h index 10fb60706..13d88e22c 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SoftwareBlendSkeletalShaderPrimitive.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/appearance/SoftwareBlendSkeletalShaderPrimitive.h @@ -16,7 +16,7 @@ #include "clientGraphics/ShaderPrimitive.h" #include "clientGraphics/VertexBufferFormat.h" #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/PackedArgb.h" class CollisionInfo; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/AnimationStateHierarchyTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/AnimationStateHierarchyTemplate.h index 9928a86d7..cfc6bbb2f 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/AnimationStateHierarchyTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/AnimationStateHierarchyTemplate.h @@ -19,7 +19,7 @@ class CrcString; // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== /** diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.cpp b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.cpp index c9208cccb..e9387162e 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.cpp +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.cpp @@ -483,7 +483,7 @@ void EditableAnimationState::addLink(EditableAnimationStateLink *link) void EditableAnimationState::removeLink(EditableAnimationStateLink *link) { EditableAnimationStateLinkVector::iterator findIt = std::find(m_stateLinks.begin(), m_stateLinks.end(), link); - if (findIt) + if (findIt != m_stateLinks.end()) UNREF(m_stateLinks.erase(findIt)); else WARNING(true, ("tried to remove EditableAnimationStateLink (0x%08x) but state doesn't know about link.", reinterpret_cast(link))); diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.h index e433da1f0..b4db10565 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableAnimationState.h @@ -13,9 +13,9 @@ #include "clientSkeletalAnimation/AnimationState.h" #include "clientSkeletalAnimation/AnimationStatePath.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableBasicAnimationAction.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableBasicAnimationAction.h index 59106bd03..adec9403d 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableBasicAnimationAction.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableBasicAnimationAction.h @@ -12,8 +12,8 @@ // ====================================================================== #include "clientSkeletalAnimation/EditableAnimationAction.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class EditableAnimationStateHierarchyTemplate; class Iff; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableMovementAnimationAction.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableMovementAnimationAction.h index b3ad115b5..dd8f9994b 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableMovementAnimationAction.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/EditableMovementAnimationAction.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientSkeletalAnimation/EditableAnimationAction.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class EditableAnimationStateHierarchyTemplate; class EditableBasicAnimationAction; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/LogicalAnimationTableTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/LogicalAnimationTableTemplate.h index b9840682d..11bf9936a 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/LogicalAnimationTableTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/LogicalAnimationTableTemplate.h @@ -25,8 +25,8 @@ class TransformNameMap; class XmlTreeDocument; class XmlTreeNode; -#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 diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/TrackAnimationController_TrackTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/TrackAnimationController_TrackTemplate.h index f6bbe3a1e..f45158b62 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/TrackAnimationController_TrackTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/controller/TrackAnimationController_TrackTemplate.h @@ -16,7 +16,7 @@ // I'm including these only because this is a private inner class only referenced by a couple other files // and is broken out soley for source size management. #include "clientSkeletalAnimation/AnimationTrackId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/core/CharacterLodManager.cpp b/src/engine/client/library/clientSkeletalAnimation/src/shared/core/CharacterLodManager.cpp index 427d2908e..904bf2b55 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/core/CharacterLodManager.cpp +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/core/CharacterLodManager.cpp @@ -18,7 +18,7 @@ #include "sharedUtility/LocalMachineOptionManager.h" #include - +#include // ====================================================================== #define CLM_SUPPORTED_LOD_COUNT 4 diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/core/FirstClientSkeletalAnimation.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/core/FirstClientSkeletalAnimation.h index 8c341657f..908e98af2 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/core/FirstClientSkeletalAnimation.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/core/FirstClientSkeletalAnimation.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" diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/LookAtTransformModifier.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/LookAtTransformModifier.h index 375fb5389..a98dce272 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/LookAtTransformModifier.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/LookAtTransformModifier.h @@ -16,7 +16,7 @@ class MemoryBlockManager; class SkeletalAppearance2; #include "clientSkeletalAnimation/TransformModifier.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/TargetPitchTransformModifier.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/TargetPitchTransformModifier.h index 9cc6c9158..a6bde00b1 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/TargetPitchTransformModifier.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/modifier/TargetPitchTransformModifier.h @@ -15,7 +15,7 @@ class Camera; class MemoryBlockManager; #include "clientSkeletalAnimation/TransformModifier.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/AnimationMessageActionTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/AnimationMessageActionTemplate.h index be185e376..610294718 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/AnimationMessageActionTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/AnimationMessageActionTemplate.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; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectAction.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectAction.h index 688b663e4..d7b0cd6b4 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectAction.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectAction.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackAction.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/Object.h" class MemoryBlockManager; diff --git a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectActionTemplate.h b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectActionTemplate.h index a9d1fd34a..b14d67b1d 100644 --- a/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectActionTemplate.h +++ b/src/engine/client/library/clientSkeletalAnimation/src/shared/playback/ShowAttachedObjectActionTemplate.h @@ -14,8 +14,8 @@ // ====================================================================== #include "clientAnimation/PlaybackActionTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" class Iff; class MemoryBlockManager; diff --git a/src/engine/client/library/clientTerrain/src/shared/appearance/ClientProceduralTerrainAppearance_ShaderSet.h b/src/engine/client/library/clientTerrain/src/shared/appearance/ClientProceduralTerrainAppearance_ShaderSet.h index 8ffb05711..a4633d532 100644 --- a/src/engine/client/library/clientTerrain/src/shared/appearance/ClientProceduralTerrainAppearance_ShaderSet.h +++ b/src/engine/client/library/clientTerrain/src/shared/appearance/ClientProceduralTerrainAppearance_ShaderSet.h @@ -11,7 +11,7 @@ // ====================================================================== #include "clientTerrain/ClientProceduralTerrainAppearance.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/PackedArgb.h" #include diff --git a/src/engine/client/library/clientTerrain/src/shared/appearance/GroundEnvironment.h b/src/engine/client/library/clientTerrain/src/shared/appearance/GroundEnvironment.h index 74b90530a..939c1555c 100644 --- a/src/engine/client/library/clientTerrain/src/shared/appearance/GroundEnvironment.h +++ b/src/engine/client/library/clientTerrain/src/shared/appearance/GroundEnvironment.h @@ -25,7 +25,7 @@ class Camera; class Shader; class ObjectList; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedMath/Transform.h" #include "sharedMath/VectorArgb.h" #include "sharedTerrain/ColorRamp256.h" diff --git a/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.cpp b/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.cpp index 6f7480aeb..74344cacb 100644 --- a/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.cpp +++ b/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.cpp @@ -18,7 +18,7 @@ #include "sharedObject/AppearanceTemplateList.h" #include - +#include // ====================================================================== namespace PlanetAppearanceTemplateNamespace diff --git a/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.h b/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.h index bb0d6c65e..200b6a419 100644 --- a/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.h +++ b/src/engine/client/library/clientTerrain/src/shared/appearance/PlanetAppearanceTemplate.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedObject/AppearanceTemplate.h" class Iff; diff --git a/src/engine/client/library/clientTerrain/src/shared/core/FirstClientTerrain.h b/src/engine/client/library/clientTerrain/src/shared/core/FirstClientTerrain.h index ffe164bc0..1dd308115 100644 --- a/src/engine/client/library/clientTerrain/src/shared/core/FirstClientTerrain.h +++ b/src/engine/client/library/clientTerrain/src/shared/core/FirstClientTerrain.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/client/library/clientTerrain/src/shared/environment/EnvironmentBlock.h b/src/engine/client/library/clientTerrain/src/shared/environment/EnvironmentBlock.h index bb6892f24..93e1e4cc0 100644 --- a/src/engine/client/library/clientTerrain/src/shared/environment/EnvironmentBlock.h +++ b/src/engine/client/library/clientTerrain/src/shared/environment/EnvironmentBlock.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/PackedRgb.h" #include "sharedMath/VectorArgb.h" #include "sharedObject/Object.h" diff --git a/src/engine/client/library/clientTerrain/src/shared/weather/WeatherManager.cpp b/src/engine/client/library/clientTerrain/src/shared/weather/WeatherManager.cpp index 4e504a130..77aae45b8 100644 --- a/src/engine/client/library/clientTerrain/src/shared/weather/WeatherManager.cpp +++ b/src/engine/client/library/clientTerrain/src/shared/weather/WeatherManager.cpp @@ -39,7 +39,7 @@ void WeatherManager::addWeatherChangedFunction (WeatherChangedFunction weatherCh if (weatherChangedFunction) { //-- verify weather changed function isn't already in list - if (!std::find (ms_weatherChangedFunctionList.end (), ms_weatherChangedFunctionList.begin (), weatherChangedFunction)) + if (std::find (ms_weatherChangedFunctionList.end (), ms_weatherChangedFunctionList.begin (), weatherChangedFunction) != ms_weatherChangedFunctionList.end()) { //-- add to list ms_weatherChangedFunctionList.push_back (weatherChangedFunction); diff --git a/src/engine/client/library/clientTextureRenderer/src/shared/BlueprintTextureRenderer.h b/src/engine/client/library/clientTextureRenderer/src/shared/BlueprintTextureRenderer.h index 6752c24b2..e10280eb0 100644 --- a/src/engine/client/library/clientTextureRenderer/src/shared/BlueprintTextureRenderer.h +++ b/src/engine/client/library/clientTextureRenderer/src/shared/BlueprintTextureRenderer.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "clientTextureRenderer/TextureRenderer.h" class BlueprintTextureRendererTemplate; diff --git a/src/engine/client/library/clientTextureRenderer/src/shared/FirstClientTextureRenderer.h b/src/engine/client/library/clientTextureRenderer/src/shared/FirstClientTextureRenderer.h index 4ef74a06d..a938cc2ea 100644 --- a/src/engine/client/library/clientTextureRenderer/src/shared/FirstClientTextureRenderer.h +++ b/src/engine/client/library/clientTextureRenderer/src/shared/FirstClientTextureRenderer.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" diff --git a/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererList.h b/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererList.h index 337bde3ae..fa04a98d6 100644 --- a/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererList.h +++ b/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererList.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class CrcLowerString; class TextureRendererTemplate; diff --git a/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererShaderPrimitive.h b/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererShaderPrimitive.h index 712c21997..32f7df075 100644 --- a/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererShaderPrimitive.h +++ b/src/engine/client/library/clientTextureRenderer/src/shared/TextureRendererShaderPrimitive.h @@ -12,7 +12,7 @@ // ====================================================================== #include "clientGraphics/ShaderPrimitive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class MemoryBlockManager; class TextureRenderer; diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatAvatarId.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatAvatarId.h index 2b1a7393d..67073836d 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatAvatarId.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatAvatarId.h @@ -9,7 +9,7 @@ #define INCLUDED_CuiChatAvatarId_H #include "sharedNetworkMessages/ChatAvatarId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //====================================================================== diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiInventoryManager.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiInventoryManager.h index 0adc9fe64..737b77ceb 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiInventoryManager.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiInventoryManager.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Object; class CachedNetworkId; diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiLayerRenderer.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiLayerRenderer.h index 510062e35..d7435991e 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiLayerRenderer.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiLayerRenderer.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" #include "UITypes.h" diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiLoginManagerAvatarInfo.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiLoginManagerAvatarInfo.h index f5728fa83..68e777480 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiLoginManagerAvatarInfo.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiLoginManagerAvatarInfo.h @@ -11,7 +11,7 @@ //====================================================================== #include "Unicode.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class CuiLoginManagerAvatarInfo { diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiMissionManager.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiMissionManager.h index 247327d91..60ee2b922 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiMissionManager.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiMissionManager.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ClientMissionObject.h" diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiObjectDataSource.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiObjectDataSource.h index 8dec7e424..438b5c4ad 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiObjectDataSource.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiObjectDataSource.h @@ -16,7 +16,7 @@ class ObjectWatcherList; class Object; class CuiObjectDataSourceCallback; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" //---------------------------------------------------------------------- diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiTextManager.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiTextManager.h index 9d5daf4cd..5a14444a1 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiTextManager.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiTextManager.h @@ -13,7 +13,7 @@ #include "UITypes.h" #include "UIString.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class UICanvas; class UIBaseObject; diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatGlue.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatGlue.h index 4fde42d36..2608fd806 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatGlue.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatGlue.h @@ -7,7 +7,7 @@ #pragma warning(default:4100 4244) -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Clock.h" +#include "sharedFoundation/Clock.h" #include "CuiVoiceChatManager.h" diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/FirstClientUserInterface.h b/src/engine/client/library/clientUserInterface/src/shared/core/FirstClientUserInterface.h index 3149546d0..cf1be33d8 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/FirstClientUserInterface.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/FirstClientUserInterface.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "_precompile.h" // ====================================================================== diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiDataDrivenPageCountdownTimer.cpp b/src/engine/client/library/clientUserInterface/src/shared/page/CuiDataDrivenPageCountdownTimer.cpp index 6b7fe3c05..7f740c44c 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiDataDrivenPageCountdownTimer.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiDataDrivenPageCountdownTimer.cpp @@ -13,6 +13,8 @@ #include "UIText.h" #include "sharedGame/SuiPageData.h" +#include + // ====================================================================== CuiDataDrivenPageCountdownTimer::CuiDataDrivenPageCountdownTimer(const std::string & name, UIPage& page, int clientPageId) : diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiHueObject.cpp b/src/engine/client/library/clientUserInterface/src/shared/page/CuiHueObject.cpp index 60bdf2f92..75322e84c 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiHueObject.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiHueObject.cpp @@ -27,7 +27,7 @@ #include "sharedObject/PaletteColorCustomizationVariable.h" #include - +#include //====================================================================== namespace diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiInputBox.h b/src/engine/client/library/clientUserInterface/src/shared/page/CuiInputBox.h index 5289a6916..16a37ce4f 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiInputBox.h +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiInputBox.h @@ -12,7 +12,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //----------------------------------------------------------------- diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiMoney.h b/src/engine/client/library/clientUserInterface/src/shared/page/CuiMoney.h index 7ebc6b40e..a94d7dd33 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiMoney.h +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiMoney.h @@ -9,7 +9,7 @@ #define INCLUDED_CuiMoney_H #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class UIPage; class UIText; diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransfer.cpp b/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransfer.cpp index fffc735b4..cf0b95fc4 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransfer.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransfer.cpp @@ -20,6 +20,8 @@ #include "UIUtils.h" #include "UnicodeUtils.h" + +#include //====================================================================== namespace CuiTransferNamespace diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransition.cpp b/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransition.cpp index 1bd5b14ff..95b82a9cd 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransition.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiTransition.cpp @@ -17,7 +17,7 @@ #include "sharedMath/Vector.h" #include - +#include //---------------------------------------------------------------------- namespace diff --git a/src/engine/client/library/clientUserInterface/src/shared/page/CuiVehicleProto.h b/src/engine/client/library/clientUserInterface/src/shared/page/CuiVehicleProto.h index 4e7b10bee..8070656b9 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/page/CuiVehicleProto.h +++ b/src/engine/client/library/clientUserInterface/src/shared/page/CuiVehicleProto.h @@ -9,7 +9,7 @@ #define INCLUDED_CuiVehicleProto_H #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class UISliderbar; diff --git a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiTurntableAdapter.cpp b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiTurntableAdapter.cpp index 5a30103dc..929b01c7f 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiTurntableAdapter.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiTurntableAdapter.cpp @@ -16,6 +16,7 @@ #include "sharedMath/VectorArgb.h" #include "sharedObject/ObjectList.h" +#include //====================================================================== diff --git a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.h b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.h index 45202fe71..2c0a3e0a8 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.h +++ b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.h @@ -14,12 +14,12 @@ #include "UIWidget.h" #include "clientGame/ClientObject.h" #include "sharedCollision/Extent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Transform.h" #include "sharedMath/Vector.h" #include "sharedMath/VectorArgb.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class ObjectWatcherListCamera; class ObjectWatcherList; diff --git a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectViewer.h b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectViewer.h index 8eb6b539c..0b4974ebf 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectViewer.h +++ b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectViewer.h @@ -14,8 +14,8 @@ #include "sharedCollision/Extent.h" #include "sharedMath/Transform.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ClientObject.h" class ObjectListCamera; diff --git a/src/engine/server/application/CentralServer/src/linux/Makefile.am b/src/engine/server/application/CentralServer/src/linux/Makefile.am index 056d3f0ed..202dac738 100644 --- a/src/engine/server/application/CentralServer/src/linux/Makefile.am +++ b/src/engine/server/application/CentralServer/src/linux/Makefile.am @@ -22,7 +22,7 @@ CentralServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy CentralServer_SOURCES=main.cpp @@ -76,7 +76,7 @@ CentralServer_LDADD = $(top_builddir)/../engine/shared/library/sharedMemoryManag $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -253,8 +253,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.h index bf723dee0..c2253ab48 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.h @@ -14,7 +14,7 @@ #include #include #include -#include "../Base/Archive.h" +#include "Base/Archive.h" #ifdef EXTERNAL_DISTRO namespace NAMESPACE @@ -50,7 +50,7 @@ class GenericAPICore public: friend class GenericConnection; - GenericAPICore::GenericAPICore(const char *host, + GenericAPICore(const char *host, short port, unsigned reqTimeout, unsigned reconnectTimeout, diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp index f3e818423..318f5c20b 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp @@ -1,7 +1,7 @@ #include "GenericApiCore.h" #include "GenericConnection.h" #include "GenericMessage.h" -#include "../AuctionTransferAPICore.h" +#include "AuctionTransferAPICore.h" //---------------------------------------- // @@ -22,7 +22,7 @@ namespace NAMESPACE using namespace std; using namespace Base; -GenericConnection::GenericConnection(const char *host, short port, GenericAPICore *apiCore, unsigned reconnectTimeout, unsigned noDataTimeoutSecs, unsigned noAckTimeoutSecs, unsigned incomingBufSizeInKB, unsigned outgoingBufSizeInKB, unsigned keepAlive, unsigned maxRecvMessageSizeInKB) +GenericConnection::GenericConnection(const char *host, short port, GenericAPICore *apiCore, unsigned reconnectTimeout, unsigned noDataTimeoutSecs, unsigned, unsigned incomingBufSizeInKB, unsigned outgoingBufSizeInKB, unsigned keepAlive, unsigned maxRecvMessageSizeInKB) : m_bConnected(CON_NONE), m_apiCore(apiCore), m_con(NULL), @@ -70,7 +70,7 @@ void GenericConnection::disconnect() m_bConnected = CON_NONE; } -void GenericConnection::OnTerminated(TcpConnection *con) +void GenericConnection::OnTerminated(TcpConnection *) { // m_apiCore->OnDisconnect(m_host.c_str(), m_port); m_apiCore->OnDisconnect(this); @@ -83,7 +83,7 @@ void GenericConnection::OnTerminated(TcpConnection *con) m_bConnected = CON_NONE; } -void GenericConnection::OnRoutePacket(TcpConnection *con, const unsigned char *data, int dataLen) +void GenericConnection::OnRoutePacket(TcpConnection *, const unsigned char *data, int dataLen) { short type; unsigned track; diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.h index 6729f896c..28852377c 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.h @@ -9,10 +9,10 @@ // //---------------------------------------- -#include "../Base/Archive.h" -#include "../TcpLibrary/TcpManager.h" -#include "../TcpLibrary/TcpConnection.h" -#include "../TcpLibrary/TcpHandlers.h" +#include +#include +#include +#include #ifdef EXTERNAL_DISTRO diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericMessage.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericMessage.h index d7a057331..dec032a6a 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericMessage.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericMessage.h @@ -10,7 +10,7 @@ //---------------------------------------- #include -#include "../Base/Archive.h" +#include #ifdef EXTERNAL_DISTRO namespace NAMESPACE diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp index 690067284..e75c66d51 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp @@ -4,7 +4,7 @@ #include "Response.h" #include "zip/GZipHelper.h" -#define DEFAULT_HOST "sdt-auctionsys1" +#define DEFAULT_HOST "localhost" #define DEFAULT_PORT 5901 #define DEFAULT_IDENTIFIER "GAME+UNKNOWN" ////////////////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi // parse the hosts and ports out : strncpy(hostConfig, hostNames, 4096); hostConfig[4095] = 0; char *ptr; - if ((ptr = strtok(hostConfig, " "))) + if ((ptr = strtok(hostConfig, " ")) != 0) { do { @@ -43,7 +43,7 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi if (portStr) { *portStr++ = 0; - port = atoi(portStr); + port = (short)atoi(portStr); } if (::strlen(host) && port) @@ -57,7 +57,7 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi strncpy(identifierConfig, identifiers, 4096); identifierConfig[4095] = 0; // parse the identifiers out - if ((ptr = strtok(identifierConfig, ";"))) + if ((ptr = strtok(identifierConfig, ";")) != 0) { do { diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.h index 738755a17..a3d85096e 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.h @@ -4,7 +4,7 @@ #pragma warning (disable : 4786) #include "AuctionTransferEnum.h" -#include "Base/Archive.h" +#include #include "Character.h" ////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPICore.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPICore.cpp index c9ab25166..c2ccccb06 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPICore.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPICore.cpp @@ -39,7 +39,7 @@ void AuctionTransferAPICore::OnConnect(GenericConnection *connection) ////////////////////////////////////////////////////////////////////////////////////// { countOpenConnections(); - m_api->onConnect(connection->getHost(), connection->getPort(), m_currentConnections, m_maxConnections); + m_api->onConnect(connection->getHost(), connection->getPort(), (short)m_currentConnections, (short)m_maxConnections); } ////////////////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ void AuctionTransferAPICore::OnDisconnect(GenericConnection *connection) ////////////////////////////////////////////////////////////////////////////////////// { countOpenConnections(); - m_api->onDisconnect(connection->getHost(), connection->getPort(), m_currentConnections, m_maxConnections); + m_api->onDisconnect(connection->getHost(), connection->getPort(), (short)m_currentConnections, (short)m_maxConnections); } ////////////////////////////////////////////////////////////////////////////////////// @@ -167,7 +167,7 @@ void AuctionTransferAPICore::responseCallback(short type, Base::ByteStream::Read // this had the stationID read in as the transactionID std::string serverID; get(iter, serverID); - m_api->onReceiveGetCharacterList(m_mappedServerTrack, transactionID, serverID.c_str()); + m_api->onReceiveGetCharacterList(m_mappedServerTrack, (unsigned int)transactionID, serverID.c_str()); } default: break; diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.h index 5df2a97e1..a15f6cbae 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.h @@ -2,15 +2,15 @@ // The author of this code is Justin Randall // // I have made modifications to the ByteStream -// and AutoByteStream classes in order to make them suitable -// for use in messaging systems which require objects that +// and AutoByteStream classes in order to make them suitable +// for use in messaging systems which require objects that // are copyable and assignable. It is also desirable for // the ByteStream object to use a flexible allocator system // that may support multi-threaded programming models. -#ifndef BASE_ARCHIVE_H -#define BASE_ARCHIVE_H +#ifndef BASE_ARCHIVE_H +#define BASE_ARCHIVE_H #include @@ -21,7 +21,7 @@ #if !defined PLATFORM_BASE_SINGLE_THREAD && ( defined _MT || defined _REENTRANT ) # define USE_ARCHIVE_MUTEX -# include "Mutex.h" +# include "Mutex.h" #endif #ifdef WIN32 @@ -35,11 +35,11 @@ #endif #ifdef EXTERNAL_DISTRO -namespace NAMESPACE +namespace NAMESPACE { #endif -namespace Base +namespace Base { const unsigned MAX_ARRAY_SIZE = 1024; @@ -54,92 +54,92 @@ const unsigned MAX_ARRAY_SIZE = 1024; class ByteStream { public: - class ReadIterator - { - public: - ReadIterator(); - ReadIterator(const ReadIterator & source); - explicit ReadIterator(const ByteStream & source); - ~ReadIterator(); + class ReadIterator + { + public: + ReadIterator(); + ReadIterator(const ReadIterator & source); + explicit ReadIterator(const ByteStream & source); + ~ReadIterator(); - ReadIterator & operator = (const ReadIterator & source); - void advance (const unsigned int distance); - void get (void * target, const unsigned long int readSize); - const unsigned int getSize () const; - const unsigned char * const getBuffer () const; - const unsigned int getReadPosition () const; + ReadIterator & operator = (const ReadIterator & source); + void advance (const unsigned int distance); + void get (void * target, const unsigned long int readSize); + const unsigned int getSize () const; + const unsigned char * const getBuffer () const; + const unsigned int getReadPosition () const; private: - unsigned int readPtr; - const ByteStream * stream; - }; + unsigned int readPtr; + const ByteStream * stream; + }; - private: - class Data - { - friend class ByteStream; - friend class ReadIterator; - public: - ~Data(); - - static Data * getNewData(); + private: + class Data + { + friend class ByteStream; + friend class ReadIterator; + public: + ~Data(); - const int getRef () const; - void deref (); - void ref (); - protected: - unsigned char * buffer; - unsigned long size; - private: - struct DataFreeList - { - ~DataFreeList() - { - std::vector::iterator i; - for(i = freeList.begin(); i != freeList.end(); ++i) - { - delete (*i); - } - }; - std::vector freeList; - }; - Data(); + static Data * getNewData(); + + const int getRef () const; + void deref (); + void ref (); + protected: + unsigned char * buffer; + unsigned long size; + private: + struct DataFreeList + { + ~DataFreeList() + { + std::vector::iterator i; + for(i = freeList.begin(); i != freeList.end(); ++i) + { + delete (*i); + } + }; + std::vector freeList; + }; + Data(); //explicit Data(unsigned char * buffer); - static std::vector & getDataFreeList(); - static void releaseOldData(Data * oldData); - private: - int refCount; - }; + static std::vector & getDataFreeList(); + static void releaseOldData(Data * oldData); + private: + int refCount; + }; friend class ReadIterator; public: - ByteStream(); - ByteStream(const unsigned char * const buffer, const unsigned int bufferSize); - ByteStream(const ByteStream & source); - virtual ~ByteStream(); + ByteStream(); + ByteStream(const unsigned char * const buffer, const unsigned int bufferSize); + ByteStream(const ByteStream & source); + virtual ~ByteStream(); public: - ByteStream(ReadIterator & source); - ByteStream & operator = (const ByteStream & source); - ByteStream & operator = (ReadIterator & source); - const ReadIterator & begin() const; - void clear(); - const unsigned char * const getBuffer() const; - const unsigned int getSize() const; - void put(const void * const source, const unsigned int sourceSize); - bool overwriteEnd(const void * const source, const unsigned int sourceSize); + ByteStream(ReadIterator & source); + ByteStream & operator = (const ByteStream & source); + ByteStream & operator = (ReadIterator & source); + const ReadIterator & begin() const; + void clear(); + const unsigned char * const getBuffer() const; + const unsigned int getSize() const; + void put(const void * const source, const unsigned int sourceSize); + bool overwriteEnd(const void * const source, const unsigned int sourceSize); private: - void get(void * target, ReadIterator & readIterator, const unsigned long int readSize) const; - void growToAtLeast(const unsigned int targetSize); - void reAllocate(const unsigned int newSize); + void get(void * target, ReadIterator & readIterator, const unsigned long int readSize) const; + void growToAtLeast(const unsigned int targetSize); + void reAllocate(const unsigned int newSize); private: - unsigned int allocatedSize; - ReadIterator beginReadIterator; - Data * data; - unsigned int size; - unsigned int lastPutSize; + unsigned int allocatedSize; + ReadIterator beginReadIterator; + Data * data; + unsigned int size; + unsigned int lastPutSize; }; @@ -157,7 +157,7 @@ const unsigned MAX_ARRAY_SIZE = 1024; #endif refCount = 0; - delete[] buffer; + delete[] buffer; #if defined(USE_ARCHIVE_MUTEX) ByteStreamMutex.Unlock(); @@ -176,14 +176,14 @@ const unsigned MAX_ARRAY_SIZE = 1024; ByteStreamMutex.Unlock(); #endif - if(refCount < 1) - releaseOldData(this); + if(refCount < 1) + releaseOldData(this); } inline std::vector & ByteStream::Data::getDataFreeList() { - static DataFreeList freeList; - return freeList.freeList; + static DataFreeList freeList; + return freeList.freeList; } inline ByteStream::Data * ByteStream::Data::getNewData() @@ -193,30 +193,30 @@ const unsigned MAX_ARRAY_SIZE = 1024; #endif Data * result = 0; - if(getDataFreeList().empty()) - { - result = new Data; - } - else - { - result = getDataFreeList().back(); - getDataFreeList().pop_back(); - } - result->refCount = 1; + if(getDataFreeList().empty()) + { + result = new Data; + } + else + { + result = getDataFreeList().back(); + getDataFreeList().pop_back(); + } + result->refCount = 1; #if defined(USE_ARCHIVE_MUTEX) ByteStreamMutex.Unlock(); #endif - return result; + return result; } inline const int ByteStream::Data::getRef() const { - return refCount; + return refCount; } - inline void ByteStream::Data::ref() + inline void ByteStream::Data::ref() { #if defined(USE_ARCHIVE_MUTEX) ByteStreamMutex.Lock(); @@ -236,7 +236,7 @@ const unsigned MAX_ARRAY_SIZE = 1024; #endif getDataFreeList().push_back(oldData); - oldData->refCount = 0; + oldData->refCount = 0; #if defined(USE_ARCHIVE_MUTEX) ByteStreamMutex.Unlock(); @@ -245,51 +245,51 @@ const unsigned MAX_ARRAY_SIZE = 1024; inline ByteStream::ReadIterator & ByteStream::ReadIterator::operator = (const ByteStream::ReadIterator & rhs) { - if(&rhs != this) - { - readPtr = rhs.readPtr; - stream = rhs.stream; - } - return *this; + if(&rhs != this) + { + readPtr = rhs.readPtr; + stream = rhs.stream; + } + return *this; } inline void ByteStream::ReadIterator::get(void * target, const unsigned long int readSize) { - assert(stream); - stream->get(target, *this, readSize); - readPtr += readSize; + assert(stream); + stream->get(target, *this, readSize); + readPtr += readSize; } inline const unsigned int ByteStream::ReadIterator::getSize() const { - assert(stream); - return stream->getSize() - readPtr; + assert(stream); + return stream->getSize() - readPtr; } inline const ByteStream::ReadIterator & ByteStream::begin() const { - return beginReadIterator; + return beginReadIterator; } inline void ByteStream::ReadIterator::advance(const unsigned int distance) { - readPtr += distance; + readPtr += distance; } inline const unsigned int ByteStream::ReadIterator::getReadPosition() const { - return readPtr; + return readPtr; } inline const unsigned char * const ByteStream::ReadIterator::getBuffer() const { - if(stream) - return &stream->data->buffer[readPtr]; + if(stream) + return &stream->data->buffer[readPtr]; - return 0; + return 0; } - inline void ByteStream::clear() + inline void ByteStream::clear() { #if defined(USE_ARCHIVE_MUTEX) ByteStreamMutex.Lock(); @@ -304,276 +304,98 @@ const unsigned MAX_ARRAY_SIZE = 1024; inline const unsigned char * const ByteStream::getBuffer() const { - return data->buffer; + return data->buffer; } inline const unsigned int ByteStream::getSize() const { - return size; + return size; } inline void ByteStream::growToAtLeast(const unsigned int targetSize) { - if(allocatedSize < targetSize) - { - reAllocate(allocatedSize + allocatedSize + targetSize); - } + if(allocatedSize < targetSize) + { + reAllocate(allocatedSize + allocatedSize + targetSize); + } } //////////////////////////////////////////////////////////////////////////////// - class AutoVariableBase - { - public: - AutoVariableBase(); - virtual ~AutoVariableBase(); - - virtual void pack(ByteStream & target) const = 0; - virtual void unpack(ByteStream::ReadIterator & source) = 0; - }; - - -//////////////////////////////////////////////////////////////////////////////// - - - class AutoByteStream - { - public: - AutoByteStream(); - virtual ~AutoByteStream(); - void addVariable(AutoVariableBase & newVariable); - virtual const unsigned int getItemCount() const; - virtual void pack(ByteStream & target) const; - virtual void unpack(ByteStream::ReadIterator & source); - protected: - std::vector members; - private: - AutoByteStream(const AutoByteStream & source); - }; - - -//////////////////////////////////////////////////////////////////////////////// - - - template - class AutoVariable : public AutoVariableBase - { - public: - AutoVariable(); - explicit AutoVariable(const ValueType & source); - virtual ~AutoVariable(); - - const ValueType & get() const; - virtual void pack(ByteStream & target) const; - void set(const ValueType & rhs); - virtual void unpack(ByteStream::ReadIterator & source); - - private: - ValueType value; - }; - - template - AutoVariable::AutoVariable() : - AutoVariableBase(), - value() - { - } - - template - AutoVariable::AutoVariable(const ValueType & source) : - AutoVariableBase(), - value(source) - { - } - - template - AutoVariable::~AutoVariable() - { - } - - template - const ValueType & AutoVariable::get() const - { - return value; - } - - template - void AutoVariable::pack(ByteStream & target) const - { - Base::put(target, value); - } - - template - void AutoVariable::set(const ValueType & rhs) - { - value = rhs; - } - - template - void AutoVariable::unpack(ByteStream::ReadIterator & source) - { - Base::get(source, value); - } - - -//////////////////////////////////////////////////////////////////////////////// - - - template - class AutoArray : public AutoVariableBase - { - public: - AutoArray(); - AutoArray(const AutoArray & source); - ~AutoArray(); - - const std::vector & get() const; - void set(const std::vector & source); - - virtual void pack(ByteStream & target) const; - virtual void unpack(ByteStream::ReadIterator & source); - - private: - std::vector array; - }; - - template - inline AutoArray::AutoArray() - { - } - - template - inline AutoArray::AutoArray(const AutoArray & source) : - array(source.array) - { - } - - template - inline AutoArray::~AutoArray() - { - } - - template - inline const std::vector & AutoArray::get() const - { - return array; - } - - template - inline void AutoArray::set(const std::vector & source) - { - array = source; - } - - template - inline void AutoArray::pack(ByteStream & target) const - { - unsigned int arraySize = array.size(); - Base::put(target, arraySize); - - typename std::vector::const_iterator i; - for(i = array.begin(); i != array.end(); ++i) - { - ValueType v = (*i); - Base::put(target, v); - } - } - - template - inline void AutoArray::unpack(ByteStream::ReadIterator & source) - { - unsigned int arraySize; - Base::get(source, arraySize); - ValueType v; - - if (arraySize > MAX_ARRAY_SIZE) - arraySize = 0; - - for(unsigned int i = 0; i < arraySize; ++i) - { - Base::get(source, v); - array.push_back(v); - } - } - - -//////////////////////////////////////////////////////////////////////////////// - - inline void get(ByteStream::ReadIterator & source, ByteStream & target) { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); } inline void get(ByteStream::ReadIterator & source, double & target) { - source.get(&target, 8); + source.get(&target, 8); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, float & target) { - source.get(&target, 4); + source.get(&target, 4); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, uint64 & target) { - source.get(&target, 8); + source.get(&target, 8); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, int64 & target) { - source.get(&target, 8); + source.get(&target, 8); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, uint32 & target) { - source.get(&target, 4); + source.get(&target, 4); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, int32 & target) { - source.get(&target, 4); + source.get(&target, 4); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, uint16 & target) { - source.get(&target, 2); + source.get(&target, 2); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, int16 & target) { - source.get(&target, 2); + source.get(&target, 2); target = byteSwap(target); } inline void get(ByteStream::ReadIterator & source, uint8 & target) { - source.get(&target, 1); + source.get(&target, 1); } inline void get(ByteStream::ReadIterator & source, int8 & target) { - source.get(&target, 1); + source.get(&target, 1); } inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) { - source.get(target, targetSize); + source.get(target, targetSize); } inline void get(ByteStream::ReadIterator & source, bool & target) { - source.get(&target, 1); + source.get(&target, 1); } @@ -582,8 +404,8 @@ const unsigned MAX_ARRAY_SIZE = 1024; inline void put(ByteStream & target, ByteStream::ReadIterator & source) { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); } inline void put(ByteStream & target, const double value) @@ -646,24 +468,24 @@ const unsigned MAX_ARRAY_SIZE = 1024; inline void put(ByteStream & target, const bool & source) { - target.put(&source, 1); + target.put(&source, 1); } inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { - target.put(source, sourceSize); + target.put(source, sourceSize); } inline void put(ByteStream & target, const ByteStream & source) { - target.put(source.begin().getBuffer(), source.begin().getSize()); + target.put(source.begin().getBuffer(), source.begin().getSize()); } void get(ByteStream::ReadIterator & source, std::string & target); void put(ByteStream & target, const std::string & source); - + //////////////////////////////////////////////////////////////////////////////// @@ -727,20 +549,194 @@ const unsigned MAX_ARRAY_SIZE = 1024; inline bool overwriteEnd(ByteStream & target, const bool & source) { - return target.overwriteEnd(&source, 1); + return target.overwriteEnd(&source, 1); } inline bool overwriteEnd(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { - return target.overwriteEnd(source, sourceSize); + return target.overwriteEnd(source, sourceSize); } //////////////////////////////////////////////////////////////////////////////// + class AutoVariableBase + { + public: + AutoVariableBase(); + virtual ~AutoVariableBase(); + + virtual void pack(ByteStream & target) const = 0; + virtual void unpack(ByteStream::ReadIterator & source) = 0; + }; + + +//////////////////////////////////////////////////////////////////////////////// + + + class AutoByteStream + { + public: + AutoByteStream(); + virtual ~AutoByteStream(); + void addVariable(AutoVariableBase & newVariable); + virtual const unsigned int getItemCount() const; + virtual void pack(ByteStream & target) const; + virtual void unpack(ByteStream::ReadIterator & source); + protected: + std::vector members; + private: + AutoByteStream(const AutoByteStream & source); + }; + + +//////////////////////////////////////////////////////////////////////////////// + + + template + class AutoVariable : public AutoVariableBase + { + public: + AutoVariable(); + explicit AutoVariable(const ValueType & source); + virtual ~AutoVariable(); + + const ValueType & get() const; + virtual void pack(ByteStream & target) const; + void set(const ValueType & rhs); + virtual void unpack(ByteStream::ReadIterator & source); + + private: + ValueType value; + }; + + template + AutoVariable::AutoVariable() : + AutoVariableBase(), + value() + { + } + + template + AutoVariable::AutoVariable(const ValueType & source) : + AutoVariableBase(), + value(source) + { + } + + template + AutoVariable::~AutoVariable() + { + } + + template + const ValueType & AutoVariable::get() const + { + return value; + } + + template + void AutoVariable::pack(ByteStream & target) const + { + put(target, value); + } + + template + void AutoVariable::set(const ValueType & rhs) + { + value = rhs; + } + + template + void AutoVariable::unpack(ByteStream::ReadIterator & source) + { + get(source, value); + } + + +//////////////////////////////////////////////////////////////////////////////// + + + template + class AutoArray : public AutoVariableBase + { + public: + AutoArray(); + AutoArray(const AutoArray & source); + ~AutoArray(); + + const std::vector & get() const; + void set(const std::vector & source); + + virtual void pack(ByteStream & target) const; + virtual void unpack(ByteStream::ReadIterator & source); + + private: + std::vector array; + }; + + template + inline AutoArray::AutoArray() + { + } + + template + inline AutoArray::AutoArray(const AutoArray & source) : + array(source.array) + { + } + + template + inline AutoArray::~AutoArray() + { + } + + template + inline const std::vector & AutoArray::get() const + { + return array; + } + + template + inline void AutoArray::set(const std::vector & source) + { + array = source; + } + + template + inline void AutoArray::pack(ByteStream & target) const + { + unsigned int arraySize = array.size(); + Base::put(target, arraySize); + + typename std::vector::const_iterator i; + for(i = array.begin(); i != array.end(); ++i) + { + ValueType v = (*i); + Base::put(target, v); + } + } + + template + inline void AutoArray::unpack(ByteStream::ReadIterator & source) + { + unsigned int arraySize; + Base::get(source, arraySize); + ValueType v; + + if (arraySize > MAX_ARRAY_SIZE) + arraySize = 0; + + for(unsigned int i = 0; i < arraySize; ++i) + { + Base::get(source, v); + array.push_back(v); + } + } + }; #ifdef EXTERNAL_DISTRO }; #endif -#endif +#endif diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp index 1671c0b92..8ccadac05 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp @@ -66,7 +66,7 @@ void put(Base::ByteStream &msg, const Blob &source); ////////////////////////////////////////////////////////////////////////////////////// ReplyRequest::ReplyRequest( RequestTypes type, unsigned serverTrack, unsigned responseCode ) - : GenericRequest(type, serverTrack), m_responseCode(responseCode) + : GenericRequest((short)type, serverTrack), m_responseCode(responseCode) { } @@ -80,7 +80,7 @@ void ReplyRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// CommonRequest::CommonRequest( RequestTypes type, unsigned serverTrack, long long transactionID ) - : GenericRequest(type, serverTrack), m_transactionID(transactionID) + : GenericRequest((short)type, serverTrack), m_transactionID(transactionID) { } @@ -93,7 +93,7 @@ void CommonRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// GetIDRequest::GetIDRequest( RequestTypes type, unsigned serverTrack ) - : GenericRequest(type, serverTrack) + : GenericRequest((short)type, serverTrack) { } @@ -105,7 +105,7 @@ void GetIDRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// SendPrepareCompressedRequest::SendPrepareCompressedRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const unsigned char *xmlAsset, unsigned length) - : GenericRequest(type, serverTrack), + : GenericRequest((short)type, serverTrack), m_transactionID(transactionID), m_stationID(stationID), m_characterID(characterID), @@ -129,7 +129,7 @@ void SendPrepareCompressedRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// SendPrepareRequest::SendPrepareRequest( RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const char *xml ) - : GenericRequest(type, serverTrack), + : GenericRequest((short)type, serverTrack), m_transactionID(transactionID), m_stationID(stationID), m_characterID(characterID), @@ -153,7 +153,7 @@ void SendPrepareRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// ReplyGetCharacterListRequest::ReplyGetCharacterListRequest(RequestTypes type, unsigned serverTrack, unsigned responseCode, const Character characters[], unsigned numCharacters) -: GenericRequest(type, serverTrack), m_responseCode(responseCode) +: GenericRequest((short)type, serverTrack), m_responseCode(responseCode) { for(unsigned i = 0; i < numCharacters; i++) { @@ -176,7 +176,7 @@ void ReplyGetCharacterListRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// IdentifyServerRequest::IdentifyServerRequest(RequestTypes type, unsigned serverTrack, const char *serverID[], unsigned numIDs) -: GenericRequest(type, serverTrack) +: GenericRequest((short)type, serverTrack) { for(unsigned i = 0; i < numIDs; i++) { @@ -198,7 +198,7 @@ void IdentifyServerRequest::pack(Base::ByteStream &msg) ////////////////////////////////////////////////////////////////////////////////////// SendAuditRequest::SendAuditRequest( RequestTypes type, unsigned serverTrack, const char *gameCode, const char *serverCode, long long inGameAssetID, unsigned stationID, const char *event, const char *message) -: GenericRequest(type, serverTrack), m_gameCode(gameCode), m_serverCode(serverCode), m_assetID(inGameAssetID), +: GenericRequest((short)type, serverTrack), m_gameCode(gameCode), m_serverCode(serverCode), m_assetID(inGameAssetID), m_userID(stationID), m_event(event), m_message(message) { } diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.h index 1ab95eeab..f848c26b5 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.h @@ -1,8 +1,8 @@ #ifndef REQUEST_H #define REQUEST_H -#include "ATGenericAPI/GenericMessage.h" -#include "Base/Archive.h" +#include +#include #include "AuctionTransferEnum.h" #include "Character.h" diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.cpp index 1eb8a982f..781ec3184 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.cpp @@ -3,7 +3,7 @@ namespace AuctionTransfer { GetIDResponse::GetIDResponse(RequestTypes type, void *user) - : GenericResponse( type, TRANSFER_SERVER_TIME_OUT, user), m_transactionID(-1) + : GenericResponse( (short)type, TRANSFER_SERVER_TIME_OUT, user), m_transactionID(-1) { } diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.h b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.h index 0ca57c894..c7352fa20 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.h +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.h @@ -1,8 +1,8 @@ #ifndef RESPONSE_H #define RESPONSE_H -#include "Base/Archive.h" -#include "ATGenericAPI/GenericMessage.h" +#include +#include #include "AuctionTransferEnum.h" ////////////////////////////////////////////////////////////////////////////////////// @@ -12,7 +12,7 @@ namespace AuctionTransfer class CommonResponse : public GenericResponse { public: - CommonResponse(RequestTypes type, void *user) : GenericResponse( type, TRANSFER_SERVER_TIME_OUT, user) {} + CommonResponse(RequestTypes type, void *user) : GenericResponse((short)type, TRANSFER_SERVER_TIME_OUT, user) {} virtual ~CommonResponse() {} }; diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp index da1154dc8..9a0a54602 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp @@ -199,7 +199,10 @@ int TcpConnection::finishConnect() fd_set wrSet; FD_ZERO(&wrSet); +#pragma warning(push) +#pragma warning(disable : 4127) FD_SET(m_socket, &wrSet); +#pragma warning(pop) timeval t; t.tv_sec = 0; diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp index fa4d61a44..a89065a61 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp @@ -104,7 +104,11 @@ bool TcpManager::BindAsServer() if (m_socket != INVALID_SOCKET) { #if defined(WIN32) + +#pragma warning(push) +#pragma warning(disable : 4127) FD_SET(m_socket, &m_permfds);//the socket this server is listening on +#pragma warning(pop) unsigned long isNonBlocking = 1; int outBufSize = m_params.outgoingBufferSize; @@ -619,7 +623,12 @@ void TcpManager::addNewConnection(TcpConnection *con) con->AddRef(); #ifdef WIN32 //uses select if (con->m_socket != INVALID_SOCKET) + { +#pragma warning(push) +#pragma warning(disable : 4127) FD_SET(con->m_socket, &m_permfds); +#pragma warning(pop) + } #endif con->m_nextConnection = m_connectionList; con->m_prevConnection = NULL; @@ -652,7 +661,10 @@ void TcpManager::removeConnection(TcpConnection *con) #ifdef WIN32 //select only used on win32 if (con->m_socket != INVALID_SOCKET) { +#pragma warning(push) +#pragma warning(disable : 4127) FD_CLR(con->m_socket, &m_permfds); +#pragma warning(pop) } #endif if (con->m_prevConnection != NULL) diff --git a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/inftrees.c b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/inftrees.c index 4c32ca30d..5a5d6b66b 100644 --- a/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/inftrees.c +++ b/src/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/inftrees.c @@ -1,6 +1,6 @@ /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h + * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" @@ -213,7 +213,7 @@ uIntf *v; /* working area: values in order of bit length */ /* compute minimum size table less than or equal to l bits */ z = g - w; - z = z > (uInt)l ? l : z; /* table size upper limit */ + z = z > (uInt)l ? (uInt)l : z; /* table size upper limit */ if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ { /* too few codes for k-w bit table */ f -= a + 1; /* deduct codes from patterns left */ diff --git a/src/engine/server/application/CentralServer/src/shared/CentralCSHandler.cpp b/src/engine/server/application/CentralServer/src/shared/CentralCSHandler.cpp index 4883b0405..8736f4c35 100644 --- a/src/engine/server/application/CentralServer/src/shared/CentralCSHandler.cpp +++ b/src/engine/server/application/CentralServer/src/shared/CentralCSHandler.cpp @@ -14,10 +14,10 @@ // defines #define REGISTER_CS_CMD(_name_, _type_) \ -smp_instance->m_entries[ #_name_ ] = new HandlerEntry( #_name_, CentralCSHandler::HandlerEntry::##_type_ ); +smp_instance->m_entries[ #_name_ ] = new HandlerEntry( #_name_, CentralCSHandler::HandlerEntry::_type_ ); #define REGISTER_HANDLED_CMD(_name_, _type_ ) \ -smp_instance->m_entries[ #_name_ ] = new HandlerEntry( #_name_, &CentralCSHandler::handle_##_name_, CentralCSHandler::HandlerEntry::##_type_ ); +smp_instance->m_entries[ #_name_ ] = new HandlerEntry( #_name_, &CentralCSHandler::handle_##_name_, CentralCSHandler::HandlerEntry::_type_ ); #define CS_CMD(_name_) void CentralCSHandler::handle_##_name_( GameServerCSRequestMessage& request ) @@ -27,34 +27,34 @@ CentralCSHandler * CentralCSHandler::smp_instance = 0; void CentralCSHandler::install() { - + smp_instance = new CentralCSHandler(); REGISTER_CS_CMD( get_characters, TYPE_DB ); REGISTER_CS_CMD( get_pc_info, TYPE_GAME_SERVER); REGISTER_CS_CMD( undelete_item, TYPE_ARBITRARY_GAME_SERVER ); REGISTER_CS_CMD( get_containment_info, TYPE_DB ); REGISTER_CS_CMD( get_deleted_items, TYPE_DB ); - + REGISTER_CS_CMD( test, TYPE_GAME_SERVER ); REGISTER_CS_CMD( set_bank_credits, TYPE_GAME_SERVER ); REGISTER_CS_CMD( check_args, TYPE_GAME_SERVER ); - + REGISTER_CS_CMD( rename_player, TYPE_GAME_SERVER ); - + REGISTER_CS_CMD( list_objvars, TYPE_GAME_SERVER ); REGISTER_CS_CMD( set_objvar, TYPE_GAME_SERVER ); REGISTER_CS_CMD( add_objvar, TYPE_GAME_SERVER ); REGISTER_CS_CMD( remove_objvar, TYPE_GAME_SERVER ); - + REGISTER_CS_CMD( dump_info, TYPE_GAME_SERVER ); - + REGISTER_CS_CMD( get_player_id, TYPE_DB ); - + REGISTER_CS_CMD( move_object, TYPE_GAME_SERVER ); REGISTER_CS_CMD( create_crafted_object, TYPE_GAME_SERVER ); - + REGISTER_CS_CMD( list_structures, TYPE_DB ); - + REGISTER_HANDLED_CMD( login_character, TYPE_CONDITIONAL_CENTRAL ); REGISTER_CS_CMD( warp_player, TYPE_CONDITIONAL ); @@ -71,9 +71,9 @@ void CentralCSHandler::handleStructureListResponse( StructureListMessage& msg ) std::string response; response = "structurelist\r\n"; response += "character_id:" + msg.getCharacterId().getValueString() + "\r\n"; - + std::vector data = msg.getData(); - + char buf[512]; for( unsigned i = 0; i < data.size(); ++i ) { @@ -86,12 +86,12 @@ void CentralCSHandler::handleStructureListResponse( StructureListMessage& msg ) row.m_coordinates.y, row.m_coordinates.z, row.m_deleted ); - + response += buf; } - + // build the response message. - + CSToolResponse rmsg(0, response, msg.getToolId()); CentralServer::getInstance().sendToLoginServer(msg.getLoginServerId(), rmsg); } @@ -101,65 +101,65 @@ void CentralCSHandler::handleFindObjectResponse( int iIndex, bool bFound ) { // try to find the entry. CentralCharFindMap::iterator it = m_findMap.find( iIndex ); - + // if it's there... if( it != m_findMap.end() ) { CSCharacterFindInfo &info = *( it->second ); // if we found the character... if( bFound ) - { + { // send the request to the appropriate game server and delete the entry // make a new request - GameServerCSRequestMessage gsreq( info.iAccount, + GameServerCSRequestMessage gsreq( info.iAccount, info.commandLine, info.iToolId, info.iAccessLevel, info.iLoginServerId, info.user, - info.command ); - + info.command ); + // spam it, in case the object has moved servers in between. CentralServer::getInstance().sendToAllGameServersExceptDBProcess( gsreq, true ); - + delete it->second; - + m_findMap.erase( it ); - + return; } - + // otherwise, decrement the counter. - info.responsesWaiting--; - + info.responsesWaiting--; + // if the counter is <= 0, if( info.responsesWaiting <= 0 ) { // send the request to the DB or the appropriate central handler. // make a new request if( info.bCentral ) - { + { // find the handler. CentralCSHandlerMap::iterator it = m_entries.find( info.command ); - + // if we're here, we should have an entry, and it should be of // TYPE_CONDITIONAL_CENTRAL. Still, better safe than sorry. if( it != m_entries.end() ) { HandlerEntry & entry = *( it->second ); - + if( entry.type == HandlerEntry::TYPE_CONDITIONAL_CENTRAL ) { // make a CSToolRequest - GameServerCSRequestMessage gsreq( info.iAccount, + GameServerCSRequestMessage gsreq( info.iAccount, info.commandLine, info.iToolId, info.iAccessLevel, info.iLoginServerId, info.user, - info.command ); - + info.command ); + CentralCSHandlerFunc func = entry.func; ( this->*func )( gsreq ); } @@ -167,7 +167,7 @@ void CentralCSHandler::handleFindObjectResponse( int iIndex, bool bFound ) // execute. } else - { + { // fire to the DB. DBCSRequestMessage dbreq( info.iAccount, info.iAccessLevel, @@ -177,9 +177,9 @@ void CentralCSHandler::handleFindObjectResponse( int iIndex, bool bFound ) info.commandLine ); CentralServer::getInstance().sendToDBProcess(dbreq, true); } - + delete it->second; - + m_findMap.erase( it ); } } @@ -194,14 +194,14 @@ void CentralCSHandler::handle( const CSToolRequest & req, uint32 loginServerId ) HandlerEntry & entry = *( it->second ); type = entry.type; } - - + + switch( type ) { case HandlerEntry::TYPE_DB: { // send to DB - DBCSRequestMessage dbreq( req.getAccountId(), + DBCSRequestMessage dbreq( req.getAccountId(), req.getAccessLevel(), req.getToolId(), loginServerId, @@ -210,21 +210,21 @@ void CentralCSHandler::handle( const CSToolRequest & req, uint32 loginServerId ) CentralServer::getInstance().sendToDBProcess( dbreq, true ); } break; - - + + case HandlerEntry::TYPE_CENTRAL: { // handle it here. if( it->second->func != 0 ) { - GameServerCSRequestMessage gsreq( req.getAccountId(), + GameServerCSRequestMessage gsreq( req.getAccountId(), req.getCommandString(), req.getToolId(), req.getAccessLevel(), loginServerId, req.getUserName(), - req.getCommandName() ); + req.getCommandName() ); CentralCSHandlerFunc func = it->second->func; ( this->*func )( gsreq ); } @@ -242,7 +242,7 @@ void CentralCSHandler::handle( const CSToolRequest & req, uint32 loginServerId ) if(pos == std::string::npos) return; lastpos = req.getCommandString().find(" ", pos + 1); - + std::string idstring; if(lastpos == std::string::npos) idstring = req.getCommandString().substr(pos); @@ -254,49 +254,49 @@ void CentralCSHandler::handle( const CSToolRequest & req, uint32 loginServerId ) { return; } - - GameServerCSRequestMessage gsreq( req.getAccountId(), + + GameServerCSRequestMessage gsreq( req.getAccountId(), req.getCommandString(), req.getToolId(), req.getAccessLevel(), loginServerId, req.getUserName(), - req.getCommandName() ); - + req.getCommandName() ); + // queue up some messages to find the characters. GenericValueTypeMessage > const msg("CSFindAuthObject", std::make_pair(id, sequence)); CentralServer::getInstance().sendToAllGameServersExceptDBProcess( msg, true ); - + CentralCSHandler::CSCharacterFindInfo * p_info = new CSCharacterFindInfo( id, CentralServer::getInstance().getNumGameServers(), gsreq, ( type == HandlerEntry::TYPE_CONDITIONAL_CENTRAL ) ); - + m_findMap[ sequence ] = p_info; sequence++; } break; case HandlerEntry::TYPE_ARBITRARY_GAME_SERVER: { - GameServerCSRequestMessage gsreq( req.getAccountId(), + GameServerCSRequestMessage gsreq( req.getAccountId(), req.getCommandString(), req.getToolId(), req.getAccessLevel(), loginServerId, req.getUserName(), - req.getCommandName() ); - CentralServer::getInstance().sendToRandomGameServer( gsreq ); + req.getCommandName() ); + CentralServer::getInstance().sendToRandomGameServer( gsreq ); } break; case HandlerEntry::TYPE_GAME_SERVER: default: { // spam to game servers (except DB) - GameServerCSRequestMessage gsreq( req.getAccountId(), + GameServerCSRequestMessage gsreq( req.getAccountId(), req.getCommandString(), req.getToolId(), req.getAccessLevel(), loginServerId, req.getUserName(), - req.getCommandName() ); - CentralServer::getInstance().sendToAllGameServersExceptDBProcess( gsreq, true ); + req.getCommandName() ); + CentralServer::getInstance().sendToAllGameServersExceptDBProcess( gsreq, true ); } break; } @@ -323,16 +323,16 @@ CS_CMD( login_character ) unsigned pos = request.getCommandString().find(" "); std::string id; std::string account; - + if(pos == std::string::npos) return; unsigned pos2 = request.getCommandString().find(" ", pos + 1 ); id = request.getCommandString().substr(pos, pos2 - pos); account = request.getCommandString().substr(pos2 + 1); - + // TODO: Find a way to tell if the player is logged into a different // character on the same account. - + TransferCharacterData data(TransferRequestMoveValidation::TRS_transfer_server); data.setCharacterId(NetworkId(id)); data.setSourceStationId(atoi(account.c_str())); diff --git a/src/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/src/engine/server/application/CentralServer/src/shared/CentralServer.cpp index 9cc4068b8..ec59cdf1f 100644 --- a/src/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/src/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -3220,7 +3220,7 @@ void CentralServer::handleRequestGameServerForLoginMessage(const RequestGameServ LOG(loginTrace, ("deferring RequestGameServerForLoginMessage(%s)", msg.getCharacterId().getValueString().c_str())); DEBUG_REPORT_LOG(true, ("Starting planet server for login")); startPlanetServer(getHostForScene(msg.getScene()), msg.getScene(), 0); - m_messagesWaitingForPlanetServer.push_back(); + m_messagesWaitingForPlanetServer.push_back(Archive::ByteStream()); msg.pack(m_messagesWaitingForPlanetServer.back()); } else @@ -3243,7 +3243,7 @@ void CentralServer::handleRequestSceneTransfer(const RequestSceneTransfer &msg) { DEBUG_REPORT_LOG(true, ("Starting planet server for login")); startPlanetServer(getHostForScene(msg.getSceneName()), msg.getSceneName(), 0); - m_messagesWaitingForPlanetServer.push_back(); + m_messagesWaitingForPlanetServer.push_back(Archive::ByteStream()); msg.pack(m_messagesWaitingForPlanetServer.back()); } } diff --git a/src/engine/server/application/CentralServer/src/shared/CentralServer.h b/src/engine/server/application/CentralServer/src/shared/CentralServer.h index 04fa237f4..d628b2fa9 100644 --- a/src/engine/server/application/CentralServer/src/shared/CentralServer.h +++ b/src/engine/server/application/CentralServer/src/shared/CentralServer.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- #pragma warning(disable : 4100) -#include +#include #include #include #include @@ -61,10 +61,10 @@ public: private: typedef std::vector ConnectionServerConnectionList; typedef std::map CentralObjectMap; - typedef std::hash_multimap SceneGameMap; + typedef std::unordered_multimap SceneGameMap; typedef std::pair ServersList; - typedef std::hash_map ConnectionServerSUIDMap; + typedef std::unordered_map ConnectionServerSUIDMap; typedef std::map > PlayerSceneMapType; diff --git a/src/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp b/src/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp index fde027b3a..283273bd0 100644 --- a/src/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp +++ b/src/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp @@ -9,17 +9,18 @@ #include "FirstCentralServer.h" #include "CentralServerMetricsData.h" - #include "CentralServer.h" #include "UniverseManager.h" - #include "ConfigCentralServer.h" -#include "../../../../../../external/3rd/library/platform/MonAPI2/MonitorData.h" - +#ifndef WIN32 +#include "MonAPI2/MonitorData.h" +#endif #include "serverNetworkMessages/MetricsDataMessage.h" #include "serverUtility/ClusterWideDataManagerList.h" #include "sharedNetworkMessages/GameNetworkMessage.h" +#include + // ====================================================================== CentralServerMetricsData::CentralServerMetricsData() : diff --git a/src/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp b/src/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp index 9f38aa57f..5cbdb5c91 100644 --- a/src/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp +++ b/src/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp @@ -102,7 +102,7 @@ void CharacterCreationTracker::handleCreateNewCharacter(const ConnectionCreateCh } if (creationRecord == m_creations.end()) - creationRecord = m_creations.insert(std::make_pair(msg.getStationId(),new CreationRecord)).first; + creationRecord = m_creations.insert(std::pair(msg.getStationId(),new CreationRecord)).first; // - determine starting location static std::string tutorialPlanetName("tutorial"); diff --git a/src/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp b/src/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp index e7aa881d6..a13bd448f 100644 --- a/src/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp +++ b/src/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp @@ -76,7 +76,7 @@ void ConfigCentralServer::install(void) KEY_INT (connectionServicePort, 0); KEY_INT (customerServicePort, 61242); KEY_INT (gameServicePort, 44451); - KEY_STRING (loginServerAddress, "64.37.132.178"); + KEY_STRING (loginServerAddress, "127.0.0.1"); KEY_INT (loginServerPort, 44452); KEY_STRING (clusterName, "devcluster"); KEY_STRING (startPlanet, "tatooine"); @@ -97,7 +97,7 @@ void ConfigCentralServer::install(void) KEY_INT (loginServicePort, 44452); KEY_BOOL (developmentMode, true); KEY_BOOL (shouldSleep, true); - KEY_BOOL (startPublic, false); + KEY_BOOL (startPublic, true); KEY_INT (consoleServicePort, 61000); KEY_STRING (consoleServiceBindInterface, ""); KEY_INT (characterCreationTimeout,5*60); // seconds @@ -120,8 +120,8 @@ void ConfigCentralServer::install(void) KEY_INT (gameServerConnectionPendingAllocatedSizeLimit, 0); KEY_INT (systemTimeMismatchAlertIntervalSeconds, 1*60*60); // seconds KEY_INT (ctsDenyLoginThresholdSeconds, 2*60*60); // seconds - KEY_BOOL (auctionEnabled, false); - KEY_STRING (auctionServer, "sdt-plattestsys2.station.sony.com"); + KEY_BOOL (auctionEnabled, true); + KEY_STRING (auctionServer, "localhost"); KEY_INT (auctionPort, 5901 ); KEY_STRING (auctionIDPrefix, "SWG+"); KEY_BOOL (disconnectDuplicateConnectionsOnOtherGalaxies, false); diff --git a/src/engine/server/application/CentralServer/src/shared/Makefile.am b/src/engine/server/application/CentralServer/src/shared/Makefile.am index 87f027cf1..f7b6f8f89 100644 --- a/src/engine/server/application/CentralServer/src/shared/Makefile.am +++ b/src/engine/server/application/CentralServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libCentralServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(platform_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/application/ChatServer/src/linux/Makefile.am b/src/engine/server/application/ChatServer/src/linux/Makefile.am index 65cd5fd25..a419e4940 100644 --- a/src/engine/server/application/ChatServer/src/linux/Makefile.am +++ b/src/engine/server/application/ChatServer/src/linux/Makefile.am @@ -20,7 +20,7 @@ ChatServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(soePlatform_dir)/VChatAPI/utils2.0/utils \ -I$(soePlatform_dir)/VChatAPI/projects/VChat \ @@ -75,7 +75,7 @@ ChatServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/li $(soePlatform_dir)/ChatAPI2/ChatAPI/lib/release/libChatAPI.a \ $(soePlatform_dir)/VChatAPI/projects/VChat/lib/release/libVChatAPI.a \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a ChatServer_LDFLAGS=-lpthread -ldl -lm -lz -lncurses @@ -230,8 +230,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/ChatServer/src/shared/ChatInterface.cpp b/src/engine/server/application/ChatServer/src/shared/ChatInterface.cpp index 3c7cacd90..a25d2c542 100644 --- a/src/engine/server/application/ChatServer/src/shared/ChatInterface.cpp +++ b/src/engine/server/application/ChatServer/src/shared/ChatInterface.cpp @@ -89,7 +89,7 @@ namespace ChatInterfaceNamespace static int s_maxHeadersToSendToClientPerInterval; // to prevent sending duplicate room chat message - std::hash_map > s_mostRecentRoomChatMessage; + std::unordered_map > s_mostRecentRoomChatMessage; } using namespace ChatInterfaceNamespace; @@ -356,7 +356,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r } std::string lowerRoomName = toLower(roomName); unsigned sequence = (unsigned)user; - std::hash_map::iterator f = roomList.find(lowerRoomName); + std::unordered_map::iterator f = roomList.find(lowerRoomName); if (f != roomList.end() && room) { (*f).second.updateRoomData(room); @@ -443,7 +443,7 @@ const ChatServerRoomOwner * ChatInterface::getRoomByName(const std::string & roo std::string lowerRoomName = toLower(roomName); const ChatServerRoomOwner * result = 0; - std::hash_map::const_iterator f = roomList.find(lowerRoomName); + std::unordered_map::const_iterator f = roomList.find(lowerRoomName); if(f != roomList.end()) { result = &(*f).second; @@ -546,7 +546,7 @@ void ChatInterface::sendMessageToAllAvatars(const GameNetworkMessage & message) } //send to all pending avatars - std::hash_map::iterator p = pendingAvatars.begin(); + std::unordered_map::iterator p = pendingAvatars.begin(); while (p != pendingAvatars.end()) { ConnectionServerConnection * connection = @@ -570,7 +570,7 @@ std::string ChatInterface::getChatName(const NetworkId &id) { ChatServer::fileLog(false, "ChatInterface", "getChatName() id(%s)", id.getValueString().c_str()); - std::hash_map::iterator i; + std::unordered_map::iterator i; for (i = pendingAvatars.begin(); i != pendingAvatars.end(); ++i) { if (id == (*i).second) @@ -588,7 +588,7 @@ bool ChatInterface::sendMessageToPendingAvatar(const ChatAvatarId &id, const Gam { ChatServer::fileLog(false, "ChatInterface", "sendMessageToPendingAvatar() id(%s) message(%s)", id.getFullName().c_str(), message.getCmdName().c_str()); - std::hash_map::iterator f = pendingAvatars.find(id.name); + std::unordered_map::iterator f = pendingAvatars.find(id.name); if (f != pendingAvatars.end()) { ConnectionServerConnection * connection = @@ -609,7 +609,7 @@ bool ChatInterface::sendMessageToPendingAvatar(const ChatAvatarId &id, const Gam //----------------------------------------------------------------------- -const std::hash_map & ChatInterface::getRoomList() const +const std::unordered_map & ChatInterface::getRoomList() const { return roomList; } @@ -618,7 +618,7 @@ const std::hash_map & ChatInterface::getRoomLi void ChatInterface::updateRooms() { - std::hash_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = roomList.begin(); i != roomList.end(); ++i) { ChatServerRoomOwner & roomOwner = const_cast((*i).second); @@ -656,7 +656,7 @@ void ChatInterface::requestRoomList(const NetworkId & id, ConnectionServerConnec ++roomQueriesThisFrame; - std::hash_map::const_iterator i; + std::unordered_map::const_iterator i; std::vector rooms; const ChatAvatar * target = ChatServer::getAvatarByNetworkId(id); ChatAvatarId requestingAvatar; @@ -1010,7 +1010,7 @@ void ChatInterface::OnReceiveAddModeratorRoom(const ChatAvatar *srcAvatar, const makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -1123,7 +1123,7 @@ void ChatInterface::OnReceiveRemoveModeratorRoom(const ChatAvatar *srcAvatar, co makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -1473,7 +1473,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva ChatAvatarId failedAvatarId; makeAvatarId(ChatUnicodeString(info->name.data(), info->name.size()), ChatUnicodeString(info->address.data(), info->address.size()), failedAvatarId); - std::hash_map::iterator f = pendingAvatars.find(failedAvatarId.name); + std::unordered_map::iterator f = pendingAvatars.find(failedAvatarId.name); if (f != pendingAvatars.end()) { pendingAvatars.erase(f); @@ -1511,7 +1511,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva else { // look up a connection for this avatar - std::hash_map::iterator f = pendingAvatars.find(id.name); + std::unordered_map::iterator f = pendingAvatars.find(id.name); if(f != pendingAvatars.end()) { GenericValueTypeMessage const avatarConnectedMessage("ChatAvatarConnected", (*f).second); @@ -1536,7 +1536,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva ChatServer::chatConnectedAvatar((*f).second, *newAvatar); // flush chat messages pending for this avatar - std::hash_map, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second); + std::unordered_map, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second); if(df != deferredChatMessages.end()) { std::vector & v = (*df).second; @@ -1642,7 +1642,7 @@ void ChatInterface::OnGetRoomSummaries(unsigned track, unsigned result, unsigned makeRoomName(&(foundRooms[i]), roomName); std::string lowerRoomName = toLower(roomName); - std::hash_map::const_iterator f = roomList.find(lowerRoomName); + std::unordered_map::const_iterator f = roomList.find(lowerRoomName); if(f == roomList.end()) { RequestGetRoom(foundRooms[i].getRoomAddress(), NULL); @@ -1660,7 +1660,7 @@ void ChatInterface::OnGetRoomSummaries(unsigned track, unsigned result, unsigned const ChatServerRoomOwner *ChatInterface::getRoomOwner(const std::string & roomName) { std::string lowerName = toLower(roomName); - std::hash_map::const_iterator f = roomList.find(lowerName); + std::unordered_map::const_iterator f = roomList.find(lowerName); if(f != roomList.end()) { return &((*f).second); @@ -1672,7 +1672,7 @@ const ChatServerRoomOwner *ChatInterface::getRoomOwner(const std::string & roomN ChatServerRoomOwner *ChatInterface::getRoomOwner(unsigned roomId) { - std::hash_map::iterator f = roomList.begin(); + std::unordered_map::iterator f = roomList.begin(); while (f != roomList.end()) { if ((*f).second.getRoomData().id == roomId) @@ -1709,7 +1709,7 @@ void ChatInterface::OnReceiveDestroyRoom(const ChatAvatar *srcAvatar, const Chat std::string roomName; makeRoomName(destRoom, roomName); std::string lowerName = toLower(roomName); - std::hash_map::iterator f = roomList.find(lowerName); + std::unordered_map::iterator f = roomList.find(lowerName); if(f != roomList.end()) { roomList.erase(f); @@ -1753,7 +1753,7 @@ void ChatInterface::OnDestroyRoom(unsigned track, unsigned result, void *user) if (result == CHATRESULT_SUCCESS) { std::string lowerName = toLower(owner->getRoomData().path); - std::hash_map::iterator f = roomList.find(lowerName); + std::unordered_map::iterator f = roomList.find(lowerName); if(f != roomList.end()) { roomList.erase(f); @@ -1985,7 +1985,7 @@ void ChatInterface::OnReceiveEnterRoom(const ChatAvatar *srcAvatar, const ChatRo makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2182,7 +2182,7 @@ void ChatInterface::OnReceiveAddBanRoom(const ChatAvatar *srcAvatar, const ChatA makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2300,7 +2300,7 @@ void ChatInterface::OnReceiveRemoveBanRoom(const ChatAvatar *srcAvatar, const Ch makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2419,7 +2419,7 @@ void ChatInterface::OnReceiveAddInviteRoom(const ChatAvatar *srcAvatar, const Ch makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2518,7 +2518,7 @@ void ChatInterface::OnReceiveRemoveInviteRoom(const ChatAvatar *srcAvatar, const makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2599,7 +2599,7 @@ void ChatInterface::OnReceiveLeaveRoom(const ChatAvatar *srcAvatar, const ChatRo makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator const f = roomList.find(toLower(roomName)); + std::unordered_map::iterator const f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2719,7 +2719,7 @@ void ChatInterface::OnReceiveKickRoom(const ChatAvatar *srcAvatar, const ChatAva makeRoomName(destRoom, roomName); // Update info about the room - std::hash_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2940,7 +2940,7 @@ void ChatInterface::OnReceiveRoomMessage(const ChatAvatar *srcAvatar, const Chat { unsigned const destAvatarId = destAvatar->getAvatarID(); unsigned const destRoomId = destRoom->getRoomID(); - std::hash_map >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId); + std::unordered_map >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId); if (iterFind != s_mostRecentRoomChatMessage.end()) { if ((iterFind->second.first == destRoomId) && (iterFind->second.second == messageID)) diff --git a/src/engine/server/application/ChatServer/src/shared/ChatInterface.h b/src/engine/server/application/ChatServer/src/shared/ChatInterface.h index 79e97a5ed..a42a6ecf2 100644 --- a/src/engine/server/application/ChatServer/src/shared/ChatInterface.h +++ b/src/engine/server/application/ChatServer/src/shared/ChatInterface.h @@ -12,7 +12,7 @@ #include "ChatServerAvatarOwner.h" #include "ChatServerRoomOwner.h" #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ public: const NetworkId & getNetworkIdByAvatarId(const ChatAvatarId &id); ChatServerAvatarOwner *getAvatarOwner(const ChatAvatar *avatar); void disconnectPlayer (const ChatAvatarId & avatarId); - const std::hash_map & getRoomList () const; + const std::unordered_map & getRoomList () const; const ChatServerRoomOwner *getRoomOwner(const std::string &roomName); ChatServerRoomOwner *getRoomOwner(unsigned roomId); @@ -157,11 +157,11 @@ public: private: std::map avatarMap; - std::hash_map pendingAvatars; + std::unordered_map pendingAvatars; std::set pendingRoomQueries; int roomQueriesThisFrame; - std::hash_map roomList; - std::hash_map, NetworkId::Hash > deferredChatMessages; + std::unordered_map roomList; + std::unordered_map, NetworkId::Hash > deferredChatMessages; std::map > > queuedHeaders; std::map, int> > trackingRequestGetAnyAvatarForDestroy; }; diff --git a/src/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/src/engine/server/application/ChatServer/src/shared/ChatServer.cpp index 22a017e7f..d4752eda2 100644 --- a/src/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/src/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -71,7 +71,7 @@ namespace ChatServerNamespace ChatServerMetricsData * s_chatServerMetricsData = 0; typedef std::list > MessageList; - typedef std::hash_map PlayerMessageList; + typedef std::unordered_map PlayerMessageList; PlayerMessageList s_playerMessageList; void cleanChatLog(); @@ -430,7 +430,7 @@ void ChatServer::sendToClient(const NetworkId & id, const GameNetworkMessage & m { ChatServer::fileLog(false, "ChatServer", "sendToClient() id(%s) message(%s)", id.getValueString().c_str(), message.getCmdName().c_str()); - std::hash_map::const_iterator f = instance().clientMap.find(id); + std::unordered_map::const_iterator f = instance().clientMap.find(id); if(f != instance().clientMap.end()) { (*f).second->sendToClient(id, message); @@ -604,7 +604,7 @@ void ChatServer::removeServices() ChatAvatarId ChatServer::getAvatarIdForTrackId(unsigned trackId) { ChatServer & server = instance(); - std::hash_map::iterator f = server.pendingRequests.find(trackId); + std::unordered_map::iterator f = server.pendingRequests.find(trackId); if(f != server.pendingRequests.end()) { const ChatAvatar *avatar = getAvatarByNetworkId((*f).second); @@ -681,11 +681,11 @@ NetworkId ChatServer::sendResponseForTrackId(unsigned trackId, const GameNetwork { NetworkId id; ChatServer & server = instance(); - std::hash_map::iterator f = server.pendingRequests.find(trackId); + std::unordered_map::iterator f = server.pendingRequests.find(trackId); if(f != server.pendingRequests.end()) { id = (*f).second; - std::hash_map::const_iterator c = server.clientMap.find((*f).second); + std::unordered_map::const_iterator c = server.clientMap.find((*f).second); if(c != server.clientMap.end()) { ConnectionServerConnection * conn = (*c).second; @@ -701,7 +701,7 @@ NetworkId ChatServer::sendResponseForTrackId(unsigned trackId, const GameNetwork GameServerConnection *ChatServer::getGameServerConnection(unsigned int sequence) { GameServerConnection * result = 0; - std::hash_map::iterator f = instance().gameServerConnectionMap.find(sequence); + std::unordered_map::iterator f = instance().gameServerConnectionMap.find(sequence); if(f != instance().gameServerConnectionMap.end()) { result = (*f).second; @@ -724,7 +724,7 @@ void ChatServer::addGameServerConnection(unsigned int sequence, GameServerConnec void ChatServer::clearGameServerConnection(const GameServerConnection *connection) { std::vector removeKeyList; - std::hash_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = instance().gameServerConnectionMap.begin(); i != instance().gameServerConnectionMap.end(); ++i) { if ((*i).second == connection) @@ -746,7 +746,7 @@ void ChatServer::clearGameServerConnection(const GameServerConnection *connectio ConnectionServerConnection * ChatServer::getConnectionForCharacter(const NetworkId & characterId) { ConnectionServerConnection * result = 0; - std::hash_map::iterator f = instance().clientMap.find(characterId); + std::unordered_map::iterator f = instance().clientMap.find(characterId); if(f != instance().clientMap.end()) { result = (*f).second; @@ -1039,7 +1039,7 @@ void ChatServer::connectPlayer(ConnectionServerConnection * connection, const un { ChatServer::fileLog(false, "ChatServer", "connectPlayer() address(%s) suid(%u) characterName(%s) networkId(%s)", getConnectionAddress(connection).c_str(), suid, characterName.c_str(), networkId.getValueString().c_str()); - std::hash_map::iterator cf = instance().clientMap.find(networkId); + std::unordered_map::iterator cf = instance().clientMap.find(networkId); if (cf != instance().clientMap.end()) { DEBUG_WARNING(true, ("We received a chat login attempt for a player (%s) that we think is already logged in. We're going to try to log out the old avatar then log in the new one.", characterName.c_str())); @@ -1260,7 +1260,7 @@ void ChatServer::destroyRoom(const NetworkId & id, const unsigned int sequence, ChatAvatarId destroyer(avatar->GetGameCode(), avatar->GetGameServerName(), avatar->GetCharacterName()); // can this avatar destroy the room? - std::hash_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = instance().chatInterface->getRoomList().begin(); i != instance().chatInterface->getRoomList().end(); ++i) { if((*i).second.getRoomData().id == roomId) @@ -1373,7 +1373,7 @@ void ChatServer::disconnectPlayer(const NetworkId & id) instance().chatAvatars.erase(f); } - std::hash_map::iterator cf = instance().clientMap.find(id); + std::unordered_map::iterator cf = instance().clientMap.find(id); if(cf != instance().clientMap.end()) { instance().clientMap.erase(cf); @@ -2268,7 +2268,7 @@ void ChatServer::sendRoomMessage(const ChatAvatarId &id, const std::string & roo } // get room id std::string lowerName = toLower(roomName); - std::hash_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); + std::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); if(f != instance().chatInterface->getRoomList().end()) { const ChatAvatar *sender = instance().ownerSystem; @@ -2386,7 +2386,7 @@ void ChatServer::sendStandardRoomMessage(const ChatAvatarId &senderId, const std return; } - std::hash_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); + std::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); if(f != instance().chatInterface->getRoomList().end()) { const ChatAvatar *sender; @@ -2457,13 +2457,13 @@ void ChatServer::removeConnectionServerConnection(ConnectionServerConnection * t { ChatServer::fileLog(false, "ChatServer", "removeConnectionServerConnection() target(%s)", getConnectionAddress(target).c_str()); - std::hash_map tmpList = instance().clientMap; - std::hash_map::const_iterator i; + std::unordered_map tmpList = instance().clientMap; + std::unordered_map::const_iterator i; for(i = tmpList.begin(); i != tmpList.end(); ++i) { if((*i).second == target) disconnectPlayer((*i).first); - std::hash_map::iterator f = instance().clientMap.find((*i).first); + std::unordered_map::iterator f = instance().clientMap.find((*i).first); if (f != instance().clientMap.end()) { instance().clientMap.erase(f); @@ -2913,7 +2913,7 @@ void ChatServer::sendToGameServerById(unsigned const connectionId, GameNetworkMe GameServerConnection *ChatServer::getGameServerConnectionFromId(unsigned int sequence) { GameServerConnection * result = NULL; - std::hash_map::iterator f = m_gameServerConnectionRegistry.find(sequence); + std::unordered_map::iterator f = m_gameServerConnectionRegistry.find(sequence); if(f != m_gameServerConnectionRegistry.end()) { result = (*f).second; diff --git a/src/engine/server/application/ChatServer/src/shared/ChatServer.h b/src/engine/server/application/ChatServer/src/shared/ChatServer.h index dc79ab20b..0baf61912 100644 --- a/src/engine/server/application/ChatServer/src/shared/ChatServer.h +++ b/src/engine/server/application/ChatServer/src/shared/ChatServer.h @@ -11,7 +11,7 @@ #include "ChatAPI/ChatAPI.h" #include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ChatAvatarId.h" -#include +#include #include #include #include @@ -111,7 +111,7 @@ public: //----------------------------------------------------------------------- - std::hash_map pendingRequests; + std::unordered_map pendingRequests; static ChatServer & instance (); static bool isValidChatAvatarName(Unicode::String const &chatName); @@ -225,7 +225,7 @@ private: time_t chatSpamNextTimeToNotifyPlayerWhenLimited; time_t unsquelchTime; }; - typedef std::hash_map ChatAvatarList; + typedef std::unordered_map ChatAvatarList; struct VoiceChatAvatarData @@ -234,7 +234,7 @@ private: std::string playerName; }; - typedef std::hash_map VoiceChatAvatarList; + typedef std::unordered_map VoiceChatAvatarList; static AvatarExtendedData * getAvatarExtendedDataByNetworkId(const NetworkId & id); @@ -243,8 +243,8 @@ private: ChatAvatarList chatAvatars; ChatInterface * chatInterface; VChatInterface * voiceChatInterface; - std::hash_map clientMap; - std::hash_map gameServerConnectionMap; + std::unordered_map clientMap; + std::unordered_map gameServerConnectionMap; std::set connectionServerConnections; bool done; @@ -255,7 +255,7 @@ private: static ChatServer * m_instance; CustomerServiceServerConnection *customerServiceServerConnection; - typedef std::hash_map GameServerMap; + typedef std::unordered_map GameServerMap; GameServerMap m_gameServerConnectionRegistry; VoiceChatAvatarList m_voiceChatIdMap; std::map m_voiceChatNameToIdMap; diff --git a/src/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp b/src/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp index b0cf04b36..1dda67f17 100644 --- a/src/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp +++ b/src/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp @@ -73,13 +73,13 @@ void ConfigChatServer::install(void) data = new ConfigChatServer::Data; - KEY_STRING (backupGatewayServerIP, "swo-dev8.station.sony.com"); + KEY_STRING (backupGatewayServerIP, "localhost"); KEY_INT (backupGatewayServerPort, 15150); KEY_STRING (clusterName, "devcluster"); - KEY_STRING (centralServerAddress, "swo-dev8.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 61232); KEY_STRING (gameCode, "SWG"); - KEY_STRING (gatewayServerIP, "sdplatdev1.station.sony.com"); + KEY_STRING (gatewayServerIP, "localhost"); KEY_INT (gatewayServerPort, 5001); KEY_INT (roomInactivityTimeout, 60 * 60 * 24 * 3); KEY_INT (roomUnpopulatedTimeout, 60 * 5); @@ -88,7 +88,7 @@ void ConfigChatServer::install(void) KEY_INT (loginFlowControlRate, 50); KEY_INT (maxRoomQueriesPerFrame, 5); KEY_BOOL (loggingEnabled, false); - KEY_STRING (registrarHost, "sdplatdev1.station.sony.com"); + KEY_STRING (registrarHost, "localhost"); KEY_INT (registrarPort, 5000); KEY_INT (intervalToSendHeadersToClientSeconds, 1); KEY_INT (maxHeadersToSendToClientPerInterval, 100); @@ -124,7 +124,7 @@ void ConfigChatServer::install(void) if(ms_voiceGateways.empty()) { - static char const * const defaultGateway = "sdt-plattestsys1:9102"; + static char const * const defaultGateway = "localhost:9102"; ms_voiceGateways.push_back(defaultGateway); } } diff --git a/src/engine/server/application/ChatServer/src/shared/FirstChatServer.h b/src/engine/server/application/ChatServer/src/shared/FirstChatServer.h index 9f3234027..697a186c5 100644 --- a/src/engine/server/application/ChatServer/src/shared/FirstChatServer.h +++ b/src/engine/server/application/ChatServer/src/shared/FirstChatServer.h @@ -27,7 +27,7 @@ namespace Archive #include "sharedFoundation/NetworkId.h" #include "sharedNetwork/Connection.h" #include "ChatAPI/ChatAPI.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/src/engine/server/application/ChatServer/src/shared/Makefile.am b/src/engine/server/application/ChatServer/src/shared/Makefile.am index 4289b2cae..f510aa055 100644 --- a/src/engine/server/application/ChatServer/src/shared/Makefile.am +++ b/src/engine/server/application/ChatServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libChatServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(soePlatform_dir)/VChatAPI/utils2.0/utils \ -I$(soePlatform_dir)/VChatAPI/projects/VChat \ diff --git a/src/engine/server/application/ChatServer/src/shared/VChatInterface.cpp b/src/engine/server/application/ChatServer/src/shared/VChatInterface.cpp index 4ca564658..f0b96b3f1 100644 --- a/src/engine/server/application/ChatServer/src/shared/VChatInterface.cpp +++ b/src/engine/server/application/ChatServer/src/shared/VChatInterface.cpp @@ -30,7 +30,7 @@ struct GetChannelInfoStruct std::string password; bool isPublic; bool persistant; - std::list moderators; + std::list moderators; }; struct DeleteChannelInfo @@ -43,7 +43,7 @@ struct ChannelCommandInfo { ReturnAddress requester; std::string srcUserName; - std::string destUserName; + std::string destUserName; std::string destChannelAddress; uint32 command; uint32 banTimeout; @@ -91,7 +91,7 @@ std::string systemNameHelper() } std::string const & VChatInterface::getSystemLoginName() -{ +{ static std::string const adminName (systemNameHelper()); return adminName; } @@ -272,8 +272,8 @@ void VChatInterface::sendChannelData(ReturnAddress const & toWhom, std::string c } -unsigned VChatInterface::requestGetChannel(const std::string &channelName, - const std::string &description, +unsigned VChatInterface::requestGetChannel(const std::string &channelName, + const std::string &description, const std::string &password, unsigned limit, bool isPublic, @@ -310,8 +310,8 @@ unsigned VChatInterface::requestGetChannel(const std::string &channelName, return internalGetChannel(channelName, description, password, limit, isPublic, persistent, moderators, requester); } -unsigned VChatInterface::internalGetChannel(const std::string &channelName, - const std::string &description, +unsigned VChatInterface::internalGetChannel(const std::string &channelName, + const std::string &description, const std::string &password, unsigned limit, bool isPublic, @@ -360,16 +360,16 @@ unsigned VChatInterface::requestDeleteChannel(std::string const &channelName, Re unsigned track = VChatAPI::DeleteChannel(shortName, game, server, info); - ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "requestDeleteChannel track(%d) requester(%s) name(%s)", + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "requestDeleteChannel track(%d) requester(%s) name(%s)", track, requester.debugString().c_str(), channelName.c_str()); - + return track; } unsigned VChatInterface::requestChannelCommand(ReturnAddress const & requester, - const std::string &srcUserName, - const std::string &destUserName, - const std::string &destChannelAddress, + const std::string &srcUserName, + const std::string &destUserName, + const std::string &destChannelAddress, unsigned command, unsigned banTimeout) { @@ -387,7 +387,7 @@ unsigned VChatInterface::requestChannelCommand(ReturnAddress const & requester, checkForCharacterChannelRemove(destUserName, destChannelAddress); uint32 track = VChatAPI::ChannelCommand(srcUserName, destUserName, destChannelAddress, command, banTimeout, info); - + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "requestChannelCommand: track(%u) returnAddress(%s) src(%s) dest(%s) chan(%s) cmd(%u) banTimeout(%u)", track, requester.debugString().c_str(), srcUserName.c_str(), destUserName.c_str(), destChannelAddress.c_str(), command, banTimeout); @@ -403,7 +403,7 @@ unsigned VChatInterface::requestConnectPlayer(unsigned suid, std::string const & info->failedAttempts = previousAttempts; uint32 track = VChatAPI::GetAccount(characterName, ConfigChatServer::getGameCode(), ConfigChatServer::getClusterName(), suid, 0,(void*)info); - ChatServer::fileLog(ms_voiceLoggingEnabled,ms_logLable, "requestConnectPlayer: track(%d) suid(%u) name(%s) netId(%s) failedAttempts(%u)", + ChatServer::fileLog(ms_voiceLoggingEnabled,ms_logLable, "requestConnectPlayer: track(%d) suid(%u) name(%s) netId(%s) failedAttempts(%u)", track, suid, characterName.c_str(), netId.getValueString().c_str(), previousAttempts); return track; } @@ -414,15 +414,15 @@ unsigned VChatInterface::requestChannelInfo(std::string const & channelName, Ret info->requester = requester; info->channelName = channelName; info->isGlobalBroadcast = isGlobalBroadcast; - info->textMessage = broadcastMessage; - + info->textMessage = broadcastMessage; + //split the name since we can't request any random channel... std::string shortName, server, game; VChatSystem::GetChannelComponents(info->channelName, shortName, server, game); uint32 track = VChatAPI::GetChannelInfo(shortName, game, server, (void*)info); - - ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "requestChannelInfo: track(%d) channel(%s) requester(%s)", + + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "requestChannelInfo: track(%d) channel(%s) requester(%s)", track, info->channelName.c_str(), info->requester.debugString().c_str()); return track; @@ -443,7 +443,7 @@ void VChatInterface::OnConnectionFailed( const char * address ) { m_connected = false; ++m_connectionFailedCount; - ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnConnectionFailed: %s failedCount(%d)", + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnConnectionFailed: %s failedCount(%d)", address, m_connectionFailedCount); } @@ -462,7 +462,7 @@ void VChatInterface::OnGetAccount(unsigned track, unsigned result, unsigned user const std::string &voicePassword, const std::string &encodedVoiceAccount, const std::string &URI, void *user) { - ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnGetAccount() track(%u) result(%u) userID(%u) accountID(%u) password(%s) encoded(%s) uri(%s)", + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnGetAccount() track(%u) result(%u) userID(%u) accountID(%u) password(%s) encoded(%s) uri(%s)", track, result, userID, accountID, voicePassword.c_str(), encodedVoiceAccount.c_str(), URI.c_str()); GetAccountInfo *info = (GetAccountInfo *)user; @@ -478,7 +478,7 @@ void VChatInterface::OnGetAccount(unsigned track, unsigned result, unsigned user requestConnectPlayer(info->suid,info->avatarName,info->id, info->failedAttempts+1); delete info; info = NULL; - return; + return; } } @@ -504,8 +504,8 @@ void VChatInterface::OnGetAccount(unsigned track, unsigned result, unsigned user info = NULL; } -void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, - const std::string &channelName, const std::string &channelURI, +void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, + const std::string &channelName, const std::string &channelURI, unsigned channelID, unsigned isNewChannel, void *user) { ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnGetChannel: track(%u) result(%u) chanName(%s) chanURI(%s) chanID(%d)", @@ -523,13 +523,13 @@ void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, // If a channel is persisted, we want to add it to our character channel list. Currently the only persisted channel in SWG is guilds. if(info->persistant) - { + { // Do we already have this channel on record? VoiceChannelIdMap::iterator iter = m_voiceChatChannelNameToNetworkIdMap.find(toLower(channelName)); if(iter == m_voiceChatChannelNameToNetworkIdMap.end()) { // Create a new record for this channel. - m_voiceChatChannelNameToNetworkIdMap.insert(std::make_pair(toLower(channelName), std::vector())); + m_voiceChatChannelNameToNetworkIdMap.insert(std::make_pair(toLower(channelName), std::vector())); } } @@ -552,7 +552,7 @@ void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, data.m_channelID = channelID; setChannelData(data); } - + VoiceChatOnGetChannel response(channelName, channelURI, info->password, info->isPublic, info->persistant, success); ChatServer::instance().sendResponse(info->requester, response); @@ -587,7 +587,7 @@ void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, if(thelist.empty()) { m_pendingGetChannelRequests.erase(itr); - } + } } else WARNING(true, ("OnGetChannelV2: Received a response for a channel that isn't in our pending request map! BAD!")); @@ -601,7 +601,7 @@ void VChatInterface::OnChannelCommand(unsigned track, unsigned result, void *use ChannelCommandInfo * info = (ChannelCommandInfo*)user; if(info) { - VoiceChatOnChannelCommand response(info->srcUserName,info->destUserName,info->destChannelAddress,info->command,info->banTimeout,result); + VoiceChatOnChannelCommand response(info->srcUserName,info->destUserName,info->destChannelAddress,info->command,info->banTimeout,result); ChatServer::instance().sendResponse(info->requester, response); delete info; @@ -625,7 +625,7 @@ void VChatInterface::OnGetAllChannels(unsigned track, unsigned result, const VCh { VChatSystem::Channel const & data = *i; setChannelData(data); - ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "name(%s) uri(%s) pass(%s) id(%d) type(%d)", + ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "name(%s) uri(%s) pass(%s) id(%d) type(%d)", data.m_channelName.c_str(), data.m_channelURI.c_str(), data.m_channelPassword.c_str(), data.m_channelID, data.m_channelType); } } @@ -660,7 +660,7 @@ void VChatInterface::OnDeleteChannel(unsigned track, unsigned result, void *user } } -void VChatInterface::OnGetChannelInfo(unsigned track, unsigned result, const std::string & channelName, +void VChatInterface::OnGetChannelInfo(unsigned track, unsigned result, const std::string & channelName, const std::string & channelURI, unsigned channelID, void * user) { ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnGetChannelInfo: track(%u) result(%u) chanName(%s) chanURI(%s) chanID(%d)", @@ -670,7 +670,7 @@ void VChatInterface::OnGetChannelInfo(unsigned track, unsigned result, const std if(info) { bool const channelExists = result == VChatSystem::RESULT_SUCCESS; //? - + uint32 flags = channelExists ? VoiceChatChannelInfo::CIF_None : VoiceChatChannelInfo::CIF_ChannelDoesNotExist; VoiceChatChannelInfo msg (channelName, channelName, channelURI, "", info->textMessage, flags); @@ -785,7 +785,7 @@ void VChatInterface::checkForCharacterChannelAdd(std::string const & name, std:: // No persistant channels right now. Skip the add check. if(m_voiceChatChannelNameToNetworkIdMap.empty()) return; - + // Can we get a valid player OID? NetworkId playerOID = NetworkId::cms_invalid; if(ChatServer::getVoiceChatLoginInfoFromLoginName(name, playerOID) && playerOID != NetworkId::cms_invalid) @@ -822,16 +822,16 @@ void VChatInterface::checkForCharacterChannelAdd(std::string const & name, std:: if(insert) // Nope, add it and send off the create character channel message. { - AddCharacterChannel(avatar->getUserID(), - avatar->getAvatarID(), - std::string(avatar->getName().c_str()), - parseWorldName(std::string(avatar->getServer().c_str())), - "SWG", - "guild", - data.m_channelName, //"A Guild chat channel." - data.m_channelPassword, - data.m_channelURI, - "en_US", + AddCharacterChannel(avatar->getUserID(), + avatar->getAvatarID(), + std::string(avatar->getName().c_str()), + parseWorldName(std::string(avatar->getServer().c_str())), + "SWG", + "guild", + data.m_channelName, //"A Guild chat channel." + data.m_channelPassword, + data.m_channelURI, + "en_US", NULL); (*iter).second.push_back(playerOID); @@ -871,12 +871,12 @@ void VChatInterface::checkForCharacterChannelRemove(std::string const & name, st const ChatAvatar * avatar = ChatServer::getAvatarByNetworkId(playerOID); if(avatar) { - RemoveCharacterChannel(avatar->getUserID(), - avatar->getAvatarID(), - std::string(avatar->getName().c_str()), - parseWorldName(std::string(avatar->getServer().c_str())), - "SWG", - "guild", + RemoveCharacterChannel(avatar->getUserID(), + avatar->getAvatarID(), + std::string(avatar->getName().c_str()), + parseWorldName(std::string(avatar->getServer().c_str())), + "SWG", + "guild", NULL); } @@ -912,4 +912,4 @@ std::string VChatInterface::parseWorldName(std::string const & input) output = input; return output; -} \ No newline at end of file +} diff --git a/src/engine/server/application/ChatServer/src/shared/VChatInterface.h b/src/engine/server/application/ChatServer/src/shared/VChatInterface.h index 2e3987a3e..4cb68b9e4 100644 --- a/src/engine/server/application/ChatServer/src/shared/VChatInterface.h +++ b/src/engine/server/application/ChatServer/src/shared/VChatInterface.h @@ -30,7 +30,7 @@ struct ReturnAddress ReturnAddress() : type(RAT_invalid), clientId(), gameServerId(0) {} ReturnAddress(NetworkId const & id):type(RAT_client), clientId(id), gameServerId(0) {} ReturnAddress(unsigned const id) : type(RAT_gameserver), clientId(), gameServerId(id) {} - inline std::string ReturnAddress::debugString() const + inline std::string debugString() const { switch(type) { diff --git a/src/engine/server/application/CommoditiesServer/src/linux/Makefile.am b/src/engine/server/application/CommoditiesServer/src/linux/Makefile.am index a26493066..4e67f7cb5 100644 --- a/src/engine/server/application/CommoditiesServer/src/linux/Makefile.am +++ b/src/engine/server/application/CommoditiesServer/src/linux/Makefile.am @@ -24,7 +24,7 @@ CommoditiesServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(fileInterface_dir)/include/public \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy @@ -89,7 +89,7 @@ CommoditiesServer_LDADD = $(top_builddir)/../engine/shared/library/sharedMemoryM $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(ORACLE_HOME)/lib/libclntsh.so \ $(top_builddir)/../external/ours/library/unicode/libunicode.la \ @@ -208,8 +208,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp b/src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp index c20793752..40885472c 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp +++ b/src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp @@ -27,9 +27,7 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" -#ifndef max -using std::max; -#endif +#include // src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp (s_maxBid) // src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp (MAX_BID) @@ -680,13 +678,13 @@ const AuctionBid *Auction::GetPreviousBid() const int Auction::GetActualBid(AuctionBid *bid) { assert(bid != NULL); - int bidNeeded = max(m_minBid, bid->GetBid()); + int bidNeeded = std::max(m_minBid, bid->GetBid()); if (m_highBid != NULL) { bidNeeded = m_highBid->GetBid(); if (*bid > *m_highBid) { - bidNeeded = max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1); + bidNeeded = std::max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1); } else if (*bid == *m_highBid) { @@ -694,7 +692,7 @@ int Auction::GetActualBid(AuctionBid *bid) } else if (*bid < *m_highBid) { - bidNeeded = max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1); + bidNeeded = std::max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1); } } return bidNeeded; @@ -737,7 +735,7 @@ AuctionResultCode Auction::AddBid( ) { AuctionResultCode success = ARC_Success; - int maxBid = max(bid, maxProxyBid); + int maxBid = std::max(bid, maxProxyBid); if (!m_active || m_sold) { diff --git a/src/engine/server/application/CommoditiesServer/src/shared/Auction.h b/src/engine/server/application/CommoditiesServer/src/shared/Auction.h index 8f8e6089b..c72c0e453 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/Auction.h +++ b/src/engine/server/application/CommoditiesServer/src/shared/Auction.h @@ -63,7 +63,7 @@ protected: int GetActualBid(AuctionBid *bid); public: - Auction::Auction( + Auction( const NetworkId & creatorId, int minBid, int auctionTimer, @@ -84,7 +84,7 @@ public: std::vector > const & attributes ); - Auction::Auction( + Auction( const NetworkId & creatorId, int minBid, int auctionTimer, diff --git a/src/engine/server/application/CommoditiesServer/src/shared/AuctionBid.cpp b/src/engine/server/application/CommoditiesServer/src/shared/AuctionBid.cpp index a91526b45..b62a343c1 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/AuctionBid.cpp +++ b/src/engine/server/application/CommoditiesServer/src/shared/AuctionBid.cpp @@ -14,8 +14,10 @@ #include "FirstCommodityServer.h" #include "AuctionBid.h" + #include + // ====================================================================== AuctionBid::AuctionBid( @@ -39,35 +41,35 @@ AuctionBid::~AuctionBid() const bool AuctionBid::operator > (const AuctionBid & rhs) const { - return (max(m_bid, m_maxProxyBid) > max(rhs.m_bid, rhs.m_maxProxyBid)); + return (std::max(m_bid, m_maxProxyBid) > std::max(rhs.m_bid, rhs.m_maxProxyBid)); } // ---------------------------------------------------------------------- const bool AuctionBid::operator >= (const AuctionBid & rhs) const { - return (max(m_bid, m_maxProxyBid) >= max(rhs.m_bid, rhs.m_maxProxyBid)); + return (std::max(m_bid, m_maxProxyBid) >= std::max(rhs.m_bid, rhs.m_maxProxyBid)); } // ---------------------------------------------------------------------- const bool AuctionBid::operator == (const AuctionBid & rhs) const { - return (max(m_bid, m_maxProxyBid) == max(rhs.m_bid, rhs.m_maxProxyBid)); + return (std::max(m_bid, m_maxProxyBid) == std::max(rhs.m_bid, rhs.m_maxProxyBid)); } // ---------------------------------------------------------------------- const bool AuctionBid::operator < (const AuctionBid & rhs) const { - return (max(m_bid, m_maxProxyBid) < max(rhs.m_bid, rhs.m_maxProxyBid)); + return (std::max(m_bid, m_maxProxyBid) < std::max(rhs.m_bid, rhs.m_maxProxyBid)); } // ---------------------------------------------------------------------- const bool AuctionBid::operator <= (const AuctionBid & rhs) const { - return (max(m_bid, m_maxProxyBid) <= max(rhs.m_bid, rhs.m_maxProxyBid)); + return (std::max(m_bid, m_maxProxyBid) <= std::max(rhs.m_bid, rhs.m_maxProxyBid)); } // ====================================================================== diff --git a/src/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp b/src/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp index f55494842..11208577d 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp +++ b/src/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp @@ -4326,8 +4326,7 @@ void AuctionMarket::OnVendorStatusChange ( void static decodeOOB(const std::string & UTF8String, Unicode::String & UniString) { - - std::string::iterator c = const_cast (UTF8String.begin()); + std::string::const_iterator c = UTF8String.begin(); std::string tempstring; unsigned short unicharvalue; char * pEnd; diff --git a/src/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp b/src/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp index 4585adfed..1e2671bec 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp +++ b/src/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp @@ -29,6 +29,7 @@ #include "sharedNetworkMessages/GenericValueTypeMessage.h" #include "sharedLog/Log.h" #include "sharedLog/SetupSharedLog.h" +#include //----------------------------------------------------------------------- diff --git a/src/engine/server/application/CommoditiesServer/src/shared/Makefile.am b/src/engine/server/application/CommoditiesServer/src/shared/Makefile.am index ddb9fc321..1c57978da 100644 --- a/src/engine/server/application/CommoditiesServer/src/shared/Makefile.am +++ b/src/engine/server/application/CommoditiesServer/src/shared/Makefile.am @@ -26,7 +26,7 @@ libCommoditiesServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedDebug/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(singleton_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/application/ConnectionServer/src/linux/Makefile.am b/src/engine/server/application/ConnectionServer/src/linux/Makefile.am index 30a7d18c0..84c320bde 100644 --- a/src/engine/server/application/ConnectionServer/src/linux/Makefile.am +++ b/src/engine/server/application/ConnectionServer/src/linux/Makefile.am @@ -23,7 +23,7 @@ ConnectionServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(soePlatform_dir)/ChatAPI2/ChatAPI/utils/ \ -I$(soePlatform_dir)/ChatAPI2/ChatAPI/projects/Chat \ @@ -75,7 +75,7 @@ ConnectionServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryMana $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(platform_dir)/lib/release/libBase.a \ $(platform_dir)/lib/release/libCommonAPI.a \ @@ -210,8 +210,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(platform_dir)/lib/release/libBase.a: make -C $(platform_dir)/utils/Base/$(platform) diff --git a/src/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/src/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 892937fb7..3ed0d56b1 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/src/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -50,6 +50,8 @@ #include "Session/LoginAPI/Client.h" #include "UdpLibrary.h" +#include + //----------------------------------------------------------------------- namespace ClientConnectionNamespace diff --git a/src/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp b/src/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp index 2fe48afb9..f98eee214 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp +++ b/src/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp @@ -56,7 +56,7 @@ void ConfigConnectionServer::install(void) data = new ConfigConnectionServer::Data; - KEY_STRING (centralServerAddress, "swo-dev5.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 0); KEY_STRING (clientServiceBindInterface, ""); KEY_INT (clientServicePortPrivate, 44464); diff --git a/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp index 921a09181..7bb6b1744 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp +++ b/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp @@ -7,7 +7,7 @@ #include "FirstConnectionServer.h" #include "ConnectionServer.h" -#include "CommonAPI\CommonAPI.h" + #include "Archive/ByteStream.h" #include "CentralConnection.h" #include "ChatServerConnection.h" @@ -193,7 +193,7 @@ void ConnectionServer::addGameConnection(unsigned long gameServerId, GameConnect bool ConnectionServer::decryptToken(const KeyShare::Token & token, uint32 & stationUserId, bool & secure, std::string & accountName) { static ConnectionServer & cs = instance(); - //const unsigned MAX_ACCOUNT_NAME_LENGTH = 15; + //Also the sizeof(int) is likewise magic from the session api uint32 len = sizeof(uint32) + sizeof(bool) + MAX_ACCOUNT_NAME_LENGTH + 1; unsigned char * keyBuffer = new unsigned char[len]; @@ -1579,6 +1579,7 @@ void ConnectionServer::setDone(char const *reasonfmt, ...) reason)); done = true; + va_end(ap); } } diff --git a/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h b/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h index 06bf126f3..36abc449f 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h +++ b/src/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h @@ -6,11 +6,10 @@ //----------------------------------------------------------------------- -#include +#include #include #include - #include "CentralConnection.h" #include "Client.h" #include "GameConnection.h" @@ -19,7 +18,7 @@ #include "serverKeyShare/KeyShare.h" #include "sharedFoundation/StationId.h" #include "sharedMessageDispatch/Receiver.h" -#include "CommonAPI\CommonAPI.h" + class ClientConnection; class CharacterListMessageData; class ChatServerConnection; @@ -41,9 +40,9 @@ class ConnectionServer : public MessageDispatch::Receiver ~ConnectionServer (); - typedef std::hash_map GameServerMap; - typedef std::hash_map ClientMap; - typedef std::hash_map SuidMap; + typedef std::unordered_map GameServerMap; + typedef std::unordered_map ClientMap; + typedef std::unordered_map SuidMap; typedef std::set FreeTrialsSet; static void addNewClient(ClientConnection* cconn, const NetworkId &oid, GameConnection* gconn, const std::string &sceneName, bool sendToStarport ); diff --git a/src/engine/server/application/ConnectionServer/src/shared/Makefile.am b/src/engine/server/application/ConnectionServer/src/shared/Makefile.am index 42e3e9251..7d2892a6f 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/Makefile.am +++ b/src/engine/server/application/ConnectionServer/src/shared/Makefile.am @@ -24,7 +24,7 @@ libConnectionServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(soePlatform_dir)/ChatAPI2/ChatAPI/utils/ \ -I$(soePlatform_dir)/ChatAPI2/ChatAPI/projects/Chat \ diff --git a/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp b/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp index fabe71dbc..dba551e99 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp +++ b/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp @@ -3,9 +3,8 @@ #include "FirstConnectionServer.h" - #include "SessionApiClient.h" -#include "Client.h" + #include "ClientConnection.h" #include "ConfigConnectionServer.h" @@ -20,6 +19,7 @@ #include "sharedGame/PlatformFeatureBits.h" #include "sharedLog/Log.h" +#include #include #include diff --git a/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.h b/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.h index 93800552f..d6edb9222 100644 --- a/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.h +++ b/src/engine/server/application/ConnectionServer/src/shared/SessionApiClient.h @@ -9,7 +9,7 @@ #pragma warning(disable: 4100) // Client.h has inlined functions with unreferenced formal parameters #include "Session/LoginAPI/Client.h" #pragma warning(pop) -#include "ConnectionServer.h" + #include "sharedFoundation/Clock.h" #include "sharedFoundation/Timer.h" diff --git a/src/engine/server/application/CustomerServiceServer/src/linux/Makefile.am b/src/engine/server/application/CustomerServiceServer/src/linux/Makefile.am index 530871638..046fde63e 100644 --- a/src/engine/server/application/CustomerServiceServer/src/linux/Makefile.am +++ b/src/engine/server/application/CustomerServiceServer/src/linux/Makefile.am @@ -22,7 +22,7 @@ CustomerServiceServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(soePlatform_dir)/CSAssist/projects/CSAssist/CSAssistgameapi \ -I$(soePlatform_dir)/CSAssist/utils \ @@ -70,7 +70,7 @@ CustomerServiceServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemor $(top_builddir)/../external/ours/library/fileInterface/libfileInterface.la \ $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(soePlatform_dir)/CSAssist/projects/CSAssist/CSAssistgameapi/release/libCSAssistgameapi.a \ $(soePlatform_dir)/CSAssist/lib/release/libBase_MT.a \ @@ -193,8 +193,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(soePlatform_dir)/CSAssist/projects/CSAssist/CSAssistgameapi/release/libCSAssistgameapi.a: make -C $(soePlatform_dir)/CSAssist/projects/CSAssist/CSAssistgameapi diff --git a/src/engine/server/application/CustomerServiceServer/src/linux/main.cpp b/src/engine/server/application/CustomerServiceServer/src/linux/main.cpp index 3c071fd6f..7cdc40160 100644 --- a/src/engine/server/application/CustomerServiceServer/src/linux/main.cpp +++ b/src/engine/server/application/CustomerServiceServer/src/linux/main.cpp @@ -12,7 +12,7 @@ #include "sharedNetworkMessages/SetupSharedNetworkMessages.h" #include "sharedRandom/SetupSharedRandom.h" #include "sharedThread/SetupSharedThread.h" -#include +#include // ====================================================================== diff --git a/src/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp b/src/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp index 7a6930320..eff05cf2d 100644 --- a/src/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp +++ b/src/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp @@ -45,10 +45,10 @@ void ConfigCustomerServiceServer::install() SetupSharedNetwork::install(networkSetupData); KEY_STRING (clusterName, "devcluster"); - KEY_STRING (centralServerAddress, "swo-dev8.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 61242); KEY_STRING (gameCode, "SWG"); - KEY_STRING (csServerAddress, "sdlogin1.station.sony.com"); + KEY_STRING (csServerAddress, "localhost"); KEY_INT (csServerPort, 3016); KEY_INT (maxPacketsPerSecond, 50); KEY_INT (requestTimeoutSeconds, 300); diff --git a/src/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h b/src/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h index 36acb978b..07fc38bd3 100644 --- a/src/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h +++ b/src/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h @@ -37,7 +37,7 @@ private: int m_pendingTicketCount; }; - typedef stdhash_map::fwd ClientConnectionMap; + typedef stdunordered_map::fwd ClientConnectionMap; typedef stdmap::fwd SuidToNetworkIdMap; typedef stdvector::fwd CategoryList; diff --git a/src/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h b/src/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h index 24edd4d1d..4eaa6a3bc 100644 --- a/src/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h +++ b/src/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h @@ -12,7 +12,7 @@ #include "sharedFoundation/FirstSharedFoundation.h" #include "sharedFoundation/NetworkId.h" #include "sharedNetwork/Connection.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/src/engine/server/application/CustomerServiceServer/src/shared/Makefile.am b/src/engine/server/application/CustomerServiceServer/src/shared/Makefile.am index 49d35ebae..812834e63 100644 --- a/src/engine/server/application/CustomerServiceServer/src/shared/Makefile.am +++ b/src/engine/server/application/CustomerServiceServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libCustomerServiceServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(platform_dir)/include \ -I$(platform_dir)/projects \ diff --git a/src/engine/server/application/LogServer/src/linux/Makefile.am b/src/engine/server/application/LogServer/src/linux/Makefile.am index b4ba07901..af621ec6b 100644 --- a/src/engine/server/application/LogServer/src/linux/Makefile.am +++ b/src/engine/server/application/LogServer/src/linux/Makefile.am @@ -20,7 +20,7 @@ LogServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy LogServer_SOURCES=main.cpp @@ -57,7 +57,7 @@ LogServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/lib $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -159,8 +159,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp b/src/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp index 61629d67b..c2240c1b7 100644 --- a/src/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp +++ b/src/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp @@ -33,7 +33,7 @@ void ConfigLogServer::install() KEY_INT (logServicePort, 44467); KEY_STRING (logServiceBindInterface, ""); - KEY_STRING (loggingServerApiAddress, "sdt-gp1"); + KEY_STRING (loggingServerApiAddress, "localhost"); KEY_STRING (loggingServerApiLoginName, "MISCONFIGURED_LOG_SERVER_LOGIN_NAME"); KEY_STRING (loggingServerApiPassword, "pacman"); KEY_STRING (loggingServerApiDefaultDirectory, "swg"); diff --git a/src/engine/server/application/LogServer/src/shared/LogServer.cpp b/src/engine/server/application/LogServer/src/shared/LogServer.cpp index 8ff1b6c63..e608ab894 100644 --- a/src/engine/server/application/LogServer/src/shared/LogServer.cpp +++ b/src/engine/server/application/LogServer/src/shared/LogServer.cpp @@ -23,6 +23,8 @@ #include "sharedNetworkMessages/LogMessage.h" #include "Archive/ByteStream.h" +#include + // ====================================================================== LogServer::LogServer() : @@ -149,6 +151,7 @@ void LogServer::setDone(char const *reasonfmt, ...) static_cast(Os::getProcessId()), reason)); + va_end(ap); m_done = true; } } diff --git a/src/engine/server/application/LogServer/src/shared/LogServer.h b/src/engine/server/application/LogServer/src/shared/LogServer.h index d7d8b45d8..6edc6b19e 100644 --- a/src/engine/server/application/LogServer/src/shared/LogServer.h +++ b/src/engine/server/application/LogServer/src/shared/LogServer.h @@ -30,7 +30,7 @@ public: static void remove(); static void run(); void mainLoop(); - void setDone(char const *reason, ...); + void setDone(char const *reasonfmt, ...); virtual void receiveMessage(MessageDispatch::Emitter const &source, MessageDispatch::MessageBase const &message); diff --git a/src/engine/server/application/LogServer/src/shared/Makefile.am b/src/engine/server/application/LogServer/src/shared/Makefile.am index c67e8f5ac..4a41e443b 100644 --- a/src/engine/server/application/LogServer/src/shared/Makefile.am +++ b/src/engine/server/application/LogServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libLogServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/application/LoginPing/src/linux/Makefile.am b/src/engine/server/application/LoginPing/src/linux/Makefile.am index 269e36155..80de074a7 100644 --- a/src/engine/server/application/LoginPing/src/linux/Makefile.am +++ b/src/engine/server/application/LoginPing/src/linux/Makefile.am @@ -20,7 +20,7 @@ LoginPing_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy LoginPing_SOURCES=main.cpp @@ -57,7 +57,7 @@ LoginPing_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/lib $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -159,8 +159,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/LoginPing/src/shared/Makefile.am b/src/engine/server/application/LoginPing/src/shared/Makefile.am index bcdc101b9..e73cc74a8 100644 --- a/src/engine/server/application/LoginPing/src/shared/Makefile.am +++ b/src/engine/server/application/LoginPing/src/shared/Makefile.am @@ -23,7 +23,7 @@ libLoginPingshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(singleton_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/application/LoginServer/src/linux/Makefile.am b/src/engine/server/application/LoginServer/src/linux/Makefile.am index 8ab5a66f5..e5dec451c 100644 --- a/src/engine/server/application/LoginServer/src/linux/Makefile.am +++ b/src/engine/server/application/LoginServer/src/linux/Makefile.am @@ -22,7 +22,7 @@ LoginServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(archive_dir)/include \ -I$(unicode_dir)/include \ @@ -76,7 +76,7 @@ LoginServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/l $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(top_builddir)/../external/3rd/library/platform/MonAPI2/libmonapi.la \ $(platform_dir)/lib/release/libBase.a \ @@ -212,8 +212,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../external/3rd/library/platform/MonAPI2/libmonapi.la: make -C $(top_builddir)/../external/3rd/library/platform/MonAPI2 diff --git a/src/engine/server/application/LoginServer/src/shared/CSToolConnection.h b/src/engine/server/application/LoginServer/src/shared/CSToolConnection.h index dee4d1c62..08651f09f 100644 --- a/src/engine/server/application/LoginServer/src/shared/CSToolConnection.h +++ b/src/engine/server/application/LoginServer/src/shared/CSToolConnection.h @@ -16,22 +16,22 @@ class CSToolConnection : public Connection { public: CSToolConnection(UdpConnectionMT *, TcpClient *); - + CSToolConnection( const std::string & address, const unsigned short port); - + virtual ~CSToolConnection(); - + void onReceive(const Archive::ByteStream & message); void sendToTool(const std::string & message ); virtual void onConnectionOpened(); virtual void onConnectionClosed(); void sendToClusters( const std::string & sCommand, const std::string &sCommandLine ); - + static CSToolConnection * getCSToolConnectionByToolId( uint32 id ); static void validateCSTool( uint32 toolId, apiResult result, const apiSession & session ); - + // cluster selection interface std::string selectCluster( const std::string & cluster ); std::string deselectCluster( const std::string & cluster ); @@ -56,4 +56,4 @@ private: CSToolConnection& operator=(const CSToolConnection& ); }; -#endif //_CSToolConnection_h \ No newline at end of file +#endif //_CSToolConnection_h diff --git a/src/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/src/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index e18508ee6..087796db5 100644 --- a/src/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/src/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -23,6 +23,8 @@ #include "sharedNetworkMessages/GenericValueTypeMessage.h" #include "sharedNetworkMessages/LoginEnumCluster.h" +#include + //----------------------------------------------------------------------- ClientConnection::ClientConnection(UdpConnectionMT * u, TcpClient * t) : diff --git a/src/engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp b/src/engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp index 9823533df..7244c97c7 100644 --- a/src/engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp +++ b/src/engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp @@ -89,7 +89,7 @@ void ConfigLoginServer::install(void) KEY_BOOL (validateStationKey, false); KEY_BOOL (doSessionLogin, false); KEY_BOOL (doConsumption, false); - KEY_STRING (sessionServers, "sdlogin-test:3004"); + KEY_STRING (sessionServers, "localhost:3004"); KEY_INT (sessionType, SESSION_TYPE_STARWARS); KEY_BOOL (developmentMode, true); KEY_INT (databaseThreads, 1); diff --git a/src/engine/server/application/LoginServer/src/shared/LoginServer.h b/src/engine/server/application/LoginServer/src/shared/LoginServer.h index 00bc5ffac..a284068e4 100644 --- a/src/engine/server/application/LoginServer/src/shared/LoginServer.h +++ b/src/engine/server/application/LoginServer/src/shared/LoginServer.h @@ -12,7 +12,7 @@ #include "sharedFoundation/StationId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedNetwork/Service.h" -#include +#include #include #include @@ -43,7 +43,7 @@ public: ClientConnection* getUnvalidatedClient (int clientId); void removeClient (int clientId); - const std::hash_map & getCentralServerMap_hide() const; + const std::unordered_map & getCentralServerMap_hide() const; bool deleteCharacter (uint32 clusterId, NetworkId const & characterId, StationId suid); diff --git a/src/engine/server/application/LoginServer/src/shared/Makefile.am b/src/engine/server/application/LoginServer/src/shared/Makefile.am index 745ea7ca8..9e464027d 100644 --- a/src/engine/server/application/LoginServer/src/shared/Makefile.am +++ b/src/engine/server/application/LoginServer/src/shared/Makefile.am @@ -26,7 +26,7 @@ libLoginServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(platform_dir)/projects \ -I$(platform_dir) \ diff --git a/src/engine/server/application/MetricsServer/src/linux/Makefile.am b/src/engine/server/application/MetricsServer/src/linux/Makefile.am index ae97b39d6..c7b547a72 100644 --- a/src/engine/server/application/MetricsServer/src/linux/Makefile.am +++ b/src/engine/server/application/MetricsServer/src/linux/Makefile.am @@ -20,7 +20,7 @@ MetricsServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(platform_dir) \ -I$(udplibrary_dir) \ -Wno-ctor-dtor-privacy @@ -58,7 +58,7 @@ MetricsServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(top_builddir)/../external/3rd/library/platform/MonAPI2/libmonapi.la \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -167,8 +167,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../external/3rd/library/platform/MonAPI2/libmonapi.la: make -C $(top_builddir)/../external/3rd/library/platform/MonAPI2 diff --git a/src/engine/server/application/MetricsServer/src/shared/Makefile.am b/src/engine/server/application/MetricsServer/src/shared/Makefile.am index cc933cb56..0ddf2d38a 100644 --- a/src/engine/server/application/MetricsServer/src/shared/Makefile.am +++ b/src/engine/server/application/MetricsServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libMetricsServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(platform_dir) \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ diff --git a/src/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp b/src/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp index df7c7fe55..87594eed1 100644 --- a/src/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp +++ b/src/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp @@ -10,6 +10,8 @@ #include "MonAPI2/MonitorAPI.h" #include "serverNetworkMessages/MetricsInitiationMessage.h" +#include + //----------------------------------------------------------------------- std::map MetricsGatheringConnection::ms_metricsSummaryTotalVal; diff --git a/src/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp b/src/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp index 72c9ea223..77f601d79 100644 --- a/src/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp +++ b/src/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp @@ -19,7 +19,9 @@ #ifdef LINUX #include #endif - +#ifdef WINDOWS +#include +#endif //---------------------------------------------------------------- std::string MetricsServer::m_commandLine; int MetricsServer::m_worldCountChannel = 0; @@ -188,7 +190,11 @@ void MetricsServer::run() if (pDump) m_soeMonitor->dump(); Clock::limitFrameRate(); - usleep(2000); +#ifdef WIN32 + Sleep(2); +#else + usleep(2000); +#endif } } diff --git a/src/engine/server/application/PlanetServer/src/linux/Makefile.am b/src/engine/server/application/PlanetServer/src/linux/Makefile.am index 6e0b547a0..94a7c00c3 100644 --- a/src/engine/server/application/PlanetServer/src/linux/Makefile.am +++ b/src/engine/server/application/PlanetServer/src/linux/Makefile.am @@ -22,7 +22,7 @@ PlanetServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/server/library/serverUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy PlanetServer_SOURCES=main.cpp @@ -65,7 +65,7 @@ PlanetServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/ $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -191,8 +191,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp b/src/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp index d8a62f137..85e2c38ee 100644 --- a/src/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp +++ b/src/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp @@ -31,7 +31,7 @@ void ConfigPlanetServer::install(void) data = new ConfigPlanetServer::Data; - KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44455); KEY_STRING (sceneID, "default"); KEY_INT (gameServicePort, 0); diff --git a/src/engine/server/application/PlanetServer/src/shared/Makefile.am b/src/engine/server/application/PlanetServer/src/shared/Makefile.am index ba44fb29c..dfffa8f6c 100644 --- a/src/engine/server/application/PlanetServer/src/shared/Makefile.am +++ b/src/engine/server/application/PlanetServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ libPlanetServershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(platform_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp b/src/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp index 395cacde5..c1dbd8714 100644 --- a/src/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp +++ b/src/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp @@ -70,6 +70,7 @@ #include "sharedUtility/LocationManager.h" #include "unicodeArchive/UnicodeArchive.h" +#include #include #include @@ -1471,7 +1472,8 @@ void PlanetServer::setDone(char const *reasonfmt, ...) "PlanetServer (pid %d) shutdown, reason: %s\n", static_cast(Os::getProcessId()), reason)); - + + va_end(ap); m_done = true; } } diff --git a/src/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp b/src/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp index 1dec17ed5..440b37f5b 100644 --- a/src/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp +++ b/src/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp @@ -13,6 +13,7 @@ #include "sharedFoundation/Os.h" #include "sharedNetworkMessages/GameNetworkMessage.h" +#include //----------------------------------------------------------------------- diff --git a/src/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp b/src/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp index 7d0c6822c..37371536c 100644 --- a/src/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp +++ b/src/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp @@ -18,9 +18,11 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" +#include #include #include #include +#include // ====================================================================== diff --git a/src/engine/server/application/PlanetServer/src/shared/Scene.h b/src/engine/server/application/PlanetServer/src/shared/Scene.h index 95c965a43..5c36369f7 100644 --- a/src/engine/server/application/PlanetServer/src/shared/Scene.h +++ b/src/engine/server/application/PlanetServer/src/shared/Scene.h @@ -10,8 +10,8 @@ // ====================================================================== -#include -#include +#include +#include #include #include @@ -93,9 +93,9 @@ class Scene : public Singleton2, public MessageDispatch::Receiver Coordinates(); }; - typedef std::hash_map ObjectMapType; - typedef std::hash_set DeletedSetType; - typedef std::hash_map NodeMapType; + typedef std::unordered_map ObjectMapType; + typedef std::unordered_set DeletedSetType; + typedef std::unordered_map NodeMapType; private: std::string m_sceneId; diff --git a/src/engine/server/application/PlanetServer/src/win32/WinMain.cpp b/src/engine/server/application/PlanetServer/src/win32/WinMain.cpp index aabdfc4a1..f153fee1c 100644 --- a/src/engine/server/application/PlanetServer/src/win32/WinMain.cpp +++ b/src/engine/server/application/PlanetServer/src/win32/WinMain.cpp @@ -14,6 +14,7 @@ #include "sharedThread/SetupSharedThread.h" #include "sharedUtility/SetupSharedUtility.h" +#include //_____________________________________________________________________ int main(int argc, char ** argv) diff --git a/src/engine/server/application/ServerConsole/src/linux/Makefile.am b/src/engine/server/application/ServerConsole/src/linux/Makefile.am index a93ca4409..ceadd0d08 100644 --- a/src/engine/server/application/ServerConsole/src/linux/Makefile.am +++ b/src/engine/server/application/ServerConsole/src/linux/Makefile.am @@ -20,7 +20,7 @@ ServerConsole_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy ServerConsole_SOURCES=main.cpp @@ -58,7 +58,7 @@ ServerConsole_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -172,8 +172,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/ServerConsole/src/shared/Makefile.am b/src/engine/server/application/ServerConsole/src/shared/Makefile.am index 04cb018fc..9a335a939 100644 --- a/src/engine/server/application/ServerConsole/src/shared/Makefile.am +++ b/src/engine/server/application/ServerConsole/src/shared/Makefile.am @@ -23,7 +23,7 @@ libServerConsoleshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(singleton_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/application/StationPlayersCollector/src/linux/Makefile.am b/src/engine/server/application/StationPlayersCollector/src/linux/Makefile.am index f91e2277b..a9135c176 100644 --- a/src/engine/server/application/StationPlayersCollector/src/linux/Makefile.am +++ b/src/engine/server/application/StationPlayersCollector/src/linux/Makefile.am @@ -25,7 +25,7 @@ StationPlayersCollector_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/server/library/serverUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(archive_dir)/include \ -I$(unicode_dir)/include \ @@ -80,7 +80,7 @@ StationPlayersCollector_LDADD=../shared/libStationPlayersCollectorshared.la \ $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a \ $(top_builddir)/../engine/shared/library/sharedMemoryManager/libsharedMemoryManager.la @@ -228,8 +228,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/server/application/StationPlayersCollector/src/shared/Makefile.am b/src/engine/server/application/StationPlayersCollector/src/shared/Makefile.am index 9d02794b0..940df5026 100644 --- a/src/engine/server/application/StationPlayersCollector/src/shared/Makefile.am +++ b/src/engine/server/application/StationPlayersCollector/src/shared/Makefile.am @@ -25,7 +25,7 @@ libStationPlayersCollectorshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(platform_dir)/projects \ -I$(platform_dir) \ diff --git a/src/engine/server/application/TaskManager/src/linux/Makefile.am b/src/engine/server/application/TaskManager/src/linux/Makefile.am index 0aeb99156..913eeff42 100644 --- a/src/engine/server/application/TaskManager/src/linux/Makefile.am +++ b/src/engine/server/application/TaskManager/src/linux/Makefile.am @@ -20,7 +20,7 @@ TaskManager_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy TaskManager_SOURCES=ConsoleInput.cpp \ @@ -69,7 +69,7 @@ TaskManager_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/l $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -189,8 +189,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui/libsharedGamesharedsui.la: cd $(top_builddir)/../engine/shared/library/sharedGame/src/shared/sui && $(MAKE) diff --git a/src/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp b/src/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp index f961f6ef4..20c68e81f 100644 --- a/src/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp +++ b/src/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp @@ -63,7 +63,7 @@ void ConfigTaskManager::install(void) KEY_INT (gameServicePort, 60001); KEY_INT (consoleConnectionPort, 60000); KEY_STRING (consoleServiceBindInterface, ""); - KEY_STRING (loginServerAddress, "swo-dev5.station.sony.com"); + KEY_STRING (loginServerAddress, "localhost"); KEY_INT (loginServerTaskServicePort, 44459); KEY_FLOAT (maximumLoad, 3.0f); KEY_FLOAT (loadConnectionServer, 0.5f); diff --git a/src/engine/server/application/TaskManager/src/shared/GameConnection.cpp b/src/engine/server/application/TaskManager/src/shared/GameConnection.cpp index 33b76d147..d297a6dd5 100644 --- a/src/engine/server/application/TaskManager/src/shared/GameConnection.cpp +++ b/src/engine/server/application/TaskManager/src/shared/GameConnection.cpp @@ -11,10 +11,12 @@ #include "TaskManager.h" #include "sharedFoundation/Clock.h" #include "sharedLog/Log.h" -#include "../../../../../shared/library/sharedNetwork/include/public/sharedNetwork/NetworkHandler.h" +#include "sharedNetwork/NetworkHandler.h" #include "sharedNetworkMessages/GenericValueTypeMessage.h" #include "ProcessSpawner.h" +#include + //----------------------------------------------------------------------- namespace GameConnectionNamespace diff --git a/src/engine/server/application/TaskManager/src/shared/Makefile.am b/src/engine/server/application/TaskManager/src/shared/Makefile.am index 885eda59e..46d48b1fd 100644 --- a/src/engine/server/application/TaskManager/src/shared/Makefile.am +++ b/src/engine/server/application/TaskManager/src/shared/Makefile.am @@ -23,7 +23,7 @@ libTaskManagershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(fileInterface_dir)/include/public \ -I$(singleton_dir)/include \ diff --git a/src/engine/server/application/TaskManager/src/win32/WinMain.cpp b/src/engine/server/application/TaskManager/src/win32/WinMain.cpp index 9fef3c69f..14a6ab396 100644 --- a/src/engine/server/application/TaskManager/src/win32/WinMain.cpp +++ b/src/engine/server/application/TaskManager/src/win32/WinMain.cpp @@ -7,6 +7,7 @@ #include "sharedFoundation/ConfigFile.h" #include "sharedFoundation/SetupSharedFoundation.h" #include "sharedNetworkMessages/SetupSharedNetworkMessages.h" +#include "sharedRandom/SetupSharedRandom.h" #include "sharedThread/SetupSharedThread.h" #include "TaskManager.h" #include "ConfigTaskManager.h" @@ -28,12 +29,18 @@ int main(int argc, char **argv) SetupSharedFoundation::install (setupFoundationData); SetupSharedCompression::install(); + SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); + SetupSharedRandom::install(static_cast(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + ConfigTaskManager::install(); + TaskManager::install(); + //-- run server SetupSharedFoundation::callbackWithExceptionHandling(TaskManager::run); + TaskManager::remove(); SetupSharedFoundation::remove(); SetupSharedThread::remove(); diff --git a/src/engine/server/application/TransferServer/src/linux/Makefile.am b/src/engine/server/application/TransferServer/src/linux/Makefile.am index 692344d17..d1800f93d 100644 --- a/src/engine/server/application/TransferServer/src/linux/Makefile.am +++ b/src/engine/server/application/TransferServer/src/linux/Makefile.am @@ -22,7 +22,7 @@ TransferServer_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -Wno-ctor-dtor-privacy TransferServer_SOURCES=main.cpp @@ -62,7 +62,7 @@ TransferServer_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManage $(top_builddir)/../external/ours/library/crypto/libcrypto.la \ $(top_builddir)/../external/ours/library/archive/libarchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(soePlatform_dir)/CTServiceGameAPI/libCTServiceGameAPI.a \ $(udplibrary_dir)/output/debug/libudplibrary.a @@ -201,8 +201,8 @@ $(top_builddir)/../external/ours/library/archive/libarchive.la: $(udplibrary_dir)/output/debug/libudplibrary.a: cd $(udplibrary_dir) && $(MAKE) -$(stlport_dir)/lib/libstlport_gcc.a: - cd $(stlport_dir)/src && $(MAKE) -f gcc-linux.mak + + $(soePlatform_dir)/CTServiceGameAPI/libCTServiceGameAPI.a: cd $(soePlatform_dir)/CTServiceGameAPI && $(MAKE) diff --git a/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp b/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp index e86cd69fd..6d456516c 100644 --- a/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp +++ b/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp @@ -311,25 +311,25 @@ void CTSAPIClient::moveComplete(unsigned int id, unsigned int track, int result) //----------------------------------------------------------------------- // NOT IMPLEMENTED IN SWG TRANSFER SERVICE -void CTSAPIClient::onReplyDelete(unsigned int, int, void *) +void CTSAPIClient::onReplyDelete(const unsigned int, const int, void *) { } //----------------------------------------------------------------------- // NOT IMPLEMENTED IN SWG TRANSFER SERVICE -void CTSAPIClient::onReplyRestore(unsigned int, int, void *) +void CTSAPIClient::onReplyRestore(const unsigned int, const int, void *) { } //----------------------------------------------------------------------- // NOT IMPLEMENTED IN SWG TRANSFER SERVICE -void CTSAPIClient::onRequestDelete(unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, unsigned int, unsigned int, unsigned int, bool, bool) +void CTSAPIClient::onRequestDelete(const unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const unsigned int, const unsigned int, const unsigned int, bool, bool) { } //----------------------------------------------------------------------- // NOT IMPLEMENTED IN SWG TRANSFER SERVICE -void CTSAPIClient::onRequestRestore(unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, unsigned int, unsigned int, unsigned int, bool, bool) +void CTSAPIClient::onRequestRestore(const unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const unsigned int, const unsigned int, const unsigned int, bool, bool) { } diff --git a/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.h b/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.h index e80d3b3d9..1e150ad00 100644 --- a/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.h +++ b/src/engine/server/application/TransferServer/src/shared/CTSAPIClient.h @@ -49,10 +49,10 @@ public: private: /* NOT IMPLEMENTED IN SWG TRANSFER SERVICE */ - void onReplyDelete(unsigned int, int, void *); - void onReplyRestore(unsigned int, int, void *); - void onRequestDelete(unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, unsigned int, unsigned int, unsigned int, bool, bool); - void onRequestRestore(unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, unsigned int, unsigned int, unsigned int, bool, bool); + void onReplyDelete(const unsigned int, const int, void *); + void onReplyRestore(const unsigned int, const int, void *); + void onRequestDelete(const unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const unsigned int, const unsigned int, const unsigned int, bool, bool); + void onRequestRestore(const unsigned int, const char *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const CTService::CTUnicodeChar *, const unsigned int, const unsigned int, const unsigned int, bool, bool); private: CTSAPIClient(); diff --git a/src/engine/server/application/TransferServer/src/shared/Makefile.am b/src/engine/server/application/TransferServer/src/shared/Makefile.am index 9d37e2f99..2c7b958e8 100644 --- a/src/engine/server/application/TransferServer/src/shared/Makefile.am +++ b/src/engine/server/application/TransferServer/src/shared/Makefile.am @@ -23,7 +23,7 @@ INCLUDES=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedTemplate/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(singleton_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/library/codegen/make_packages.pl b/src/engine/server/library/codegen/make_packages.pl index 5308bd043..2b580a3d1 100644 --- a/src/engine/server/library/codegen/make_packages.pl +++ b/src/engine/server/library/codegen/make_packages.pl @@ -154,7 +154,7 @@ sub editFile close (OUTFILE); if ($opt_windows == 1) { - system ("copy ${filename}.make_encoder_temporary_file $filename"); + system ("copy ${filename}.make_encoder_temporary_file $filename /y"); system ("del ${filename}.make_encoder_temporary_file"); } else diff --git a/src/engine/server/library/codegen/make_schema_h.pl b/src/engine/server/library/codegen/make_schema_h.pl index ad0597444..d79e1a5a9 100644 --- a/src/engine/server/library/codegen/make_schema_h.pl +++ b/src/engine/server/library/codegen/make_schema_h.pl @@ -36,7 +36,7 @@ sub main if ($opt_windows == 1) { - open (FILELIST,"bash -c \"ls ${opt_ddldirectory}/*.tab\"|"); #dir /f /b ${opt_ddldirectory}\\*.tab|"); + open (FILELIST,"c:\cygwin\bin\bash -c \"c:\cygwin\bin\ls ${opt_ddldirectory}/*.tab\"|"); #dir /f /b ${opt_ddldirectory}\\*.tab|"); } else { @@ -287,7 +287,8 @@ sub output if ($opt_windows == 1) { - system ("copy ${filename}.make_encoder_temporary_file $filename"); + #system ("copy ${filename}.make_encoder_temporary_file $filename"); + system ("copy d:\\whitengold\\src\\game\\server\\application\\SwgDatabaseServer\\src\\shared\\generated\\Schema_h.template $filename"); system ("del ${filename}.make_encoder_temporary_file"); } else diff --git a/src/engine/server/library/serverBase/src/shared/core/Makefile.am b/src/engine/server/library/serverBase/src/shared/core/Makefile.am index 56e791b4f..216d8e2b1 100644 --- a/src/engine/server/library/serverBase/src/shared/core/Makefile.am +++ b/src/engine/server/library/serverBase/src/shared/core/Makefile.am @@ -24,7 +24,7 @@ libserverBasesharedcore_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ -I$(localization_dir)/include \ -I$(localizationArchive_dir)/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(unicode_dir)/include \ -I$(unicodeArchive_dir)/include/public \ diff --git a/src/engine/server/library/serverBase/src/shared/core/ServerBase.cpp b/src/engine/server/library/serverBase/src/shared/core/ServerBase.cpp index d03f34b02..3f0bf2bdb 100644 --- a/src/engine/server/library/serverBase/src/shared/core/ServerBase.cpp +++ b/src/engine/server/library/serverBase/src/shared/core/ServerBase.cpp @@ -35,7 +35,9 @@ void ServerBase::install (ServerBaseImpl* implementation) SetupSharedNetwork::SetupData networkSetupData; SetupSharedNetwork::getDefaultServerSetupData(networkSetupData); SetupSharedNetwork::install(networkSetupData); +#ifndef WIN32 Os::setProgramName(ConfigServerBase::getServerName()); +#endif NetworkHandler::install(); char tmp[128] = {"\0"}; IGNORE_RETURN(snprintf(tmp, sizeof(tmp), "%s:%d", ConfigServerBase::getServerName() ,Os::getProcessId())); diff --git a/src/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp b/src/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp index c7d1c6e72..e8d7446e9 100644 --- a/src/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp +++ b/src/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp @@ -9,6 +9,7 @@ #include "serverDatabase/AbstractTableBuffer.h" #include +#include #include #include diff --git a/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp b/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp index ea303658a..2760bb316 100644 --- a/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp +++ b/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp @@ -49,9 +49,9 @@ void ConfigServerDatabase::install(void) KEY_STRING (databaseUID,"gameserver"); KEY_STRING (databasePWD,"gameserver"); KEY_STRING (databaseProtocol,"DEFAULT"); - KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44451); - KEY_STRING (commoditiesServerAddress, "swo-dev1.station.sony.com"); + KEY_STRING (commoditiesServerAddress, "localhost"); KEY_INT (commoditiesServerPort, 44457); //todo: confirm that this is a good port MSH KEY_INT (taskManagerPort, 60001); KEY_INT (expectedDBVersion, 270); diff --git a/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.h b/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.h index f909f5f97..e7c3aa1c1 100644 --- a/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.h +++ b/src/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.h @@ -180,7 +180,7 @@ public: static const bool getEnableGoldDatabase (void); static const NetworkId &getMaxGoldNetworkId (void); static const float getDefaultQueueUpdateTimeLimit(void); - static const bool ConfigServerDatabase::getEnableDataCleanup(void); + static const bool getEnableDataCleanup(void); static const int getDefaultLazyDeleteBulkBindSize (void); static const int getDefaultLazyDeleteSleepTime (void); static const int getWriteDelay (void); diff --git a/src/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp b/src/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp index 5b6764f3d..78beba263 100644 --- a/src/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp +++ b/src/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp @@ -18,6 +18,8 @@ #include "sharedDatabaseInterface/DbTaskQueue.h" #include "Snapshot.h" +#include + //----------------------------------------------------------------------- DatabaseMetricsData::DatabaseMetricsData() : diff --git a/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 2bdfa93a3..f27df9a78 100644 --- a/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -336,7 +336,8 @@ void DatabaseProcess::setDone(char const *reasonfmt, ...) static_cast(getProcessId()), static_cast(Os::getProcessId()), reason)); - + + va_end(ap); done = true; } } @@ -369,7 +370,7 @@ void DatabaseProcess::connectToGameServer(const char *address, uint16 port, uint if(i == pendingGameServerConnections.end()) { // check to see if there is already a connection active - std::hash_map::const_iterator j = gameServerConnections.find(processId); + std::unordered_map::const_iterator j = gameServerConnections.find(processId); if(j == gameServerConnections.end()) { // make the connection @@ -383,7 +384,7 @@ void DatabaseProcess::connectToGameServer(const char *address, uint16 port, uint GameServerConnection * DatabaseProcess::getConnectionByProcess(const uint32 processId) { GameServerConnection * result = 0; - std::hash_map::const_iterator j = gameServerConnections.find(processId); + std::unordered_map::const_iterator j = gameServerConnections.find(processId); if(j != gameServerConnections.end()) { result = (*j).second; @@ -395,7 +396,7 @@ GameServerConnection * DatabaseProcess::getConnectionByProcess(const uint32 proc void DatabaseProcess::getGameServerProcessIds(std::vector &processIds) const { - for (std::hash_map::const_iterator i = gameServerConnections.begin(); i != gameServerConnections.end(); ++i) + for (std::unordered_map::const_iterator i = gameServerConnections.begin(); i != gameServerConnections.end(); ++i) processIds.push_back((*i).first); } @@ -637,7 +638,7 @@ void DatabaseProcess::sendToCommoditiesServer(GameNetworkMessage const &message, void DatabaseProcess::sendToAllGameServers(GameNetworkMessage const &message, bool reliable) { - for (std::hash_map::const_iterator i=gameServerConnections.begin(); i!=gameServerConnections.end(); ++i) + for (std::unordered_map::const_iterator i=gameServerConnections.begin(); i!=gameServerConnections.end(); ++i) i->second->send(message,reliable); } @@ -645,7 +646,7 @@ void DatabaseProcess::sendToAllGameServers(GameNetworkMessage const &message, bo void DatabaseProcess::sendToGameServer(uint32 serverId, GameNetworkMessage const &message) { - std::hash_map::const_iterator i=gameServerConnections.find(serverId); + std::unordered_map::const_iterator i=gameServerConnections.find(serverId); if (i!=gameServerConnections.end()) i->second->send(message,true); else diff --git a/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h b/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h index 9ab24885e..5cc5f2e70 100644 --- a/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h +++ b/src/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h @@ -10,7 +10,7 @@ // ====================================================================== -#include +#include #include #include #include "sharedFoundation/NetworkIdArchive.h" @@ -88,7 +88,7 @@ class DatabaseProcess : public MessageDispatch::Receiver CommoditiesServerConnection * commoditiesConnection; DatabaseMetricsData * m_metricsData; - std::hash_map gameServerConnections; + std::unordered_map gameServerConnections; std::set > pendingGameServerConnections; int m_queryExecCount; diff --git a/src/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h b/src/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h index 60ee1d29a..b99382d21 100644 --- a/src/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h +++ b/src/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h @@ -34,7 +34,7 @@ namespace DBQuery { GetChunkQuery(const std::string &schema); private: - virtual DB::Query::QueryMode GetChunkQuery::getExecutionMode() const; + virtual QueryMode getExecutionMode() const; private: GetChunkQuery(const GetChunkQuery&); // disable diff --git a/src/engine/server/library/serverDatabase/src/shared/Loader.cpp b/src/engine/server/library/serverDatabase/src/shared/Loader.cpp index a03476e96..fb4b5a6c0 100644 --- a/src/engine/server/library/serverDatabase/src/shared/Loader.cpp +++ b/src/engine/server/library/serverDatabase/src/shared/Loader.cpp @@ -51,6 +51,8 @@ #include "sharedNetworkMessages/GenericValueTypeMessage.h" #include "unicodeArchive/UnicodeArchive.h" +#include + // ====================================================================== Loader *Loader::ms_instance = NULL; diff --git a/src/engine/server/library/serverDatabase/src/shared/Makefile.am b/src/engine/server/library/serverDatabase/src/shared/Makefile.am index 73f19bae0..3835f475f 100644 --- a/src/engine/server/library/serverDatabase/src/shared/Makefile.am +++ b/src/engine/server/library/serverDatabase/src/shared/Makefile.am @@ -23,7 +23,7 @@ libserverDatabaseshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(platform_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverDatabase/src/shared/Persister.h b/src/engine/server/library/serverDatabase/src/shared/Persister.h index b4e12afcf..3c432fbc9 100644 --- a/src/engine/server/library/serverDatabase/src/shared/Persister.h +++ b/src/engine/server/library/serverDatabase/src/shared/Persister.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include //TODO: remove when we clean up newCharacterLock hack @@ -105,7 +105,7 @@ class Persister : public MessageDispatch::Receiver }; typedef std::map ServerSnapshotMap; - typedef std::hash_map ObjectSnapshotMap; + typedef std::unordered_map ObjectSnapshotMap; typedef std::map PendingCharactersType; typedef std::vector SnapshotListType; typedef std::set NewCharacterLockType; diff --git a/src/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h b/src/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h index ebe916b8b..ea1d13716 100644 --- a/src/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h +++ b/src/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h @@ -1 +1 @@ -#include "../../src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h" \ No newline at end of file +#include "../../src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h" diff --git a/src/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h b/src/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h index 92b1da1c5..12a87cc6f 100644 --- a/src/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h +++ b/src/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h @@ -1 +1 @@ -#include "../../src/shared/object/PlayerQuestObject.h" \ No newline at end of file +#include "../../src/shared/object/PlayerQuestObject.h" diff --git a/src/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h b/src/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h index f45ba543b..332946b04 100644 --- a/src/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h +++ b/src/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h @@ -1 +1 @@ -#include "../../src/shared/core/ServerBuffBuilderManager.h" \ No newline at end of file +#include "../../src/shared/core/ServerBuffBuilderManager.h" diff --git a/src/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h b/src/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h index 12aa7a83c..e9f76434f 100644 --- a/src/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h +++ b/src/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h @@ -1 +1 @@ -#include "../../src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h" \ No newline at end of file +#include "../../src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h" diff --git a/src/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp b/src/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp index 9ffeddbfd..0b0a552dd 100644 --- a/src/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp +++ b/src/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp @@ -202,7 +202,7 @@ void AggroListProperty::alter() // Once verified for the hate list, we need to give a warning to the target that the // aggro is about to occur - TargetList::iterator iterTargetList = m_targetList.begin(); + TargetList::const_iterator iterTargetList = m_targetList.begin(); for (; iterTargetList != m_targetList.end(); ++iterTargetList) { diff --git a/src/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h b/src/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h index 363498871..5881b536e 100644 --- a/src/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h +++ b/src/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h @@ -138,7 +138,7 @@ protected: // define shared pointer template for AiMovementBase typedef boost::shared_ptr AiMovementBasePtr; -#define AiMovementBaseNullPtr AiMovementBasePtr(NULL) +#define AiMovementBaseNullPtr AiMovementBasePtr() // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp b/src/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp index ec7713f14..52a3e701c 100644 --- a/src/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp +++ b/src/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp @@ -18,15 +18,15 @@ #include "sharedLog/Log.h" #include "sharedObject/World.h" -#include +#include using namespace Scripting; namespace AiMovementSwarmNamespace { - typedef std::hash_map, CachedNetworkId> targetMap; - typedef std::hash_map offsetMap; + typedef std::unordered_map, CachedNetworkId> targetMap; + typedef std::unordered_map offsetMap; // map of swarm targets to the creatures swarming them targetMap s_swarmMap; diff --git a/src/engine/server/library/serverGame/src/shared/ai/Makefile.am b/src/engine/server/library/serverGame/src/shared/ai/Makefile.am index dc9eab865..9c70e72cc 100644 --- a/src/engine/server/library/serverGame/src/shared/ai/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/ai/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharedai_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/ai/Squad.cpp b/src/engine/server/library/serverGame/src/shared/ai/Squad.cpp index 34f645e16..caced74f5 100644 --- a/src/engine/server/library/serverGame/src/shared/ai/Squad.cpp +++ b/src/engine/server/library/serverGame/src/shared/ai/Squad.cpp @@ -180,7 +180,7 @@ void Squad::addUnit(NetworkId const & unit) //-- Add the unit to the new squad - IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, &PersistentCrcString::empty))); + IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), &PersistentCrcString::empty))); if (leader) { @@ -419,7 +419,7 @@ void Squad::buildFormation() NetworkId const & unit = iterSortedUnitList->second.first; PersistentCrcString const * unitName = iterSortedUnitList->second.second; - IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, unitName))); + IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), unitName))); } m_formation.build(*this); diff --git a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp index 165b98640..17fa39eab 100644 --- a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp +++ b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp @@ -72,7 +72,7 @@ AiShipBehaviorAttackFighter::Maneuver::~Maneuver() delete m_pathList; - m_currentPath = NULL; + //m_currentPath = NULL; } // ---------------------------------------------------------------------- diff --git a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp index d510e0f7f..eb6e0309e 100644 --- a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp +++ b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp @@ -15,6 +15,7 @@ #include "sharedRandom/Random.h" #include "sharedFoundation/Misc.h" +#include #include // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h index 2965c9c8d..f41594aea 100644 --- a/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h +++ b/src/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h @@ -64,4 +64,4 @@ private: // Disabled. Path &operator=(Path const &); }; -#endif \ No newline at end of file +#endif diff --git a/src/engine/server/library/serverGame/src/shared/behavior/Makefile.am b/src/engine/server/library/serverGame/src/shared/behavior/Makefile.am index 23ce1f801..cbd09250a 100644 --- a/src/engine/server/library/serverGame/src/shared/behavior/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/behavior/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharedbehavior_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/city/Makefile.am b/src/engine/server/library/serverGame/src/shared/city/Makefile.am index 1f1e15b9e..ceb52c59a 100644 --- a/src/engine/server/library/serverGame/src/shared/city/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/city/Makefile.am @@ -28,7 +28,7 @@ libserverGamesharedcity_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(boost_dir) \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/collision/Makefile.am b/src/engine/server/library/serverGame/src/shared/collision/Makefile.am index e0511c67a..2a8febe56 100644 --- a/src/engine/server/library/serverGame/src/shared/collision/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/collision/Makefile.am @@ -28,7 +28,7 @@ libserverGamesharedcollision_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h b/src/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h index b59fa9389..953dec2c5 100644 --- a/src/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h +++ b/src/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h @@ -29,7 +29,7 @@ public: uint32 sequenceId, bool clearable, Command::Priority, - bool auto2 ); + bool autoAttack ); CommandQueueEntry(CommandQueueEntry const &entry); CommandQueueEntry& operator=(CommandQueueEntry const &); diff --git a/src/engine/server/library/serverGame/src/shared/command/Makefile.am b/src/engine/server/library/serverGame/src/shared/command/Makefile.am index d6e82752f..659fe01a2 100644 --- a/src/engine/server/library/serverGame/src/shared/command/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/command/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharedcommand_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(boost_dir) \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/src/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp index 0c6781ce3..63fc08ef2 100644 --- a/src/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp +++ b/src/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp @@ -590,8 +590,8 @@ static time_t s_timeMarketConnectionCre static std::map > s_queries; static std::map s_queryTime; static int s_nextRequestId; -static std::hash_map s_pendingLoads; -static std::hash_map s_pendingAdds; //sequence to cost map +static std::unordered_map s_pendingLoads; +static std::unordered_map s_pendingAdds; //sequence to cost map // all money transactions transfer money out of or to the bank of the player and never to or from the vendor/bazaar location except bazaar sale fees static const std::string COMMODITIES_NAMED_ACCOUNT("commodities_named_escrow_account"); @@ -1321,7 +1321,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId } } } - std::hash_map::iterator f = s_pendingAdds.find(sequence); + std::unordered_map::iterator f = s_pendingAdds.find(sequence); int auctionFee = 0; if (f != s_pendingAdds.end()) { @@ -2488,7 +2488,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId) if (!ConfigServerGame::getCommoditiesMarketEnabled()) return; LOG("AuctionRetrieval", ("CommoditiesMarket::response from DB for loading object %s for retrieval", itemId.getValueString().c_str())); - std::hash_map::iterator f = s_pendingLoads.find(itemId); + std::unordered_map::iterator f = s_pendingLoads.find(itemId); if (f != s_pendingLoads.end()) { CreatureObject *player = dynamic_cast(NetworkIdManager::getObjectById((*f).second.ownerId)); diff --git a/src/engine/server/library/serverGame/src/shared/commoditiesMarket/Makefile.am b/src/engine/server/library/serverGame/src/shared/commoditiesMarket/Makefile.am index cdbce0a79..dc0b61295 100644 --- a/src/engine/server/library/serverGame/src/shared/commoditiesMarket/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/commoditiesMarket/Makefile.am @@ -30,7 +30,7 @@ libserverGamesharedcommoditiesMarket_la_CXXFLAGS=-I$(srcdir)/../../../include/pu -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h b/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h index cd97c1ebd..08944f7c3 100644 --- a/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h +++ b/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h @@ -10,7 +10,7 @@ #include "sharedCommandParser/CommandParser.h" #include -#include +#include #include "UnicodeUtils.h" // ====================================================================== @@ -18,7 +18,7 @@ class ConsoleCommandParserDefault : public CommandParser { public: typedef std::map AliasMap_t; - typedef std::hash_set AliasGuardSet_t; + typedef std::unordered_set AliasGuardSet_t; explicit ConsoleCommandParserDefault (void); diff --git a/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp b/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp index d99af85f0..df8f314a0 100644 --- a/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp +++ b/src/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp @@ -460,12 +460,12 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const //----------------------------------------------------------------- else if (isAbbrev( argv[0], "dumpMemToFile")) { - std::string fileName(Unicode::wideToNarrow(argv[1])); - std::string leakStr(Unicode::wideToNarrow(argv[2])); - bool leak = (leakStr == "true" || leakStr == "1"); - - MemoryManager::reportToFile(fileName.c_str(), leak); - result += getErrorMessage (argv[0], ERR_SUCCESS); + //std::string fileName(Unicode::wideToNarrow(argv[1])); + //std::string leakStr(Unicode::wideToNarrow(argv[2])); + //bool leak = (leakStr == "true" || leakStr == "1"); + // + //MemoryManager::reportToFile(fileName.c_str(), leak); + //result += getErrorMessage (argv[0], ERR_SUCCESS); } //----------------------------------------------------------------- @@ -520,7 +520,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const sprintf( count, "Sphere id=[%lu] origin=[%f, %f, %f] radius=[%f] OID=[%s] %s\n", - reinterpret_cast(i), + std::distance(results.begin(), i),//reinterpret_cast(i), (*i).second.getCenter().x, (*i).second.getCenter().y, (*i).second.getCenter().z, @@ -556,7 +556,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const sprintf( count, "Sphere id=[%lu] origin=[%f, %f, %f] radius=[%f] OID=[%s] %s\n", - reinterpret_cast(i), + std::distance(results.begin(), i), (*i).second.getCenter().x, (*i).second.getCenter().y, (*i).second.getCenter().z, diff --git a/src/engine/server/library/serverGame/src/shared/console/Makefile.am b/src/engine/server/library/serverGame/src/shared/console/Makefile.am index 91d6b6a8a..a582f92bb 100644 --- a/src/engine/server/library/serverGame/src/shared/console/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/console/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharedconsole_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(platform_dir)/projects \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/container/Makefile.am b/src/engine/server/library/serverGame/src/shared/container/Makefile.am index e0a185a22..5fa749760 100644 --- a/src/engine/server/library/serverGame/src/shared/container/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/container/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedcontainer_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp b/src/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp index 834ac1e2d..040d0a9c2 100644 --- a/src/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp +++ b/src/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp @@ -122,9 +122,9 @@ Location AiCreatureControllerNamespace::getLocation(ServerObject const & serverO //----------------------------------------------------------------------- AICreatureController::AICreatureController(CreatureObject * newOwner) : CreatureController(newOwner) - , m_movement(NULL) - , m_pendingMovement(NULL) - , m_suspendedMovement(NULL) + , m_movement() + , m_pendingMovement() + , m_suspendedMovement() , m_lastStartPosition(newOwner->getPosition_p()) , m_lastEndPosition(newOwner->getPosition_p()) , m_sleepTimer(0.0f) @@ -2164,7 +2164,7 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) { m_aiDebugStringCrc = crc; - ObserverList::iterator iterObserverList = observerList.begin(); + ObserverList::const_iterator iterObserverList = observerList.begin(); for (; iterObserverList != observerList.end(); ++iterObserverList) { diff --git a/src/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp b/src/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp index 329a0069c..b14698b3e 100644 --- a/src/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp +++ b/src/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp @@ -1499,7 +1499,7 @@ void AiShipController::onAttackTargetListEmpty() if ( !guardedByList.empty() && getSquad().isAttackTargetListEmpty()) { - SpaceSquad::SpaceSquadList::iterator iterGuardedByList = guardedByList.begin(); + SpaceSquad::SpaceSquadList::const_iterator iterGuardedByList = guardedByList.begin(); for (; iterGuardedByList != guardedByList.end(); ++iterGuardedByList) { @@ -1677,7 +1677,7 @@ void AiShipController::sendDebugAiToClients(AiDebugString & aiDebugString) { m_aiDebugStringCrc = crc; - ObserverList::iterator iterObserverList = observerList.begin(); + ObserverList::const_iterator iterObserverList = observerList.begin(); for (; iterObserverList != observerList.end(); ++iterObserverList) { diff --git a/src/engine/server/library/serverGame/src/shared/controller/Makefile.am b/src/engine/server/library/serverGame/src/shared/controller/Makefile.am index 2b576b7a5..2048184d8 100644 --- a/src/engine/server/library/serverGame/src/shared/controller/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/controller/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharedcontroller_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp b/src/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp index 2d62f13dc..6350d91b6 100644 --- a/src/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp +++ b/src/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp @@ -36,6 +36,7 @@ #include "sharedObject/AlterResult.h" #include "sharedObject/NetworkIdManager.h" +#include #include // ====================================================================== @@ -553,6 +554,7 @@ void PlayerShipController::logMoveFail(char const *reasonFmt, ...) const client->getCharacterObjectId().getValueString().c_str(), client->getStationId(), reason)); + va_end(ap); } // ---------------------------------------------------------------------- diff --git a/src/engine/server/library/serverGame/src/shared/controller/ShipController.cpp b/src/engine/server/library/serverGame/src/shared/controller/ShipController.cpp index 7b397f124..3367476d2 100644 --- a/src/engine/server/library/serverGame/src/shared/controller/ShipController.cpp +++ b/src/engine/server/library/serverGame/src/shared/controller/ShipController.cpp @@ -487,7 +487,7 @@ bool ShipController::face(Vector const & goalPosition_w, float elapsedTime) Vector const upPoint_w = shipTransform.getPosition_p() + Vector::unitY; Vector const upPoint_o = shipTransform.rotateTranslate_p2l(upPoint_w); float d2 = sqrt(sqr(upPoint_o.x) + sqr(upPoint_o.y)); - float phi2 = atan2(d2,abs(upPoint_o.z)); + float phi2 = atan2(d2,std::abs(upPoint_o.z)); if(phi2 > convertDegreesToRadians(10.f)) { diff --git a/src/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp b/src/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp index c4a0dd5c3..8cf03ed42 100644 --- a/src/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp @@ -230,7 +230,7 @@ void AttribModNameManager::sendAllNamesToServer(std::vector const & serv { // get the set of non-base names we know about std::set unique; - for (Names::const_reverse_iterator i = m_names->rbegin(); i != m_names->rend(); ++i) + for (Names::reverse_iterator i = m_names->rbegin(); i != m_names->rend(); ++i) unique.insert(*i); if (!unique.empty()) diff --git a/src/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp b/src/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp index f99f265df..18881fbae 100644 --- a/src/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp @@ -16,7 +16,9 @@ #include "sharedFoundation/NetworkIdArchive.h" #include "sharedLog/Log.h" #include "sharedNetworkMessages/GenericValueTypeMessage.h" +#include #include +#include // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp b/src/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp index f2e5e340b..ce305b380 100644 --- a/src/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp @@ -33,7 +33,8 @@ #include "sharedObject/NetworkIdManager.h" #include "sharedSkillSystem/SkillManager.h" #include "sharedSkillSystem/SkillObject.h" -#include +#include +#include #include #include diff --git a/src/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp b/src/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp index 2dd3ff9ac..cede945a9 100644 --- a/src/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp @@ -1,5 +1,5 @@ // ChatServerConnection.cpp -// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. // Author: Justin Randall //----------------------------------------------------------------------- @@ -71,7 +71,7 @@ void ChatServerConnection::onReceive(const Archive::ByteStream &message) else if (msg.isType("ChatOnRequestLog")) { ChatOnRequestLog chatOnRequestLog(cri); - + ReportManager::handleMessage(chatOnRequestLog); } else if (msg.isType("ChatAvatarConnected")) @@ -170,4 +170,4 @@ void ChatServerConnection::processVoiceChatOnGetChannel(const Archive::ByteStrea GroupObject::onVoiceChatRoomCreate(response.getRoomName()); GuildInterface::onVoiceChatRoomCreate(response.getRoomName()); //TODO: guild -} \ No newline at end of file +} diff --git a/src/engine/server/library/serverGame/src/shared/core/Client.cpp b/src/engine/server/library/serverGame/src/shared/core/Client.cpp index cea9f64ee..9a343956a 100644 --- a/src/engine/server/library/serverGame/src/shared/core/Client.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/Client.cpp @@ -242,10 +242,7 @@ Client::Client(ConnectionServerConnection & connection, const NetworkId & charac connectToEmitter(connection, "ConnectionServerConnectionDestroyed"); // Check god permissions - if ( ConfigServerGame::getAdminGodToAll() - || ( (!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure) - && AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel) - && (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(ipAddr)))) + if (AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel)) { m_godValidated = true; if (ConfigServerGame::getAdminGodToAll()) diff --git a/src/engine/server/library/serverGame/src/shared/core/Client.h b/src/engine/server/library/serverGame/src/shared/core/Client.h index a8d429eef..9ed69e72e 100644 --- a/src/engine/server/library/serverGame/src/shared/core/Client.h +++ b/src/engine/server/library/serverGame/src/shared/core/Client.h @@ -19,7 +19,7 @@ #include "sharedObject/CachedNetworkId.h" #include "sharedObject/Object.h" #include "unicodeArchive/UnicodeArchive.h" -#include +#include #include class ConnectionServerConnection; @@ -128,12 +128,12 @@ public: return (reinterpret_cast(ptr) >> 4); }; }; - typedef std::hash_set ObservingList; + typedef std::unordered_set ObservingList; // objects being observed that are in this list needs // to have their pvp status updated when there are changes // that requires pvp status to be recalcuclated - typedef std::hash_set ObservingListPvpSync; + typedef std::unordered_set ObservingListPvpSync; ObservingList const & getObserving() const; ObservingListPvpSync const & getObservingPvpSync() const; diff --git a/src/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/src/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp index e439d8edc..58c9fc179 100644 --- a/src/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp @@ -11,6 +11,8 @@ #include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" +#include + //------------------------------------------------------------------- ConfigServerGame::Data* ConfigServerGame::data; @@ -48,7 +50,7 @@ void ConfigServerGame::install(void) KEY_FLOAT (startZ, 0.0f); startingPosition = Vector(data->startX,data->startY,data->startZ); KEY_INT (taskManagerPort, 60001); - KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44451); KEY_STRING (javaVMName, ""); KEY_STRING (scriptPath, "../../data/sku.0/sys.server/compiled/game"); @@ -65,7 +67,7 @@ void ConfigServerGame::install(void) KEY_BOOL (profileScripts, false); KEY_BOOL (crashOnScriptError, false); KEY_BOOL (compileScripts, true); - KEY_BOOL (trapScriptCrashes, true); + KEY_BOOL (trapScriptCrashes, false); KEY_INT (scriptWatcherWarnTime, 5000); KEY_INT (scriptWatcherInterruptTime, 5000); KEY_INT (scriptStackErrorLimit, 35); @@ -124,7 +126,7 @@ void ConfigServerGame::install(void) KEY_BOOL (adminGodToAll, false); KEY_INT (adminGodToAllGodLevel, 50); KEY_BOOL (useSecureLoginForGodAccess, false); - KEY_BOOL (useIPForGodAccess, true); + KEY_BOOL (useIPForGodAccess, false); KEY_BOOL (adminPersistAllCreates, false); KEY_BOOL (buildCluster, false); KEY_INT (requestSceneWarpTimeoutSeconds, 60); diff --git a/src/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/src/engine/server/library/serverGame/src/shared/core/GameServer.cpp index 76e1c99b5..75a6ea36b 100644 --- a/src/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -230,6 +230,8 @@ #include "swgSharedUtility/SpeciesRestrictions.h" #include "unicodeArchive/UnicodeArchive.h" +#include + //----------------------------------------------------------------------- //#undef PROFILE_INDIVIDUAL_MESSAGES @@ -691,8 +693,8 @@ void GameServer::createProxyOnAllServers(ServerObject *object) void GameServer::debugIO (void) { #ifdef _DEBUG - DebugMonitor::flushOutput(); - DebugMonitor::clearScreen(); +// DebugMonitor::flushOutput(); +// DebugMonitor::clearScreen(); DebugFlags::callReportRoutines(); #endif } @@ -3643,9 +3645,9 @@ bool GameServer::requestSceneWarp(const CachedNetworkId &objectId, const std::st // clamp destination if in space if ( !strncmp(sceneName.c_str(), "space_", 6) - && ( abs(newPosition_w.x) > 8000.f - || abs(newPosition_w.y) > 8000.f - || abs(newPosition_w.z) > 8000.f)) + && ( std::abs(newPosition_w.x) > 8000.f + || std::abs(newPosition_w.y) > 8000.f + || std::abs(newPosition_w.z) > 8000.f)) { WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", object->getDebugInformation().c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z)); destPosition_w.set( @@ -3706,9 +3708,9 @@ bool GameServer::requestSceneWarp(const CachedNetworkId &objectId, const std::st // clamp destination if in space if ( !strncmp(sceneName.c_str(), "space_", 6) - && ( abs(newPosition_w.x) > 8000.f - || abs(newPosition_w.y) > 8000.f - || abs(newPosition_w.z) > 8000.f)) + && ( std::abs(newPosition_w.x) > 8000.f + || std::abs(newPosition_w.y) > 8000.f + || std::abs(newPosition_w.z) > 8000.f)) { WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", object->getDebugInformation().c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z)); destPosition_w.set( @@ -4888,6 +4890,7 @@ void GameServer::setDone(char const *reasonfmt, ...) static_cast(Os::getProcessId()), reason)); + va_end(ap); m_done = true; } } @@ -4936,7 +4939,7 @@ bool GameServer::addPendingLoadRequest(NetworkId const & id) if (s_pendingLoadRequests.find(id) != s_pendingLoadRequests.end()) return false; - s_pendingLoadRequests[id] = ::time(NULL); + s_pendingLoadRequests[id] = (unsigned int)::time(NULL); return true; } diff --git a/src/engine/server/library/serverGame/src/shared/core/GameServer.h b/src/engine/server/library/serverGame/src/shared/core/GameServer.h index ca44785d7..c30367617 100644 --- a/src/engine/server/library/serverGame/src/shared/core/GameServer.h +++ b/src/engine/server/library/serverGame/src/shared/core/GameServer.h @@ -62,7 +62,7 @@ class GameServer : public MessageDispatch::Receiver { public: - typedef stdhash_map::fwd ClientMap; + typedef stdunordered_map::fwd ClientMap; typedef stdvector::fwd ConnectionServerVector; virtual ~GameServer (); @@ -106,7 +106,7 @@ public: void clearCustomerServiceServerConnection(); void setCentralServerConnection (CentralServerConnection *newCentralServerConnection); void setDatabaseProcessConnection (DatabaseProcessConnection *newDatabaseProcessConnection); - void setDone (char const *reason, ...); + void setDone (char const *reasonfmt, ...); void setProcessId (uint32 newProcessId); void onDatabaseProcessConnectionEstablished(); void onPlanetServerConnectionEstablished (); diff --git a/src/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp b/src/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp index 6e647de70..77454c88f 100644 --- a/src/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp @@ -25,14 +25,14 @@ #include "sharedObject/Container.h" #include #include -#include +#include // ====================================================================== static bool s_installed; static Scheduler *s_logoutTrackerScheduler; static std::queue s_logoutCallbacks; -static std::hash_map s_logoutCallbacksCount; +static std::unordered_map s_logoutCallbacksCount; namespace LogoutTrackerNamespace { @@ -76,7 +76,7 @@ void LogoutTracker::add(NetworkId const &networkId) // when they go off, and only when the last 3 minute timer goes off do we remove him from the // world, which is the desired behavior of leaving a disconnected character in the world for // 3 minutes before removing him from the world - std::hash_map::iterator iter = s_logoutCallbacksCount.find(networkId); + std::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); if (iter == s_logoutCallbacksCount.end()) { s_logoutCallbacksCount[networkId] = 1; @@ -97,7 +97,7 @@ void LogoutTracker::handleLogoutCallback(const void *context) UNREF(context); NetworkId const &networkId = s_logoutCallbacks.front(); - std::hash_map::iterator iter = s_logoutCallbacksCount.find(networkId); + std::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); // only process the *LAST* logout callback that is put into the logout callback // queue for this object as the previous ones are no longer applicable diff --git a/src/engine/server/library/serverGame/src/shared/core/Makefile.am b/src/engine/server/library/serverGame/src/shared/core/Makefile.am index f58f4f54b..68647026f 100644 --- a/src/engine/server/library/serverGame/src/shared/core/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/core/Makefile.am @@ -35,7 +35,7 @@ libserverGamesharedcore_la_CXXFLAGS=-ftemplate-depth-33 -I$(srcdir)/../../../inc -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(platform_dir)/projects \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp b/src/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp index dc63ba9a9..005a62605 100644 --- a/src/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp @@ -80,7 +80,7 @@ namespace MessageToQueueNamespace private: CachedNetworkId m_networkId; unsigned long m_deliveryTime; - SchedulerItem & operator= (SchedulerItem const &); //disable + //SchedulerItem & operator= (SchedulerItem const &); //disable }; typedef std::map LastKnownLocationsType; diff --git a/src/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp b/src/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp index 1cad1de34..bc67a91b8 100644 --- a/src/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp @@ -191,7 +191,7 @@ void MoveSimManager::checkApplySimulation (CreatureObject & creature) creature.setController (msc); creature.scheduleForAlter (); - if (!std::find (s_moveSimCreatures.begin (), s_moveSimCreatures.end (), id)) + if (std::find (s_moveSimCreatures.begin (), s_moveSimCreatures.end (), id) != s_moveSimCreatures.end()) s_moveSimCreatures.push_back (id); REPORT_LOG_PRINT (true, ("MoveSimManager [%ld] applied simulation to [%s]\n", GameServer::getInstance ().getProcessId (), id.getValueString ().c_str ())); diff --git a/src/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/src/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 81aef04bb..6366130f0 100644 --- a/src/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -23,6 +23,8 @@ #include "sharedUtility/DataTableManager.h" #include "sharedUtility/NameGenerator.h" +#include + // ====================================================================== NameManager *NameManager::ms_instance = NULL; diff --git a/src/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp b/src/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp index 12726bb61..4388ad2a7 100644 --- a/src/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp @@ -78,7 +78,7 @@ Vector NewbieTutorial::getTutorialLocation() { x = s_tutorialSpacing*Random::random(s_sqrtMaxTutorials-1) - s_tutorialMapWidth/2.0f; z = s_tutorialSpacing*Random::random(s_sqrtMaxTutorials-1) - s_tutorialMapWidth/2.0f; - } while (abs(x) < 300.0f || abs(z) < 300.0f); + } while (std::abs(x) < 300.0f || std::abs(z) < 300.0f); return Vector(x, 0.0f, z); } diff --git a/src/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp b/src/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp index fbf589a12..3a9ba6d13 100644 --- a/src/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp @@ -11,6 +11,7 @@ #include "sharedObject/ObjectTemplateList.h" #include "sharedUtility/DataTableManager.h" +#include #include //------------------------------------------------------------------------------------------ diff --git a/src/engine/server/library/serverGame/src/shared/core/RegexList.cpp b/src/engine/server/library/serverGame/src/shared/core/RegexList.cpp index 62e86baad..5244818ec 100644 --- a/src/engine/server/library/serverGame/src/shared/core/RegexList.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/RegexList.cpp @@ -11,7 +11,7 @@ #include "StringId.h" #include "Unicode.h" #include "UnicodeUtils.h" -#include "pcre/pcre.h" +#include "pcre.h" #include "sharedFoundation/PointerDeleter.h" #include "sharedRegex/RegexServices.h" #include "sharedUtility/DataTable.h" diff --git a/src/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp b/src/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp index dda89d333..f371ee838 100644 --- a/src/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp @@ -135,7 +135,7 @@ void ServerBuildoutManager::install() for (std::vector::const_iterator i = buildoutAreas.begin(); i != buildoutAreas.end(); ++i) { - s_areas.push_back(); + s_areas.push_back(AreaInfo()); AreaInfo &areaInfo = s_areas.back(); areaInfo.buildoutArea = *i; areaInfo.loaded = false; @@ -458,7 +458,7 @@ void ServerBuildoutManagerNamespace::generateBuildoutData(float x1, float z1, fl packedScriptList += (*j).getScriptName(); } - serverRows.push_back(); + serverRows.push_back(ServerBuildoutAreaRow()); ServerBuildoutAreaRow &serverRow = serverRows.back(); serverRow.id = static_cast< int >( obj->getNetworkId().getValue() ); @@ -494,7 +494,7 @@ void ServerBuildoutManagerNamespace::generateBuildoutData(float x1, float z1, fl if (!serverOnly) { - clientRows.push_back(); + clientRows.push_back(ClientBuildoutAreaRow()); ClientBuildoutAreaRow &clientRow = clientRows.back(); clientRow.id = serverRow.id; diff --git a/src/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp b/src/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp index b938fc47b..9729c0398 100644 --- a/src/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp @@ -726,7 +726,7 @@ void ServerUniverse::update(float frameTime) if (!m_pendingUniverseLoadedAckList.empty()) { time_t const nowTime = ::time(NULL); - int const secondsSinceUniverseDataSent = nowTime - m_timeUniverseDataSent; + int const secondsSinceUniverseDataSent = (int)(nowTime - m_timeUniverseDataSent); // don't wait forever for ack from another game server // that it has received the universe data diff --git a/src/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp b/src/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp index 06497c4bb..c9bb11a08 100644 --- a/src/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp @@ -46,6 +46,7 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" #include +#include // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/generated/Makefile.am b/src/engine/server/library/serverGame/src/shared/generated/Makefile.am index c6aa0d3ae..6b7879b32 100644 --- a/src/engine/server/library/serverGame/src/shared/generated/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/generated/Makefile.am @@ -33,7 +33,7 @@ libserverGamesharedgenerated_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp b/src/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp index 62a68d681..756caf20d 100644 --- a/src/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp +++ b/src/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp @@ -12,6 +12,8 @@ #include "Archive/Archive.h" #include "sharedFoundation/NetworkIdArchive.h" +#include + // ====================================================================== namespace Archive diff --git a/src/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp b/src/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp index d09b8c136..f30669aa8 100644 --- a/src/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp +++ b/src/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp @@ -23,7 +23,7 @@ #include "sharedFoundation/FormattedString.h" #include "sharedNetworkMessages/ChatRoomData.h" -#include +#include // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/guild/Makefile.am b/src/engine/server/library/serverGame/src/shared/guild/Makefile.am index a7e5944d2..d3e7036f6 100644 --- a/src/engine/server/library/serverGame/src/shared/guild/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/guild/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedguild_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(boost_dir) \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp b/src/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp index aa375dc4a..96c0d19bb 100644 --- a/src/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp +++ b/src/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp @@ -239,7 +239,7 @@ void GameServerMetricsData::updateData() "Max: %s requested load on %s which has been pending for %s. Limit = %d.", id.getValueString().c_str(), CalendarTime::convertEpochToTimeStringLocal(oldestPendingLoadRequestTime).c_str(), - CalendarTime::convertSecondsToMS(::time(NULL) - oldestPendingLoadRequestTime).c_str(), + CalendarTime::convertSecondsToMS((int)::time(NULL) - oldestPendingLoadRequestTime).c_str(), GameServer::getPendingLoadRequestLimit() ); else diff --git a/src/engine/server/library/serverGame/src/shared/metrics/Makefile.am b/src/engine/server/library/serverGame/src/shared/metrics/Makefile.am index 20e756740..fb59bcb7e 100644 --- a/src/engine/server/library/serverGame/src/shared/metrics/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/metrics/Makefile.am @@ -28,7 +28,7 @@ libserverGamesharedmetrics_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp b/src/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp index f10a6dc54..0bdc9431b 100644 --- a/src/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp +++ b/src/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp @@ -168,12 +168,12 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message) // return an appropriate response. if( object && object->isAuthoritative() ) { - GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, true ) ); + GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, true ) ); GameServer::getInstance().sendToCentralServer( rmsg ); } else { - GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, false ) ); + GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, false ) ); GameServer::getInstance().sendToCentralServer( rmsg ); } } diff --git a/src/engine/server/library/serverGame/src/shared/network/Makefile.am b/src/engine/server/library/serverGame/src/shared/network/Makefile.am index 09c7afb63..669a36abd 100644 --- a/src/engine/server/library/serverGame/src/shared/network/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/network/Makefile.am @@ -31,7 +31,7 @@ libserverGamesharednetwork_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(boost_dir) \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(boost_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/object/BuildingObject.h b/src/engine/server/library/serverGame/src/shared/object/BuildingObject.h index 36e3f2450..ff58fef80 100644 --- a/src/engine/server/library/serverGame/src/shared/object/BuildingObject.h +++ b/src/engine/server/library/serverGame/src/shared/object/BuildingObject.h @@ -89,7 +89,7 @@ public: }; }; - typedef stdhash_set::fwd AllBuildingsSet; + typedef stdunordered_set::fwd AllBuildingsSet; static const AllBuildingsSet & getAllBuildings(); protected: diff --git a/src/engine/server/library/serverGame/src/shared/object/CellPermissions.h b/src/engine/server/library/serverGame/src/shared/object/CellPermissions.h index 788b6b1be..8fcfccc38 100644 --- a/src/engine/server/library/serverGame/src/shared/object/CellPermissions.h +++ b/src/engine/server/library/serverGame/src/shared/object/CellPermissions.h @@ -51,8 +51,8 @@ namespace CellPermissions friend void Archive::get( ReadIterator & source, CellPermissions::PermissionObject & target ); friend void Archive::put( ByteStream & target, const CellPermissions::PermissionObject & source ); - friend class BuildingObject; - friend class CellObject; + friend class ::BuildingObject; + friend class ::CellObject; public: diff --git a/src/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/src/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index ece29b65f..ca6568c2f 100644 --- a/src/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -182,7 +182,8 @@ #include "sharedUtility/ValueDictionary.h" #include #include -#include +#include +#include #include //---------------------------------------------------------------------- @@ -625,7 +626,7 @@ float CreatureAttitude::operator-(CreatureAttitude const &other) const if (m_fearState != other.m_fearState) result += 30.0f; for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i) - result += abs(m_currentValues[i] - other.m_currentValues[i]); + result += std::abs(m_currentValues[i] - other.m_currentValues[i]); return result; } @@ -651,9 +652,9 @@ bool MonitoredCreatureMovement::operator!=(MonitoredCreatureMovement const &othe float MonitoredCreatureMovement::operator-(MonitoredCreatureMovement const &other) const { - return abs(m_lastDistance - other.m_lastDistance) - + abs(m_skittishness - other.m_skittishness) - + abs(m_curve - other.m_curve); + return std::abs(m_lastDistance - other.m_lastDistance) + + std::abs(m_skittishness - other.m_skittishness) + + std::abs(m_curve - other.m_curve); } // ====================================================================== @@ -7717,7 +7718,7 @@ void CreatureObject::reportMonitoredCreatures(float time) { percent = -percent; } - float absCurve = abs(i->second.m_curve); + float absCurve = std::abs(i->second.m_curve); float scale = pow(percent, absCurve) * (1+absCurve); float speedScale = float(sqrt(approachVelocity / getRunSpeed())); float fearDelta = approach * i->second.m_skittishness * speedScale * scale; @@ -13368,7 +13369,7 @@ void CreatureObject::removeMissionCriticalObject(NetworkId const & networkId) { if (isAuthoritative()) { - MissionCriticalObjectSet::iterator iter = m_missionCriticalObjectSet.find(networkId); + MissionCriticalObjectSet::const_iterator iter = m_missionCriticalObjectSet.find(networkId); if (iter != m_missionCriticalObjectSet.end()) { m_missionCriticalObjectSet.erase(iter); @@ -13421,7 +13422,7 @@ void CreatureObject::setGroupMissionCriticalObjects(GroupMissionCriticalObjectSe //-- Anything that is not in the original set, we need to remove { - for (GroupMissionCriticalObjectSet::iterator iter = m_groupMissionCriticalObjectSet.begin(); iter != m_groupMissionCriticalObjectSet.end(); ++iter) + for (GroupMissionCriticalObjectSet::const_iterator iter(m_groupMissionCriticalObjectSet.begin()); iter != m_groupMissionCriticalObjectSet.end(); ++iter) if (groupMissionCriticalObjectSet.find(*iter) == groupMissionCriticalObjectSet.end()) m_groupMissionCriticalObjectSet.erase(*iter); } @@ -14622,7 +14623,7 @@ bool CreatureObject::clearAllExpertises() //@TODO: guard this however design wants const SkillList &skills = getSkillList(); std::vector skillsToRevoke; - for(std::set::iterator i = skills.begin(); i != skills.end(); ++i) + for(std::set::const_iterator i(skills.begin()); i != skills.end(); ++i) { const SkillObject *skill = *i; if(skill && ExpertiseManager::isExpertise(skill)) diff --git a/src/engine/server/library/serverGame/src/shared/object/CreatureObject.h b/src/engine/server/library/serverGame/src/shared/object/CreatureObject.h index 93705f664..f2fb0607d 100644 --- a/src/engine/server/library/serverGame/src/shared/object/CreatureObject.h +++ b/src/engine/server/library/serverGame/src/shared/object/CreatureObject.h @@ -519,7 +519,7 @@ public: }; }; - typedef stdhash_set::fwd AllCreaturesSet; + typedef stdunordered_set::fwd AllCreaturesSet; static const AllCreaturesSet & getAllCreatures(); bool monitorCreatureMovement(const CachedNetworkId &ofTarget, float i_skittishness, float i_curve); diff --git a/src/engine/server/library/serverGame/src/shared/object/GroupObject.cpp b/src/engine/server/library/serverGame/src/shared/object/GroupObject.cpp index d60e23bed..a80807beb 100644 --- a/src/engine/server/library/serverGame/src/shared/object/GroupObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/GroupObject.cpp @@ -1415,7 +1415,7 @@ unsigned int GroupObject::getSecondsLeftOnGroupPickup() const { time_t const timeNow = ::time(NULL); if (groupPickupTimer.second > timeNow) - return (groupPickupTimer.second - timeNow); + return (groupPickupTimer.second - (int)timeNow); } return 0; diff --git a/src/engine/server/library/serverGame/src/shared/object/GuildObject.cpp b/src/engine/server/library/serverGame/src/shared/object/GuildObject.cpp index bf0f4ea94..e0cabf773 100644 --- a/src/engine/server/library/serverGame/src/shared/object/GuildObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/GuildObject.cpp @@ -673,7 +673,7 @@ void GuildObject::disbandGuild(int guildId) { std::pair const & killInfo = GuildInterface::getGuildEnemyKillInfo(guildId, *i); std::string enemySpec; - GuildStringParser::buildEnemySpec(guildId, *i, killInfo.first, killInfo.second, enemySpec); + GuildStringParser::buildEnemySpec(guildId, *i, killInfo.first, (int)killInfo.second, enemySpec); m_enemies.erase(enemySpec); // remove any pending kill count updates for the 2 guilds @@ -693,7 +693,7 @@ void GuildObject::disbandGuild(int guildId) { std::pair const & killInfo = GuildInterface::getGuildEnemyKillInfo(*i, guildId); std::string enemySpec; - GuildStringParser::buildEnemySpec(*i, guildId, killInfo.first, killInfo.second, enemySpec); + GuildStringParser::buildEnemySpec(*i, guildId, killInfo.first, (int)killInfo.second, enemySpec); m_enemies.erase(enemySpec); // remove any pending kill count updates for the 2 guilds @@ -1426,7 +1426,7 @@ void GuildObject::removeGuildEnemy(int guildId, int enemyId) { std::pair const & killInfo = GuildInterface::getGuildEnemyKillInfo(guildId, enemyId); std::string enemySpec; - GuildStringParser::buildEnemySpec(guildId, enemyId, killInfo.first, killInfo.second, enemySpec); + GuildStringParser::buildEnemySpec(guildId, enemyId, killInfo.first, (int)killInfo.second, enemySpec); m_enemies.erase(enemySpec); // if the other build B has declared war on us, clear the @@ -1436,7 +1436,7 @@ void GuildObject::removeGuildEnemy(int guildId, int enemyId) { if (killInfoBtoA->first > 0) { - GuildStringParser::buildEnemySpec(enemyId, guildId, killInfoBtoA->first, killInfoBtoA->second, enemySpec); + GuildStringParser::buildEnemySpec(enemyId, guildId, killInfoBtoA->first, (int)killInfoBtoA->second, enemySpec); m_enemies.erase(enemySpec); GuildStringParser::buildEnemySpec(enemyId, guildId, 0, 0, enemySpec); @@ -1519,10 +1519,10 @@ void GuildObject::updateGuildWarKillTrackingData() && GuildInterface::hasDeclaredWarAgainst(iter->first.second, iter->first.first)) { std::pair const & killInfo = GuildInterface::getGuildEnemyKillInfo(iter->first.first, iter->first.second); - GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first, killInfo.second, enemySpec); + GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first, (int)killInfo.second, enemySpec); m_enemies.erase(enemySpec); - GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first + iter->second.first, std::max(killInfo.second, static_cast(iter->second.second)), enemySpec); + GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first + iter->second.first, (int)std::max(killInfo.second, static_cast(iter->second.second)), enemySpec); m_enemies.insert(enemySpec); } } diff --git a/src/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp b/src/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp index 1094b3d5b..a3f1127fd 100644 --- a/src/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp @@ -379,7 +379,7 @@ float InstallationObject::getOutOfPowerTime(void) const void InstallationObject::setPowerRate(float rate) { // don't do anything if we're not really changing the rate - if (abs(rate - m_powerRate.get()) < 0.01f) + if (std::abs(rate - m_powerRate.get()) < 0.01f) return; if (isAuthoritative()) diff --git a/src/engine/server/library/serverGame/src/shared/object/InstallationObject.h b/src/engine/server/library/serverGame/src/shared/object/InstallationObject.h index 642ea0a6f..742ae2662 100644 --- a/src/engine/server/library/serverGame/src/shared/object/InstallationObject.h +++ b/src/engine/server/library/serverGame/src/shared/object/InstallationObject.h @@ -67,7 +67,7 @@ public: }; }; - typedef stdhash_set::fwd AllInstallationsSet; + typedef stdunordered_set::fwd AllInstallationsSet; static const AllInstallationsSet & getAllInstallations(); protected: diff --git a/src/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp b/src/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp index 0f9216a9e..0f21840a4 100644 --- a/src/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp @@ -39,6 +39,7 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" +#include // ====================================================================== diff --git a/src/engine/server/library/serverGame/src/shared/object/Makefile.am b/src/engine/server/library/serverGame/src/shared/object/Makefile.am index 347b8682f..963cb06b1 100644 --- a/src/engine/server/library/serverGame/src/shared/object/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/object/Makefile.am @@ -35,7 +35,7 @@ libserverGamesharedobject_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(platform_dir)/projects \ diff --git a/src/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp b/src/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp index f95a253ac..888b5d77d 100644 --- a/src/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp @@ -407,7 +407,7 @@ void ObjectTracker::removeCombatAI() void ObjectTracker::removeHibernatingAI() { - if (m_numHibernatingAI > 0) + if (m_numHibernatingAI > 0) --m_numHibernatingAI; } @@ -415,7 +415,7 @@ void ObjectTracker::removeHibernatingAI() void ObjectTracker::removeDelayedHibernatingAI() { - if (m_numDelayedHibernatingAI > 0) + if (m_numDelayedHibernatingAI > 0) --m_numDelayedHibernatingAI; } @@ -461,4 +461,4 @@ void ObjectTracker::removePlayerQuestObject() --m_numPlayerQuestObjects; } -//------------------------------------------------------------------------------------------ \ No newline at end of file +//------------------------------------------------------------------------------------------ diff --git a/src/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp b/src/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp index 2e14025df..56e4b737b 100644 --- a/src/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp @@ -108,20 +108,20 @@ namespace PlanetObjectNamespace if(index == std::string::npos) { - parsedVector.push_back(std::make_pair(eventString, 0)); + parsedVector.push_back(std::make_pair(eventString, 0)); return; } while(index != std::string::npos) { std::string subString = eventString.substr(offset, (index - offset)); - parsedVector.push_back(std::make_pair(subString, index)); + parsedVector.push_back(std::make_pair(subString, index)); offset = index + 1; index = eventString.find(delimiter, offset); } std::string subString = eventString.substr(offset, eventString.size()); - parsedVector.push_back(std::make_pair(subString, index)); + parsedVector.push_back(std::make_pair(subString, index)); } const char * makeCopyOfString(const char * rhs) diff --git a/src/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/src/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 39e6f3354..76c64d746 100644 --- a/src/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -92,6 +92,7 @@ #include "sharedUtility/LocationArchive.h" #include "UnicodeUtils.h" +#include #include const SharedObjectTemplate * PlayerObject::m_defaultSharedTemplate = NULL; @@ -6210,8 +6211,7 @@ void PlayerObject::setAutoVariableFromByteStream(const std::string & name, const for (std::vector::const_iterator questIter = quests.begin(); questIter != quests.end(); ++questIter) { - if (questIter) - m_quests.set(questIter->key, questIter->value); + m_quests.set(questIter->key, questIter->value); } } else if(name == "completedQuests") diff --git a/src/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp b/src/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp index b46e0f7af..54e63df98 100644 --- a/src/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp @@ -1,5 +1,5 @@ // PlayerQuestObject.cpp -// Copyright 2009, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2009, Sony Online Entertainment Inc., all rights reserved. // Author: Matt Boudreaux //----------------------------------------------------------------------- @@ -228,7 +228,7 @@ PlayerQuestObject * PlayerQuestObject::createPlayerQuestObjectInCreatureDatapad( if(dataPad) result = safe_cast(ServerWorld::createNewObject(s_playerQuestObjectTemplateName, *dataPad, false)); - return result; + return result; } @@ -241,7 +241,7 @@ PlayerQuestObject * PlayerQuestObject::createPlayerQuestObjectInCreatureInventor if(inventory) result = safe_cast(ServerWorld::createNewObject(s_playerQuestObjectTemplateName, *inventory, false)); - return result; + return result; } @@ -277,9 +277,9 @@ void PlayerQuestObject::getTaskCounters(std::vector & counterVector) void PlayerQuestObject::addNewTask(std::string title, std::string description, int counterMax, std::string waypoint) { - + m_taskStatus.push_back(0); - m_taskCounters.push_back(std::make_pair(0, counterMax)); + m_taskCounters.push_back(std::make_pair(0, counterMax)); m_waypoints.push_back(waypoint); @@ -315,7 +315,7 @@ void PlayerQuestObject::readInObjVarData() std::vector maxValues; if(getObjVars().getItem(s_taskMaxCounterObjVar, maxValues)) for(std::vector::size_type i = 0; i < counters.size(); ++i) - m_taskCounters.push_back(std::make_pair(counters[i], maxValues[i])); + m_taskCounters.push_back(std::make_pair(counters[i], maxValues[i])); } // Task Status @@ -463,7 +463,7 @@ std::string const & PlayerQuestObject::getTaskDescription(int index) void PlayerQuestObject::setTaskCounter(int index, int value) { int maxValue = m_taskCounters.get()[index].second; - m_taskCounters.set(static_cast(index), std::make_pair(value, maxValue)); + m_taskCounters.set(static_cast(index), std::make_pair(value, maxValue)); saveDataToObjVars(); } @@ -655,7 +655,7 @@ void PlayerQuestObject::fixObjVarDelimiter() for(unsigned int i = 0; i < m_tasks.size(); ++i) { std::string narrowString = Unicode::wideToNarrow(m_tasks[i]); - + std::string::size_type iter = narrowString.find('|'); while(iter != std::string::npos) { @@ -682,4 +682,4 @@ void PlayerQuestObject::fixObjVarDelimiter() m_rewards = rewards; saveDataToObjVars(); } -} \ No newline at end of file +} diff --git a/src/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/src/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index b32f84a90..2ca0fa23f 100644 --- a/src/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -4172,9 +4172,9 @@ void ServerObject::teleportObject(Vector const &position_w, NetworkId const &tar // clamp destination if in space if ( ServerWorld::isSpaceScene() - && ( abs(position_w.x) > 8000.f - || abs(position_w.y) > 8000.f - || abs(position_w.z) > 8000.f)) + && ( std::abs(position_w.x) > 8000.f + || std::abs(position_w.y) > 8000.f + || std::abs(position_w.z) > 8000.f)) { WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", getDebugInformation().c_str(), position_w.x, position_w.y, position_w.z)); destPosition_w.set( @@ -8393,11 +8393,11 @@ void ServerObject::stopListeningToAllBroadcastMessages() else { // build list of all broadcasters this object is currently listening to - std::hash_set broadcasters; + std::unordered_set broadcasters; for (BroadcastMap::const_iterator iter = m_broadcastBroadcasters.begin(); iter != m_broadcastBroadcasters.end(); ++iter) IGNORE_RETURN(broadcasters.insert(iter->second)); - for (std::hash_set::const_iterator iter2 = broadcasters.begin(); iter2 != broadcasters.end(); ++iter2) + for (std::unordered_set::const_iterator iter2 = broadcasters.begin(); iter2 != broadcasters.end(); ++iter2) { // need to send a message to the broadcaster if the broadcaster is not on this game server ServerObject * objBroadcaster = ServerWorld::findObjectByNetworkId(*iter2); diff --git a/src/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/src/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index 012839130..6d58c476f 100644 --- a/src/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -116,6 +116,7 @@ #include #include +#include #pragma warning(disable:4355) @@ -6189,7 +6190,7 @@ void TangibleObject::addUserToAccessList(const NetworkId user) } else { - sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user) ) ); + sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user) ) ); } } @@ -6209,7 +6210,7 @@ void TangibleObject::addGuildToAccessList(int guildId) } else { - sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid) ) ); + sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid) ) ); } } @@ -6238,7 +6239,7 @@ void TangibleObject::removeUserFromAccessList(const NetworkId user) } else { - sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user))); + sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user))); } } @@ -6266,7 +6267,7 @@ void TangibleObject::removeGuildFromAccessList(int guildId) } else { - sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid))); + sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid))); } } diff --git a/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp b/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp index b9251c577..71610de20 100644 --- a/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp +++ b/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp @@ -18,7 +18,7 @@ #include "sharedDebug/Profiler.h" #include "sharedObject/NetworkIdManager.h" #include -#include +#include // ====================================================================== @@ -48,8 +48,8 @@ namespace TriggerVolumeNamespace // optimization to track how many time a NetworkId appears // in sources and targets, so that we can avoid unnecessarily // searching the entire sources and targets vectors - std::hash_map m_sourcesCount; - std::hash_map m_targetsCount; + std::unordered_map m_sourcesCount; + std::unordered_map m_targetsCount; }; // ---------------------------------------------------------------------- @@ -61,7 +61,7 @@ namespace TriggerVolumeNamespace m_sources.push_back(source); m_targets.push_back(target); - std::hash_map::iterator i = m_sourcesCount.find(source); + std::unordered_map::iterator i = m_sourcesCount.find(source); if (i == m_sourcesCount.end()) m_sourcesCount[source] = 1; else @@ -80,7 +80,7 @@ namespace TriggerVolumeNamespace { // remove all entries from sources // and targets for the specified id - std::hash_map::iterator const iterCountSource = m_sourcesCount.find(id); + std::unordered_map::iterator const iterCountSource = m_sourcesCount.find(id); if (iterCountSource != m_sourcesCount.end()) { int countSource = iterCountSource->second; @@ -104,7 +104,7 @@ namespace TriggerVolumeNamespace std::vector::iterator targetsIter = m_targets.begin(); std::advance(targetsIter, index); - std::hash_map::iterator const iterCountTarget = m_targetsCount.find(*targetsIter); + std::unordered_map::iterator const iterCountTarget = m_targetsCount.find(*targetsIter); if (iterCountTarget != m_targetsCount.end()) { if (iterCountTarget->second <= 1) @@ -128,7 +128,7 @@ namespace TriggerVolumeNamespace m_sourcesCount.erase(iterCountSource); } - std::hash_map::iterator const iterCountTarget = m_targetsCount.find(id); + std::unordered_map::iterator const iterCountTarget = m_targetsCount.find(id); if (iterCountTarget != m_targetsCount.end()) { int countTarget = iterCountTarget->second; @@ -152,7 +152,7 @@ namespace TriggerVolumeNamespace std::vector::iterator sourcesIter = m_sources.begin(); std::advance(sourcesIter, index); - std::hash_map::iterator const iterCountSource = m_sourcesCount.find(*sourcesIter); + std::unordered_map::iterator const iterCountSource = m_sourcesCount.find(*sourcesIter); if (iterCountSource != m_sourcesCount.end()) { if (iterCountSource->second <= 1) diff --git a/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.h b/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.h index 118517523..a6b661e19 100644 --- a/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.h +++ b/src/engine/server/library/serverGame/src/shared/object/TriggerVolume.h @@ -14,7 +14,7 @@ #include "sharedFoundation/NetworkId.h" #include "sharedUtility/PooledString.h" -#include +#include // ====================================================================== @@ -40,7 +40,7 @@ public: }; }; - typedef std::hash_set ContentsSet; + typedef std::unordered_set ContentsSet; void addObject(ServerObject &object); void addEventSource(NetworkId const &source); diff --git a/src/engine/server/library/serverGame/src/shared/object/WeaponObject.h b/src/engine/server/library/serverGame/src/shared/object/WeaponObject.h index 305ad1283..959826350 100644 --- a/src/engine/server/library/serverGame/src/shared/object/WeaponObject.h +++ b/src/engine/server/library/serverGame/src/shared/object/WeaponObject.h @@ -14,6 +14,8 @@ #include "serverGame/ServerWeaponObjectTemplate.h" #include "sharedGame/SharedWeaponObjectTemplate.h" +#include + class NetworkId; /** diff --git a/src/engine/server/library/serverGame/src/shared/objectTemplate/Makefile.am b/src/engine/server/library/serverGame/src/shared/objectTemplate/Makefile.am index a39f4cad0..2d63a08d4 100644 --- a/src/engine/server/library/serverGame/src/shared/objectTemplate/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/objectTemplate/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedobjectTemplate_la_CXXFLAGS=-I$(srcdir)/../../../include/publi -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp index b29db96c8..a387b6450 100644 --- a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp +++ b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp index 22b6b4fea..6daeee45c 100644 --- a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp +++ b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp index 718b680f7..e977aa2bb 100644 --- a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -19,9 +19,10 @@ //@BEGIN TFD TEMPLATE REFS #include "ServerObjectTemplate.h" //@END TFD TEMPLATE REFS -#include +#include +#include -#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); @@ -30,7 +31,7 @@ const TriggerVolumeData DefaultTriggerVolumeData; bool ServerObjectTemplate::ms_allowDefaultTemplateParams = true; -typedef std::hash_map > XP_MAP; +typedef std::unordered_map > XP_MAP; static XP_MAP * XpMap = NULL; diff --git a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp index 810113e12..4ee70d190 100644 --- a/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp +++ b/src/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp @@ -19,7 +19,8 @@ //#include "serverGame/XpManagerObject.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/server/library/serverGame/src/shared/pvp/Makefile.am b/src/engine/server/library/serverGame/src/shared/pvp/Makefile.am index 211d0b582..bf92aef2d 100644 --- a/src/engine/server/library/serverGame/src/shared/pvp/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/pvp/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedpvp_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp b/src/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp index d705d1cfb..4de849cdc 100644 --- a/src/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp +++ b/src/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp @@ -35,6 +35,8 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" +#include + // ====================================================================== namespace PvpNamespace diff --git a/src/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp b/src/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp index 094ccdb92..70f550952 100644 --- a/src/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp +++ b/src/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp @@ -18,8 +18,8 @@ #include "sharedLog/Log.h" #include "sharedNetworkMessages/UpdatePvpStatusMessage.h" -#include -#include +#include +#include // ====================================================================== @@ -41,12 +41,12 @@ namespace PvpUpdateObserverNamespace }; }; - std::hash_set s_activeUpdaters; + std::unordered_set s_activeUpdaters; - typedef std::hash_map >, ClientObjectPointerHash> PvpUpdateObserverCache; + typedef std::unordered_map >, ClientObjectPointerHash> PvpUpdateObserverCache; PvpUpdateObserverCache s_pvpUpdateObserverCache; - typedef std::hash_map, ClientObjectPointerHash> PvpUpdateObserverRequestsThisFrame; + typedef std::unordered_map, ClientObjectPointerHash> PvpUpdateObserverRequestsThisFrame; PvpUpdateObserverRequestsThisFrame s_pvpUpdateObserverRequestsThisFrame; // PvpUpdateObserver can be called multiple times per frame for the same object, @@ -57,10 +57,10 @@ namespace PvpUpdateObserverNamespace // so as an optimization, we'll only iterate over these 2 lists once per frame, // and then just watch on individual updates to these 2 lists afterwards, and // process the individual updates to these 2 lists when the updates occur - std::hash_set s_objectsProcessedThisFrame; - std::hash_set s_clientsProcessedThisFrame; + std::unordered_set s_objectsProcessedThisFrame; + std::unordered_set s_clientsProcessedThisFrame; - void sendUpdatePvpStatusMessage(Client const & client, std::hash_set const & requestedNetworkId, std::hash_map > & cachedNetworkId); + void sendUpdatePvpStatusMessage(Client const & client, std::unordered_set const & requestedNetworkId, std::unordered_map > & cachedNetworkId); } using namespace PvpUpdateObserverNamespace; @@ -86,7 +86,7 @@ PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDel std::set const &clients = who->getObservers(); for (std::set::const_iterator i = clients.begin(); i != clients.end(); ++i) { - std::hash_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[*i]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[*i]; if (pvpUpdateObserverCache.count(who->getNetworkId()) == 0) { uint32 flags, factionId; @@ -104,8 +104,8 @@ PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDel Client * const client = who->getClient(); if (client && (s_clientsProcessedThisFrame.count(client) == 0)) { - std::hash_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; - std::hash_set & pvpUpdateObserverRequestsThisFrame = s_pvpUpdateObserverRequestsThisFrame[client]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; + std::unordered_set & pvpUpdateObserverRequestsThisFrame = s_pvpUpdateObserverRequestsThisFrame[client]; Client::ObservingListPvpSync const &objs = client->getObservingPvpSync(); for (Client::ObservingListPvpSync::const_iterator i = objs.begin(); i != objs.end(); ++i) @@ -218,7 +218,7 @@ void PvpUpdateObserver::startObservingPvpSyncNotification(Client const *client, if ((s_objectsProcessedThisFrame.count(who.getNetworkId()) != 0) || (s_clientsProcessedThisFrame.count(client) != 0)) { - std::hash_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; if (pvpUpdateObserverCache.count(who.getNetworkId()) == 0) { uint32 flags, factionId; @@ -274,14 +274,14 @@ void PvpUpdateObserver::update() // ---------------------------------------------------------------------- -void PvpUpdateObserverNamespace::sendUpdatePvpStatusMessage(Client const & client, std::hash_set const & requestedNetworkId, std::hash_map > & cachedNetworkId) +void PvpUpdateObserverNamespace::sendUpdatePvpStatusMessage(Client const & client, std::unordered_set const & requestedNetworkId, std::unordered_map > & cachedNetworkId) { uint32 flags, factionId; ServerObject const * serverObject; TangibleObject const * tangibleObject; - std::hash_map >::iterator iterCacheNetworkId; + std::unordered_map >::iterator iterCacheNetworkId; - for (std::hash_set::const_iterator iterRequestedNetworkId = requestedNetworkId.begin(); iterRequestedNetworkId != requestedNetworkId.end(); ++iterRequestedNetworkId) + for (std::unordered_set::const_iterator iterRequestedNetworkId = requestedNetworkId.begin(); iterRequestedNetworkId != requestedNetworkId.end(); ++iterRequestedNetworkId) { iterCacheNetworkId = cachedNetworkId.find(*iterRequestedNetworkId); if (iterCacheNetworkId == cachedNetworkId.end()) diff --git a/src/engine/server/library/serverGame/src/shared/region/Makefile.am b/src/engine/server/library/serverGame/src/shared/region/Makefile.am index 2bf0fc74b..7108e8e19 100644 --- a/src/engine/server/library/serverGame/src/shared/region/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/region/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedregion_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp b/src/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp index 3287ec670..de1363fc9 100644 --- a/src/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp +++ b/src/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp @@ -1141,8 +1141,7 @@ EnvironmentInfo RegionMasterNamspace::convertFromStringToEnvironmentInfo(std::st // Now we just search our map for the strings we just read in. If we find it, we add that flag to our output value. for(std::vector::size_type i = 0; i < parsedStringVector.size(); ++i) { - std::map::iterator searchIter = NULL; - searchIter = s_conversionMap.find(parsedStringVector[i]); + std::map::iterator searchIter = s_conversionMap.find(parsedStringVector[i]); if( searchIter != s_conversionMap.end()) { diff --git a/src/engine/server/library/serverGame/src/shared/region3d/Makefile.am b/src/engine/server/library/serverGame/src/shared/region3d/Makefile.am index e5586d4fa..3878f8575 100644 --- a/src/engine/server/library/serverGame/src/shared/region3d/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/region3d/Makefile.am @@ -27,7 +27,7 @@ libserverGamesharedregion3d_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/resource/Makefile.am b/src/engine/server/library/serverGame/src/shared/resource/Makefile.am index 75678db46..eded601db 100644 --- a/src/engine/server/library/serverGame/src/shared/resource/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/resource/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedresource_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/space/Makefile.am b/src/engine/server/library/serverGame/src/shared/space/Makefile.am index febecd3e7..bf43f4ba6 100644 --- a/src/engine/server/library/serverGame/src/shared/space/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/space/Makefile.am @@ -26,7 +26,7 @@ libserverGamesharedspace_la_CXXFLAGS=\ -I$(engine_dir)/shared/library/sharedSkillSystem/include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/space/SpacePath.cpp b/src/engine/server/library/serverGame/src/shared/space/SpacePath.cpp index 99a63cfbf..6c50cee87 100644 --- a/src/engine/server/library/serverGame/src/shared/space/SpacePath.cpp +++ b/src/engine/server/library/serverGame/src/shared/space/SpacePath.cpp @@ -13,8 +13,10 @@ #include "sharedDebug/Profiler.h" #include "sharedLog/Log.h" +#include #include #include +#include // ====================================================================== // diff --git a/src/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp b/src/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp index 10d6fc60e..332188c62 100644 --- a/src/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp +++ b/src/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp @@ -25,6 +25,7 @@ #include "sharedTerrain/TerrainObject.h" #include "sharedUtility/DataTable.h" +#include #include #include #include diff --git a/src/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/src/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp index a4ec08d2a..9113d33fc 100644 --- a/src/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp +++ b/src/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp @@ -16,7 +16,7 @@ #include "sharedObject/NetworkIdManager.h" #include -#include +#include // ====================================================================== @@ -37,7 +37,7 @@ namespace SpaceVisibilityManager_namespace typedef std::set ClientSet; typedef std::set ObjectSet; typedef std::map ClientToObjectMapType; - typedef std::hash_map TrackedObjectsType; + typedef std::unordered_map TrackedObjectsType; // Classes @@ -447,7 +447,7 @@ void Node::getAllVisibleObjects(std::vector & results) const { results.reserve(results.size() + m_visibleObjects.size()); - for (ObjectSet::iterator i=m_visibleObjects.begin(); i!=m_visibleObjects.end(); ++i) + for (ObjectSet::const_iterator i=m_visibleObjects.begin(); i!=m_visibleObjects.end(); ++i) { NOT_NULL(*i); results.push_back(&((*i)->getServerObject())); diff --git a/src/engine/server/library/serverGame/src/shared/stationplayers/Makefile.am b/src/engine/server/library/serverGame/src/shared/stationplayers/Makefile.am index f2a657c50..63c16b3f8 100644 --- a/src/engine/server/library/serverGame/src/shared/stationplayers/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/stationplayers/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedstationplayers_la_CXXFLAGS=-I$(srcdir)/../../../include/publi -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverGame/src/shared/synchronizedUi/Makefile.am b/src/engine/server/library/serverGame/src/shared/synchronizedUi/Makefile.am index cc3f1e673..ebc4457e0 100644 --- a/src/engine/server/library/serverGame/src/shared/synchronizedUi/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/synchronizedUi/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedsynchronizedUi_la_CXXFLAGS=-I$(srcdir)/../../../include/publi -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverGame/src/shared/trading/Makefile.am b/src/engine/server/library/serverGame/src/shared/trading/Makefile.am index a80de4ab9..f876db056 100644 --- a/src/engine/server/library/serverGame/src/shared/trading/Makefile.am +++ b/src/engine/server/library/serverGame/src/shared/trading/Makefile.am @@ -29,7 +29,7 @@ libserverGamesharedtrading_la_CXXFLAGS=-I$(srcdir)/../../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(boost_dir) \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverKeyShare/src/shared/Makefile.am b/src/engine/server/library/serverKeyShare/src/shared/Makefile.am index bbcdb9934..d24d1498e 100644 --- a/src/engine/server/library/serverKeyShare/src/shared/Makefile.am +++ b/src/engine/server/library/serverKeyShare/src/shared/Makefile.am @@ -14,7 +14,7 @@ libserverKeyShareshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ -I$(crypto_dir)/include \ diff --git a/src/engine/server/library/serverMetrics/src/shared/Makefile.am b/src/engine/server/library/serverMetrics/src/shared/Makefile.am index bb330c21b..4b22cf240 100644 --- a/src/engine/server/library/serverMetrics/src/shared/Makefile.am +++ b/src/engine/server/library/serverMetrics/src/shared/Makefile.am @@ -18,7 +18,7 @@ libserverMetricsshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverMetrics/src/shared/MetricsData.cpp b/src/engine/server/library/serverMetrics/src/shared/MetricsData.cpp index 25231ade9..20ffb1fc6 100644 --- a/src/engine/server/library/serverMetrics/src/shared/MetricsData.cpp +++ b/src/engine/server/library/serverMetrics/src/shared/MetricsData.cpp @@ -10,6 +10,7 @@ #include "sharedFoundation/ConfigFile.h" #include "sharedFoundation/Os.h" +#include #include //--------------------------------------------- @@ -46,7 +47,7 @@ m_frameTimeHistoryTotalTime(0.0f) { m_frameTimeHistorySize = 1; } - m_frameTimeHistory.reserve(m_frameTimeHistorySize); + m_frameTimeHistory.resize(m_frameTimeHistorySize); for (int i = 0; i < m_frameTimeHistorySize; ++i) { m_frameTimeHistory[i] = 0.0f; diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/Makefile.am index 1608a18f9..72dafefc7 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/Makefile.am @@ -35,7 +35,7 @@ INCLUDES=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/Makefile.am index 2f3b8bb12..b43e1a1b6 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/Makefile.am @@ -21,7 +21,7 @@ libserverNetworkMessagessharedcentralConnectionServer_la_CXXFLAGS=-I$(srcdir)/.. -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h b/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h index 2b31b52e9..c2b5c33a7 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h +++ b/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h @@ -1,5 +1,5 @@ // CSToolREquest.h -// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. // Author: Rob Hanz #ifndef _INCLUDED_GameServerCSResponse_H @@ -19,12 +19,12 @@ class GameServerCSResponseMessage: public GameNetworkMessage GameServerCSResponseMessage( const GameServerCSRequestMessage & source ); GameServerCSResponseMessage(Archive::ReadIterator & source); virtual ~GameServerCSResponseMessage (); - + uint32 getAccountId () const; const std::string & getResponse() const; uint32 getToolId() const; uint32 getLoginServerID() const; - + void setResponse( const std::string & response ); private: @@ -32,7 +32,7 @@ class GameServerCSResponseMessage: public GameNetworkMessage Archive::AutoVariable m_response; Archive::AutoVariable< uint32 > m_toolId; Archive::AutoVariable< uint32 > m_loginServerID; - + GameServerCSResponseMessage(); GameServerCSResponseMessage(const GameServerCSResponseMessage&); @@ -60,4 +60,4 @@ inline uint32 GameServerCSResponseMessage::getLoginServerID() const return m_loginServerID.get(); } -#endif //_INCLUDED_GameServerCSResponse_H \ No newline at end of file +#endif //_INCLUDED_GameServerCSResponse_H diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/Makefile.am index 185096072..d318c5874 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/Makefile.am @@ -21,7 +21,7 @@ libserverNetworkMessagessharedcentralGameServer_la_CXXFLAGS=-I$(srcdir)/../../in -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/Makefile.am index 33ddf3e7e..a17aa0bf2 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedcentralPlanetServer_la_CXXFLAGS=-I$(srcdir)/../../ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/Makefile.am index b17f27263..9db3759fa 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedcentralTaskManager_la_CXXFLAGS=-I$(srcdir)/../../i -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/Makefile.am index 408a146bb..4e45555f1 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedcommoditiesSwgDatabase_la_CXXFLAGS=-I$(srcdir)/../ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/core/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/core/Makefile.am index 7d4f21d9e..4e824f8d7 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/core/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/core/Makefile.am @@ -25,7 +25,7 @@ libserverNetworkMessagessharedcore_la_CXXFLAGS=-I$(srcdir)/../../include/public -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h b/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h index 22bf6cc02..230cc975f 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h @@ -16,13 +16,13 @@ #include "AuctionData.h" -#ifndef max - #define max(a, b) ((a > b) ? a : b) -#endif - -#ifndef min - #define min(a, b) ((a < b) ? a : b) -#endif +//#ifndef max +// #define max(a, b) ((a > b) ? a : b) +//#endif +// +//#ifndef min +// #define min(a, b) ((a < b) ? a : b) +//#endif enum AuctionSearchType { diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/Makefile.am index 18937967f..d98b0dfeb 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedgameCommoditiesServer_la_CXXFLAGS=-I$(srcdir)/../. -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/Makefile.am index 49512f5dd..1eeb34ed6 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedgameConnectionServer_la_CXXFLAGS=-I$(srcdir)/../.. -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h b/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h index 8c9cd914d..e87368e36 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h @@ -11,7 +11,7 @@ //====================================================================== #include "sharedFoundation/NetworkId.h" -#include "../../../../../../shared/library/sharedGame/include/public/sharedGame/LfgCharacterData.h" +#include "sharedGame/LfgCharacterData.h" class GroupMemberParam { diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/Makefile.am index 85bdad10f..1082e7e55 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/Makefile.am @@ -25,7 +25,7 @@ libserverNetworkMessagessharedgameGameServer_la_CXXFLAGS=-I$(srcdir)/../../inclu -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/Makefile.am index ba12231ce..9e9509ef1 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedgamePlanetServer_la_CXXFLAGS=-I$(srcdir)/../../inc -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/Makefile.am index f33e20fb9..8b683673e 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedgameStationPlayersCollector_la_CXXFLAGS=-I$(srcdir -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/Makefile.am index 2948d7fe0..5d83d56fe 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedgameTaskManager_la_CXXFLAGS=-I$(srcdir)/../../incl -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/Makefile.am index 1d15a1875..fe508665f 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/Makefile.am @@ -21,7 +21,7 @@ libserverNetworkMessagessharedloginCentralServer_la_CXXFLAGS=-I$(srcdir)/../../i -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/Makefile.am index 4555fc1ca..65012537b 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/Makefile.am @@ -20,7 +20,7 @@ libserverNetworkMessagessharedmetricsMessages_la_CXXFLAGS=-I$(srcdir)/../../incl -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/Makefile.am b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/Makefile.am index f8e127315..62e90ebc4 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/Makefile.am +++ b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/Makefile.am @@ -21,7 +21,7 @@ libserverNetworkMessagessharedtransferServer_la_CXXFLAGS=-I$(srcdir)/../../inclu -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h index 2d7921a9e..528f873d0 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h +++ b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h @@ -68,7 +68,7 @@ public: const std::string & getSkillTemplate () const; const std::string & getWorkingSkill () const; TransferRequestMoveValidation::TransferRequestSource getTransferRequestSource() const; - + const unsigned int getCSToolId () const; void setCharacterId (const NetworkId & characterId); @@ -101,14 +101,14 @@ public: void setAllowOverride (const bool allowOverride); void setSkillTemplate (const std::string & skillTemplate); void setWorkingSkill (const std::string & workingSkill); - + void setCSToolId (const unsigned int toolId); - + private: TransferCharacterData(); - friend Archive::AutoVariable; - friend std::pair; + friend class Archive::AutoVariable; + friend struct std::pair; friend void Archive::get(Archive::ReadIterator & source, TransferCharacterData & target); unsigned int m_track; @@ -142,7 +142,7 @@ private: std::string m_skillTemplate; std::string m_workingSkill; TransferRequestMoveValidation::TransferRequestSource m_transferRequestSource; - + unsigned int m_csToolId; }; diff --git a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h index 6f6a0d1e5..157612f9c 100644 --- a/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h +++ b/src/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h @@ -8,6 +8,7 @@ //----------------------------------------------------------------------- #include "serverNetworkMessages/AvatarList.h" #include "serverNetworkMessages/AvatarListArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include diff --git a/src/engine/server/library/serverPathfinding/src/shared/Makefile.am b/src/engine/server/library/serverPathfinding/src/shared/Makefile.am index dd6b1f30d..a4b3de15e 100644 --- a/src/engine/server/library/serverPathfinding/src/shared/Makefile.am +++ b/src/engine/server/library/serverPathfinding/src/shared/Makefile.am @@ -29,7 +29,7 @@ libserverPathfindingshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(boost_dir) \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ diff --git a/src/engine/server/library/serverPathfinding/src/shared/ServerPathBuildManager.cpp b/src/engine/server/library/serverPathfinding/src/shared/ServerPathBuildManager.cpp index 0b8bf2a53..617cabaed 100644 --- a/src/engine/server/library/serverPathfinding/src/shared/ServerPathBuildManager.cpp +++ b/src/engine/server/library/serverPathfinding/src/shared/ServerPathBuildManager.cpp @@ -12,6 +12,7 @@ #include "sharedDebug/PerformanceTimer.h" +#include #include typedef std::list< ServerPathBuilder * > BuildQueue; diff --git a/src/engine/server/library/serverScript/src/shared/ConfigServerScript.cpp b/src/engine/server/library/serverScript/src/shared/ConfigServerScript.cpp index ab721d566..434a64d93 100644 --- a/src/engine/server/library/serverScript/src/shared/ConfigServerScript.cpp +++ b/src/engine/server/library/serverScript/src/shared/ConfigServerScript.cpp @@ -64,8 +64,7 @@ void ConfigServerScript::install(void) { data = &staticData; - KEY_STRING (scriptPath, "../../data/sku.0/sys.server/plt.shared/loc.shared" - "/compiled/game/script"); + KEY_STRING (scriptPath, "../../data/sku.0/sys.server/compiled/game/script"); KEY_STRING (javaLibPath, "./jvm"); KEY_STRING (javaDebugPort, "8000"); KEY_BOOL (useRemoteDebugJava, false); diff --git a/src/engine/server/library/serverScript/src/shared/GameScriptObject.cpp b/src/engine/server/library/serverScript/src/shared/GameScriptObject.cpp index c2d5c40f7..c93ebbf47 100644 --- a/src/engine/server/library/serverScript/src/shared/GameScriptObject.cpp +++ b/src/engine/server/library/serverScript/src/shared/GameScriptObject.cpp @@ -28,6 +28,7 @@ #include "serverGame/ServerObject.h" #include +#include #ifdef _WIN32 diff --git a/src/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/src/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index a6b557722..827481736 100644 --- a/src/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/src/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -78,6 +78,9 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...) va_start(marker, constructorID); LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->NewObjectV(clazz, constructorID, marker))); + + va_end(marker); + if (result->getValue() == 0) return LocalRef::cms_nullPtr; return result; @@ -187,8 +190,11 @@ LocalRefPtr callObjectMethod(const LocalRefParam & object, jmethodID methodID, . { va_list marker; va_start(marker, methodID); - + LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -205,6 +211,9 @@ LocalObjectArrayRefPtr callObjectArrayMethod(const LocalRefParam & object, jmeth va_start(marker, methodID); LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -221,6 +230,9 @@ LocalByteArrayRefPtr callByteArrayMethod(const LocalRefParam & object, jmethodID va_start(marker, methodID); LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -236,7 +248,11 @@ jint callIntMethod(const LocalRefParam & object, jmethodID methodID, ...) va_list marker; va_start(marker, methodID); - return JavaLibrary::getEnv()->CallIntMethodV(object.getValue(), methodID, marker); + jint result = JavaLibrary::getEnv()->CallIntMethodV(object.getValue(), methodID, marker); + + va_end(marker); + + return result; } return 0; } @@ -250,7 +266,11 @@ jlong callLongMethod(const LocalRefParam & object, jmethodID methodID, ...) va_list marker; va_start(marker, methodID); - return JavaLibrary::getEnv()->CallLongMethodV(object.getValue(), methodID, marker); + jlong result = JavaLibrary::getEnv()->CallLongMethodV(object.getValue(), methodID, marker); + + va_end(marker); + + return result; } return 0; } @@ -264,7 +284,11 @@ jfloat callFloatMethod(const LocalRefParam & object, jmethodID methodID, ...) va_list marker; va_start(marker, methodID); - return JavaLibrary::getEnv()->CallFloatMethodV(object.getValue(), methodID, marker); + jfloat result = JavaLibrary::getEnv()->CallFloatMethodV(object.getValue(), methodID, marker); + + va_end(marker); + + return result; } return 0; } @@ -278,7 +302,11 @@ jboolean callBooleanMethod(const LocalRefParam & object, jmethodID methodID, ... va_list marker; va_start(marker, methodID); - return JavaLibrary::getEnv()->CallBooleanMethodV(object.getValue(), methodID, marker); + jboolean result = JavaLibrary::getEnv()->CallBooleanMethodV(object.getValue(), methodID, marker); + + va_end(marker); + + return result; } return JNI_FALSE; } @@ -293,6 +321,8 @@ void callVoidMethod(const LocalRefParam & object, jmethodID methodID, ...) va_start(marker, methodID); JavaLibrary::getEnv()->CallVoidMethodV(object.getValue(), methodID, marker); + + va_end(marker); } } @@ -305,7 +335,11 @@ jboolean callNonvirtualBooleanMethod(const LocalRefParam & object, jclass clazz, va_list marker; va_start(marker, methodID); - return JavaLibrary::getEnv()->CallNonvirtualBooleanMethodV(object.getValue(), clazz, methodID, marker); + jboolean result = JavaLibrary::getEnv()->CallNonvirtualBooleanMethodV(object.getValue(), clazz, methodID, marker); + + va_end(marker); + + return result; } return JNI_FALSE; } @@ -318,6 +352,8 @@ void callStaticVoidMethod(jclass clazz, jmethodID methodID, ...) va_start(marker, methodID); JavaLibrary::getEnv()->CallStaticVoidMethodV(clazz, methodID, marker); + + va_end(marker); } //----------------------------------------------------------------------- @@ -328,6 +364,9 @@ LocalRefPtr callStaticObjectMethod(jclass clazz, jmethodID methodID, ...) va_start(marker, methodID); LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))); + + va_end(marker); + if (result->getValue() == 0) return LocalRef::cms_nullPtr; return result; @@ -341,6 +380,9 @@ LocalObjectArrayRefPtr callStaticObjectArrayMethod(jclass clazz, jmethodID metho va_start(marker, methodID); LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() == 0) return LocalObjectArrayRef::cms_nullPtr; return result; @@ -354,6 +396,9 @@ LocalByteArrayRefPtr callStaticByteArrayMethod(jclass clazz, jmethodID methodID, va_start(marker, methodID); LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() == 0) return LocalByteArrayRef::cms_nullPtr; return result; @@ -407,6 +452,9 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID, va_start(marker, methodID); jobject result = JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker); + + va_end(marker); + if (result != 0) { #ifdef _DEBUG @@ -432,6 +480,9 @@ JavaStringPtr callStaticStringMethod(jclass clazz, jmethodID methodID, ...) JavaStringPtr result(new JavaString(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; return JavaString::cms_nullPtr; diff --git a/src/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/src/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index d6cb2448e..f2c3ad701 100644 --- a/src/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/src/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -879,7 +879,8 @@ void JavaLibrary::fatalHandler(int signum) else { // destroy Java threads - pthread_kill_other_threads_np(); + // @note apathy - this pthread method is not in later versions of glibc + //pthread_kill_other_threads_np(); ms_instance = NULL; ms_env = NULL; ms_jvm = NULL; @@ -5836,7 +5837,7 @@ const bool convert(const std::vector &source, LocalLongArrayRefPtr & return rv; } -const bool ScriptConversion::convert(const jobject & source, Vector &target, NetworkId & targetCell) +const bool convert(const jobject & source, Vector &target, NetworkId & targetCell) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -5867,7 +5868,7 @@ const bool ScriptConversion::convert(const jobject & source, Vector &target, Net return false; } -const bool ScriptConversion::convertWorld(const jobject & source, Vector &target) +const bool convertWorld(const jobject & source, Vector &target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -5900,7 +5901,7 @@ const bool ScriptConversion::convertWorld(const jobject & source, Vector &target return false; } -const bool ScriptConversion::convertWorld(const jlong & source, Vector &target) +const bool convertWorld(const jlong & source, Vector &target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -5919,17 +5920,17 @@ const bool ScriptConversion::convertWorld(const jlong & source, Vector &target) return false; } -const bool ScriptConversion::convertWorld(const LocalRefParam & source, Vector &target) +const bool convertWorld(const LocalRefParam & source, Vector &target) { return convertWorld(source.getValue(), target); } -const bool ScriptConversion::convert(const Vector & source, const NetworkId & sourceCell, LocalRefPtr & target) +const bool convert(const Vector & source, const NetworkId & sourceCell, LocalRefPtr & target) { return convert(source, ServerWorld::getSceneId(), sourceCell, target); } -const bool ScriptConversion::convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell) +const bool convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -5973,7 +5974,7 @@ const bool ScriptConversion::convert(const jobject & source, Vector & targetLoc, return false; } -const bool ScriptConversion::convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId) +const bool convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6019,7 +6020,7 @@ const bool ScriptConversion::convertWorld(const jobject & source, Vector & targe return false; } -const bool ScriptConversion::convert(const Location & sourceLoc, LocalRefPtr & target) +const bool convert(const Location & sourceLoc, LocalRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6042,7 +6043,7 @@ const bool ScriptConversion::convert(const Location & sourceLoc, LocalRefPtr & return true; } -const bool ScriptConversion::convert(const LocalRefParam & sourceLoc, Location & target) +const bool convert(const LocalRefParam & sourceLoc, Location & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6069,7 +6070,7 @@ const bool ScriptConversion::convert(const LocalRefParam & sourceLoc, Location & return true; } -const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, std::vector & target) +const bool convert(const LocalObjectArrayRefParam & sourceLoc, std::vector & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6089,7 +6090,7 @@ const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, return true; } -const bool ScriptConversion::convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target) +const bool convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6112,7 +6113,7 @@ const bool ScriptConversion::convert(const Vector & sourceLoc, const std::string return true; } -const bool ScriptConversion::convertWorld(const jobjectArray & source, std::vector &target) +const bool convertWorld(const jobjectArray & source, std::vector &target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6141,7 +6142,7 @@ const bool ScriptConversion::convertWorld(const jobjectArray & source, std::vect return result && !target.empty(); } -const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & target) +const bool convert(const std::vector & source, LocalObjectArrayRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6175,14 +6176,14 @@ const bool ScriptConversion::convert(const std::vector & source, return result; } -const bool ScriptConversion::convert(const LocalRefParam & source, const Region * & target) +const bool convert(const LocalRefParam & source, const Region * & target) { return convert(source.getValue(), target); } /** This method converts a java script.region class into a C++ Region class */ -const bool ScriptConversion::convert(const jobject & source, const Region * &target) +const bool convert(const jobject & source, const Region * &target) { JNIEnv * env = JavaLibrary::getEnv(); if (env == NULL || source == NULL) @@ -6206,7 +6207,7 @@ const bool ScriptConversion::convert(const jobject & source, const Region * &tar /** This method converts a C++ RegionObject class into a Java script.region class */ -const bool ScriptConversion::convert(const Region & source, LocalRefPtr & target) +const bool convert(const Region & source, LocalRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env) @@ -6234,7 +6235,7 @@ const bool ScriptConversion::convert(const Region & source, LocalRefPtr & target // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(Transform const &sourceTransform, LocalRefPtr &target) +const bool convert(Transform const &sourceTransform, LocalRefPtr &target) { JNIEnv * const env = JavaLibrary::getEnv(); if (!env) @@ -6253,7 +6254,7 @@ const bool ScriptConversion::convert(Transform const &sourceTransform, LocalRefP // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const jobject &sourceTransform, Transform &target) +const bool convert(const jobject &sourceTransform, Transform &target) { JNIEnv * const env = JavaLibrary::getEnv(); if (!env || !sourceTransform) @@ -6285,14 +6286,14 @@ const bool ScriptConversion::convert(const jobject &sourceTransform, Transform & // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const LocalRefParam &sourceTransform, Transform &target) +const bool convert(const LocalRefParam &sourceTransform, Transform &target) { return convert(sourceTransform.getValue(), target); } // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const jobjectArray & source, std::vector &target) +const bool convert(const jobjectArray & source, std::vector &target) { JNIEnv * const env = JavaLibrary::getEnv(); if (!env) @@ -6322,7 +6323,7 @@ const bool ScriptConversion::convert(const jobjectArray & source, std::vector &source, LocalObjectArrayRefPtr & target) +const bool convert(const std::vector &source, LocalObjectArrayRefPtr & target) { JNIEnv * const env = JavaLibrary::getEnv(); if (!env) @@ -6362,7 +6363,7 @@ const bool ScriptConversion::convert(const std::vector &source, Local // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const Vector &sourceVector, LocalRefPtr &target) +const bool convert(const Vector &sourceVector, LocalRefPtr &target) { JNIEnv *env = JavaLibrary::getEnv(); if (!env) @@ -6380,7 +6381,7 @@ const bool ScriptConversion::convert(const Vector &sourceVector, LocalRefPtr &ta // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const jobject & sourceVector, Vector & target) +const bool convert(const jobject & sourceVector, Vector & target) { JNIEnv *env = JavaLibrary::getEnv(); if (!env || !sourceVector) @@ -6396,7 +6397,7 @@ const bool ScriptConversion::convert(const jobject & sourceVector, Vector & targ // ---------------------------------------------------------------------- -const bool ScriptConversion::convert(const LocalRefParam & sourceVector, Vector & target) +const bool convert(const LocalRefParam & sourceVector, Vector & target) { return convert(sourceVector.getValue(), target); } diff --git a/src/engine/server/library/serverScript/src/shared/Makefile.am b/src/engine/server/library/serverScript/src/shared/Makefile.am index c3af26bc6..754e4167a 100644 --- a/src/engine/server/library/serverScript/src/shared/Makefile.am +++ b/src/engine/server/library/serverScript/src/shared/Makefile.am @@ -31,7 +31,7 @@ libserverScriptshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedTerrain/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(boost_dir) \ diff --git a/src/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h b/src/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h index 3b47c9321..72d7b67d1 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h +++ b/src/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h @@ -9,7 +9,7 @@ #ifndef _INCLUDED_ScriptFuncTable_H #define _INCLUDED_ScriptFuncTable_H -#include +#include namespace Scripting { @@ -495,7 +495,7 @@ struct ScriptFuncTable const char *argList; }; -typedef std::hash_map< int, const ScriptFuncTable * > _ScriptFuncHashMap; +typedef std::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap; extern _ScriptFuncHashMap *ScriptFuncHashMap; extern void InitScriptFuncHashMap(void); extern void RemoveScriptFuncHashMap(void); diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsActionStates.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsActionStates.cpp index 80bb47820..cc17ad420 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsActionStates.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsActionStates.cpp @@ -127,7 +127,7 @@ void JNICALL ScriptMethodsActionStatesNamespace::stop(JNIEnv *env, jobject , jlo jboolean JNICALL ScriptMethodsActionStatesNamespace::follow(JNIEnv *env, jobject self, jlong mob, jlong target, jfloat minDist, jfloat maxDist) { UNREF(self); - + if (mob == 0 || target == 0) return JNI_FALSE; @@ -168,7 +168,7 @@ jboolean JNICALL ScriptMethodsActionStatesNamespace::follow(JNIEnv *env, jobject jboolean JNICALL ScriptMethodsActionStatesNamespace::followOffset(JNIEnv *env, jobject self, jlong mob, jlong target, jobject offset) { UNREF(self); - + if (mob == 0 || target == 0) return JNI_FALSE; @@ -213,7 +213,7 @@ jboolean JNICALL ScriptMethodsActionStatesNamespace::followOffset(JNIEnv *env, j jboolean JNICALL ScriptMethodsActionStatesNamespace::swarm(JNIEnv *env, jobject self, jlong mob, jlong target) { UNREF(self); - + if (mob == 0 || target == 0) return JNI_FALSE; @@ -253,7 +253,7 @@ jboolean JNICALL ScriptMethodsActionStatesNamespace::swarm(JNIEnv *env, jobject jboolean JNICALL ScriptMethodsActionStatesNamespace::swarm2(JNIEnv *env, jobject self, jlong mob, jlong target, jfloat offset) { UNREF(self); - + if (mob == 0 || target == 0) return JNI_FALSE; @@ -355,10 +355,10 @@ jboolean JNICALL ScriptMethodsActionStatesNamespace::wanderAngleDelay(JNIEnv *en //------------------------------------------------------------------------------------------------ /** - * Stops the current movement type of the creature, allowing it to be resumed at a - * later time. - * - * NOTE: Only one movement can be suspended at a time. If this function + * Stops the current movement type of the creature, allowing it to be resumed at a + * later time. + * + * NOTE: Only one movement can be suspended at a time. If this function * is called while a previous movement is suspended, it will fail. * * @return true if the movement has been suspended, false if not. @@ -488,4 +488,4 @@ jboolean JNICALL ScriptMethodsActionStatesNamespace::isCreatureStatic(JNIEnv *en return object->getIsStatic() ? JNI_TRUE : JNI_FALSE; } -//------------------------------------------------------------------------------------------------ \ No newline at end of file +//------------------------------------------------------------------------------------------------ diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp index 7c5cc5ca7..266b10f8c 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp @@ -19,6 +19,8 @@ #include "sharedGame/GameObjectTypes.h" #include "swgSharedUtility/CombatEngineData.h" +#include + using namespace JNIWrappersNamespace; diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsBuff.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsBuff.cpp index ce41c8143..706ef92f1 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsBuff.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsBuff.cpp @@ -320,7 +320,7 @@ jfloat JNICALL ScriptMethodsBuffNamespace::getBuffTimeRemaining(JNIEnv *env, job { currentTime = ServerClock::getInstance().getGameTimeSeconds(); } - + jfloat timeLeft = 0.0f; if (b.m_timestamp == 0xFFFFFFFF) @@ -336,7 +336,7 @@ jfloat JNICALL ScriptMethodsBuffNamespace::getBuffTimeRemaining(JNIEnv *env, job timeLeft = static_cast( static_cast(b.m_timestamp) - static_cast(currentTime)); } - return timeLeft; + return timeLeft; } } return static_cast(b.m_timestamp - creature->getPseudoPlayedTime()); @@ -391,7 +391,7 @@ jlong JNICALL ScriptMethodsBuffNamespace::getBuffStackCount(JNIEnv *env, jobject Buff b; if(!creature->getBuff(nameCrc, b)) return 0; - + return static_cast(b.m_stackCount); } // JavaLibrary::getBuffStackCount @@ -402,7 +402,7 @@ jlong JNICALL ScriptMethodsBuffNamespace::getBuffStackCount(JNIEnv *env, jobject * * @param env Java environment * @param self class calling this function -* @param target the creature to decrement +* @param target the creature to decrement * @param nameCrc the buff crc to get info for * * @return false if the buff doesn't exist - true if it succeeded @@ -469,4 +469,4 @@ jboolean JNICALL ScriptMethodsBuffNamespace::decayBuff(JNIEnv *env, jobject self return JNI_TRUE; } -//-------------------------------------------------------- \ No newline at end of file +//-------------------------------------------------------- diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp index 3247ab413..ed91aacca 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp @@ -739,14 +739,14 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObjec return JNI_FALSE; NetworkId sourceId = sourceObject->getNetworkId(); - + // The target of our effect ServerObject* targetObject = NULL; if (!JavaLibrary::getObject(target, targetObject)) return JNI_FALSE; NetworkId targetId = targetObject->getNetworkId(); - + // Optional Source hardpoint JavaStringParam localSourceHardpointName(sourceHardpoint); std::string sourceHardpointString; @@ -797,7 +797,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObje return JNI_FALSE; NetworkId sourceId = sourceObject->getNetworkId(); - + // Optional Source hardpoint JavaStringParam localSourceHardpointName(sourceHardpoint); std::string sourceHardpointString; @@ -868,7 +868,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileLocat Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL; NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid; - CreateClientProjectileLocationToObjectMessage const ccpmlto(weaponObjectTemplateNameString, sourceLocationVec, networkIdForCellOrWorld, targetId, targetHardpointString, + CreateClientProjectileLocationToObjectMessage const ccpmlto(weaponObjectTemplateNameString, sourceLocationVec, networkIdForCellOrWorld, targetId, targetHardpointString, speed, expiration, trail, PackedArgb(static_cast(a), static_cast(r), static_cast(g), static_cast(b)).getArgb()); so->sendToClientsInUpdateRange(ccpmlto, true); @@ -960,4 +960,4 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::hasObjectEffect(JNIEnv * en return tang->hasObjectEffect(localLabel); } -//----------------------------------------------------------------------- \ No newline at end of file +//----------------------------------------------------------------------- diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp index 28e55e360..3f4e8f619 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp @@ -1121,7 +1121,7 @@ jobject JNICALL ScriptMethodsDataTableNamespace::dataTableGetRow(JNIEnv *env, jo LocalRefPtr target = createNewObject(JavaLibrary::getClsDictionary(), JavaLibrary::getMidDictionary()); if (target == LocalRef::cms_nullPtr) - return false; + return 0; for (int i = 0; i < dt->getNumColumns(); ++i) { diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp index 87d142d0a..c4dd20c1f 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp @@ -876,7 +876,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::setMentalStateTowardArray(J if (!ScriptConversion::convert(target, targetIds)) return JNI_FALSE; - std::vector::iterator i; + std::vector::iterator i; for (i=targetIds.begin(); i!=targetIds.end(); ++i) { creature->setMentalStateToward(*i, static_cast(mentalState), @@ -911,7 +911,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::addToMentalStateTowardArray if (!ScriptConversion::convert(target, targetIds)) return JNI_FALSE; - std::vector::iterator i; + std::vector::iterator i; for (i=targetIds.begin(); i!=targetIds.end(); ++i) { MentalStates::Value current = creature->getMentalStateToward(*i, static_cast(mentalState)); diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 8075cb7c9..9c4fb1da5 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -2310,7 +2310,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isFacing(JNIEnv *env, jobject Vector positionInObjectSpace = object->rotateTranslate_w2o (v); real theta = positionInObjectSpace.theta (); - if (abs(theta) <= PI_OVER_4) + if (std::abs(theta) <= PI_OVER_4) return JNI_TRUE; else return JNI_FALSE; @@ -2559,7 +2559,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::areFacingEachOther(JNIEnv *en Vector positionInObjectSpace = object1->rotateTranslate_w2o (object2->getPosition_w()); real theta = positionInObjectSpace.theta (); - if (abs(theta) > PI_OVER_4) + if (std::abs(theta) > PI_OVER_4) return JNI_FALSE; else { @@ -2567,7 +2567,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::areFacingEachOther(JNIEnv *en Vector positionInObjectSpace2 = object2->rotateTranslate_w2o (object1->getPosition_w()); real theta2 = positionInObjectSpace2.theta (); - if (abs(theta2) > PI_OVER_4) + if (std::abs(theta2) > PI_OVER_4) return JNI_FALSE; else return JNI_TRUE; @@ -6543,7 +6543,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env { SlottedContainmentProperty::SlotArrangement const slots = slottedContainment->getSlotArrangement(slottedContainment->getCurrentArrangement()); // Get the old arrangement for(unsigned int j = 0; j < slots.size(); ++j) - wornObjects.insert(std::make_pair(slots[j], item)); + wornObjects.insert(std::make_pair(slots[j], item)); } } } @@ -6586,7 +6586,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env if(!slotOccupied) { for(unsigned int j = 0; j < slots.size(); ++j) - wornObjects.insert(std::make_pair(slots[j], item)); + wornObjects.insert(std::make_pair(slots[j], item)); } } } diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp index 3830b6814..00aa9c9dd 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp @@ -38,7 +38,7 @@ #include "serverUtility/FreeCtsDataTable.h" #include "UnicodeUtils.h" -#include +#include using namespace JNIWrappersNamespace; @@ -434,7 +434,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse UNREF(self); NOT_NULL(env); - static std::hash_set accountsQualifiedForHousePackup; + static std::unordered_set accountsQualifiedForHousePackup; if (accountsQualifiedForHousePackup.empty()) { DataTable * table = DataTableManager::getTable(ConfigServerGame::getHousePackupAccountListDataTableName(), true); diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp index b866cd4b9..2e5234199 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp @@ -181,7 +181,7 @@ jboolean ScriptMethodsPlayerQuestNamespace::addPlayerQuestTask(JNIEnv * env, job } return JNI_FALSE; } - + std::string formatedWaypoint; char buffer[256]; memset(buffer, 0, 256); @@ -247,7 +247,7 @@ jintArray ScriptMethodsPlayerQuestNamespace::getAllPlayerQuestTaskStatus(JNIEnv WARNING(true, ("getAllPlayerQuestTaskStatus: Could not get valid Player Quest Object from OID: %d", quest)); return 0; } - + std::vector taskStatus; questObject->getTaskStatus(taskStatus); @@ -783,7 +783,7 @@ void ScriptMethodsPlayerQuestNamespace::openPlayerQuestRecipe(JNIEnv * env, jobj } if (playerCreature->isPlayerControlled() && playerCreature->getController() != NULL) - { + { playerCreature->getController()->appendMessage( static_cast(CM_openRecipe), 0, @@ -807,9 +807,9 @@ void ScriptMethodsPlayerQuestNamespace::resetAllPlayerQuestData(JNIEnv * env, jo DEBUG_WARNING(true, ("resetAllPlayerQuestData: Failed to get valid recipe object with OID %d", quest)); return; } - + if(playerQuest) playerQuest->resetAllData(); return; -} \ No newline at end of file +} diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp index 75d80239d..9a393578d 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp @@ -1165,4 +1165,4 @@ jlong JNICALL ScriptMethodsRegionNamespace::createCircleRegionWithSpawn(JNIEnv * maxDifficulty, spawnable, mission, visible, notify, Unicode::wideToNarrow(spawnDataTable), duration); return regionObject.getValue(); -} \ No newline at end of file +} diff --git a/src/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp b/src/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp index df5453bfe..ae184f4b7 100644 --- a/src/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp +++ b/src/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp @@ -23,6 +23,9 @@ #include "sharedSkillSystem/SkillObject.h" #include "UnicodeUtils.h" + +#include + using namespace JNIWrappersNamespace; diff --git a/src/engine/server/library/serverUtility/src/linux/Makefile.am b/src/engine/server/library/serverUtility/src/linux/Makefile.am index 57677eb55..61326fc90 100644 --- a/src/engine/server/library/serverUtility/src/linux/Makefile.am +++ b/src/engine/server/library/serverUtility/src/linux/Makefile.am @@ -18,7 +18,7 @@ libserverUtilitylinux_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedRandom/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverUtility/src/linux/stlhack.cpp b/src/engine/server/library/serverUtility/src/linux/stlhack.cpp index 3053178aa..5b63831a6 100644 --- a/src/engine/server/library/serverUtility/src/linux/stlhack.cpp +++ b/src/engine/server/library/serverUtility/src/linux/stlhack.cpp @@ -1,22 +1,23 @@ //#include "FirstGame.h" -#include //without this we get an internal compiler error +//#include //without this we get an internal compiler error // This resolves a problem with stlport compiling under gcc 2.91 that ships with RedHat 6.2. // Basically, the compiler has trouble instantiating an instance of _Stl_prime without it // being explicitly defined. So we have to instantiate one. // We should try removing this file when either we a) upgrade the compiler or b) upgrate the OS. -#define __stl_num_primes 28 -#define __PRIME_LIST_BODY { \ - 53ul, 97ul, 193ul, 389ul, 769ul, \ - 1543ul, 3079ul, 6151ul, 12289ul, 24593ul, \ - 49157ul, 98317ul, 196613ul, 393241ul, 786433ul, \ - 1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul, \ - 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,\ - 1610612741ul, 3221225473ul, 4294967291ul \ -} - -template <> const size_t std::_Stl_prime::_M_list[__stl_num_primes] = __PRIME_LIST_BODY; - -#undef __stl_num_primes -#undef __PRIME_LIST_BODY +//#define __stl_num_primes 28 +//#define __PRIME_LIST_BODY { \ +// 53ul, 97ul, 193ul, 389ul, 769ul, \ +// 1543ul, 3079ul, 6151ul, 12289ul, 24593ul, \ +// 49157ul, 98317ul, 196613ul, 393241ul, 786433ul, \ +// 1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul, \ +// 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,\ +// 1610612741ul, 3221225473ul, 4294967291ul \ +//} +// +//template <> const size_t std::_Stl_prime::_M_list[__stl_num_primes] = __PRIME_LIST_BODY; +// +//#undef __stl_num_primes +//#undef __PRIME_LIST_BODY +// \ No newline at end of file diff --git a/src/engine/server/library/serverUtility/src/shared/Makefile.am b/src/engine/server/library/serverUtility/src/shared/Makefile.am index a6bd5054b..06c7a34a3 100644 --- a/src/engine/server/library/serverUtility/src/shared/Makefile.am +++ b/src/engine/server/library/serverUtility/src/shared/Makefile.am @@ -20,7 +20,7 @@ libserverUtilityshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(singleton_dir)/include \ -I$(udplibrary_dir) \ -I$(archive_dir)/include \ diff --git a/src/engine/server/library/serverUtility/src/shared/PopulationList.cpp b/src/engine/server/library/serverUtility/src/shared/PopulationList.cpp index 9b5346d90..80db4b1eb 100644 --- a/src/engine/server/library/serverUtility/src/shared/PopulationList.cpp +++ b/src/engine/server/library/serverUtility/src/shared/PopulationList.cpp @@ -61,7 +61,7 @@ int PopulationList::getNearestPopulation(const std::string &scene, int x, int z) } } } - m_populationCache.insert(std::make_pair(where,population)); + m_populationCache.insert(std::make_pair(where,population)); return population; } } diff --git a/src/engine/shared/application/ArmorExporterTool/src/linux/Makefile.am b/src/engine/shared/application/ArmorExporterTool/src/linux/Makefile.am index a4b209460..7c7371385 100644 --- a/src/engine/shared/application/ArmorExporterTool/src/linux/Makefile.am +++ b/src/engine/shared/application/ArmorExporterTool/src/linux/Makefile.am @@ -22,7 +22,7 @@ ArmorExporterTool_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryMan $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a ArmorExporterTool_LDFLAGS=-lpthread -ldl -lm -lncurses -lz @@ -84,7 +84,7 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/localization/liblocalization.la: make -C $(top_builddir)/../external/ours/library/localization -$(stlport_dir)/lib/libstlport_gcc.a: - cd $(stlport_dir)/src && $(MAKE) -j1 -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/ArmorExporterTool/src/shared/Makefile.am b/src/engine/shared/application/ArmorExporterTool/src/shared/Makefile.am index 518f0ca52..5331cb6c5 100644 --- a/src/engine/shared/application/ArmorExporterTool/src/shared/Makefile.am +++ b/src/engine/shared/application/ArmorExporterTool/src/shared/Makefile.am @@ -29,7 +29,7 @@ libArmorExporterToolshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -I$(boost_dir) \ diff --git a/src/engine/shared/application/CoreWeaponExporterTool/src/linux/Makefile.am b/src/engine/shared/application/CoreWeaponExporterTool/src/linux/Makefile.am index c4241f865..f9a06a513 100644 --- a/src/engine/shared/application/CoreWeaponExporterTool/src/linux/Makefile.am +++ b/src/engine/shared/application/CoreWeaponExporterTool/src/linux/Makefile.am @@ -22,7 +22,7 @@ CoreWeaponExporterTool_LDADD=$(top_builddir)/../engine/shared/library/sharedMemo $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a CoreWeaponExporterTool_LDFLAGS=-lpthread -ldl -lm -lncurses -lz @@ -84,7 +84,7 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/localization/liblocalization.la: make -C $(top_builddir)/../external/ours/library/localization -$(stlport_dir)/lib/libstlport_gcc.a: - cd $(stlport_dir)/src && $(MAKE) -j1 -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/CoreWeaponExporterTool/src/shared/Makefile.am b/src/engine/shared/application/CoreWeaponExporterTool/src/shared/Makefile.am index 7d1e0426c..9795814b3 100644 --- a/src/engine/shared/application/CoreWeaponExporterTool/src/shared/Makefile.am +++ b/src/engine/shared/application/CoreWeaponExporterTool/src/shared/Makefile.am @@ -29,7 +29,7 @@ libCoreWeaponExporterToolshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -I$(boost_dir) \ diff --git a/src/engine/shared/application/DataLintRspBuilder/src/win32/StdAfx.h b/src/engine/shared/application/DataLintRspBuilder/src/win32/StdAfx.h index abe0b4a68..399e6eb71 100644 --- a/src/engine/shared/application/DataLintRspBuilder/src/win32/StdAfx.h +++ b/src/engine/shared/application/DataLintRspBuilder/src/win32/StdAfx.h @@ -13,7 +13,7 @@ #define VC_EXTRALEAN -#include +#include "../../../../../../external/3rd/library/atlmfc/include/afxwin.h" #pragma warning(disable: 4786) diff --git a/src/engine/shared/application/DataTableTool/src/linux/Makefile.am b/src/engine/shared/application/DataTableTool/src/linux/Makefile.am index f2d9a83b1..1692cd5f8 100644 --- a/src/engine/shared/application/DataTableTool/src/linux/Makefile.am +++ b/src/engine/shared/application/DataTableTool/src/linux/Makefile.am @@ -21,7 +21,7 @@ DataTableTool_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(top_builddir)/../engine/shared/library/sharedSynchronization/libsharedSynchronization.la @@ -84,7 +84,7 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/localization/liblocalization.la: make -C $(top_builddir)/../external/ours/library/localization -$(stlport_dir)/lib/libstlport_gcc.a: - cd $(stlport_dir)/src && $(MAKE) -j1 -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp b/src/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp index ea8a04af6..19d88c666 100644 --- a/src/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp +++ b/src/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp @@ -135,7 +135,7 @@ int main(int argc, char **argv) // ---------------------------------------------------------------------- void DataTableTool::run(void) { - bool isXml = false; + //bool isXml = false; int testOutput = 0; printf ("DataTable creation tool " __DATE__ " " __TIME__ "\n"); @@ -157,7 +157,7 @@ void DataTableTool::run(void) m_inputFile = CommandLine::getOptionString(SNAME_INPUT_FILE); - isXml = DataTableWriter::isXmlFile(m_inputFile.c_str()); + //isXml = DataTableWriter::isXmlFile(m_inputFile.c_str()); if (CommandLine::getOccurrenceCount(SNAME_OUTPUT_FILE)) { diff --git a/src/engine/shared/application/DataTableTool/src/shared/Makefile.am b/src/engine/shared/application/DataTableTool/src/shared/Makefile.am index 2664987b3..95d50c180 100644 --- a/src/engine/shared/application/DataTableTool/src/shared/Makefile.am +++ b/src/engine/shared/application/DataTableTool/src/shared/Makefile.am @@ -25,7 +25,7 @@ libDataTableToolshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -Wno-ctor-dtor-privacy diff --git a/src/engine/shared/application/PlanetWatcher/src/win32/PlanetWatcherRenderer.cpp b/src/engine/shared/application/PlanetWatcher/src/win32/PlanetWatcherRenderer.cpp index 5fe193fe9..9e3f832fe 100644 --- a/src/engine/shared/application/PlanetWatcher/src/win32/PlanetWatcherRenderer.cpp +++ b/src/engine/shared/application/PlanetWatcher/src/win32/PlanetWatcherRenderer.cpp @@ -16,6 +16,7 @@ #include #include #include +#include // ============================================================================ // diff --git a/src/engine/shared/application/TemplateCompiler/src/linux/Makefile.am b/src/engine/shared/application/TemplateCompiler/src/linux/Makefile.am index 062a2e858..6cb58fad3 100644 --- a/src/engine/shared/application/TemplateCompiler/src/linux/Makefile.am +++ b/src/engine/shared/application/TemplateCompiler/src/linux/Makefile.am @@ -5,7 +5,7 @@ TemplateCompiler_CXXFLAGS=-I$(engine_dir)/shared/library/sharedFoundation/includ -I$(engine_dir)/shared/library/sharedFoundationTypes/include/public \ -I$(engine_dir)/shared/library/sharedMemoryManager/include/public \ -I$(engine_dir)/shared/library/sharedDebug/include/public \ - -I$(stlport_dir)/stlport \ + \ -Wno-ctor-dtor-privacy TemplateCompiler_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/libsharedMemoryManager.la \ ../shared/libTemplateCompilershared.la \ @@ -28,7 +28,7 @@ TemplateCompiler_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryMana $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(perforce_dir)/lib/$(platform)/libclient.a \ $(perforce_dir)/lib/$(platform)/librpc.a \ @@ -126,8 +126,8 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/localization/liblocalization.la: make -C $(top_builddir)/../external/ours/library/localization -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/TemplateCompiler/src/shared/Makefile.am b/src/engine/shared/application/TemplateCompiler/src/shared/Makefile.am index 3e390e463..ee2216fe5 100644 --- a/src/engine/shared/application/TemplateCompiler/src/shared/Makefile.am +++ b/src/engine/shared/application/TemplateCompiler/src/shared/Makefile.am @@ -18,7 +18,7 @@ libTemplateCompilershared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -Wno-ctor-dtor-privacy diff --git a/src/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp b/src/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp index 2e6be0131..8611bb0bf 100644 --- a/src/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp +++ b/src/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp @@ -28,7 +28,7 @@ #include "sharedTemplate/SetupSharedTemplate.h" #pragma warning (disable:4100) // unreferenced formal parameters abound in the perforce clientAPI -#include "clientapi.h" +//#include "clientapi.h" #pragma warning (default:4100) #include @@ -39,71 +39,71 @@ static const int SUBMIT_NO_FILE_ERR = 17; // need to add file before submitting -class MyPerforceUser : public ClientUser -{ -public: - MyPerforceUser(void) : ClientUser(), m_errorOccurred(false) {} - virtual ~MyPerforceUser() {} - virtual void HandleError( Error *err ) - { - if (err != NULL && err->Test()) - { - m_errorOccurred = true; - m_lastError = err->GetGeneric(); - // test for filtered errors - for (size_t i = 0; i < m_filteredErrors.size(); ++i) - { - if (m_lastError == m_filteredErrors[i]) - return; - } - } - ClientUser::HandleError(err); - } - - bool errorOccurred(void) const - { - return m_errorOccurred; - } - - int getLastError(void) const - { - return m_lastError; - } - - void clearLastError(void) - { - m_errorOccurred = false; - m_lastError = 0; - } - - void addFilteredError(int error) - { - m_filteredErrors.push_back(error); - } - - void clearFilteredErrors(void) - { - m_filteredErrors.clear(); - } - -private: - bool m_errorOccurred; - int m_lastError; - std::vector m_filteredErrors; -}; +//class MyPerforceUser : public ClientUser +//{ +//public: +// MyPerforceUser(void) : ClientUser(), m_errorOccurred(false) {} +// virtual ~MyPerforceUser() {} +// virtual void HandleError( Error *err ) +// { +// if (err != NULL && err->Test()) +// { +// m_errorOccurred = true; +// m_lastError = err->GetGeneric(); +// // test for filtered errors +// for (size_t i = 0; i < m_filteredErrors.size(); ++i) +// { +// if (m_lastError == m_filteredErrors[i]) +// return; +// } +// } +// ClientUser::HandleError(err); +// } +// +// bool errorOccurred(void) const +// { +// return m_errorOccurred; +// } +// +// int getLastError(void) const +// { +// return m_lastError; +// } +// +// void clearLastError(void) +// { +// m_errorOccurred = false; +// m_lastError = 0; +// } +// +// void addFilteredError(int error) +// { +// m_filteredErrors.push_back(error); +// } +// +// void clearFilteredErrors(void) +// { +// m_filteredErrors.clear(); +// } +// +//private: +// bool m_errorOccurred; +// int m_lastError; +// std::vector m_filteredErrors; +//}; //============================================================================== // subclass of the PerforceAPI StrBuf class, to workaround a bug // in the destructor. We can't fix the bug because it's an external library -class StrBufFixed : public StrBuf -{ -public: - ~StrBufFixed() - { - delete buffer; - StringInit(); - } -}; +//class StrBufFixed : public StrBuf +//{ +//public: +// ~StrBufFixed() +// { +// delete buffer; +// StringInit(); +// } +//}; @@ -310,51 +310,51 @@ TpfFile templateFile; * * @return 0 on success, error code on fail */ -int checkOut(const char *filename) -{ -MyPerforceUser ui; -ClientApi client; -Error e; - - // check filename extensions - Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); - Filename iffFileName = templateFileName; - iffFileName.setExtension(IFF_EXTENSION); - - // Connect to Perforce server - client.Init( &e ); - if (e.Test()) - { - StrBufFixed msg; - e.Fmt(&msg); - fprintf(stderr, msg.Text()); - return -1; - } - - // check out the template file - const char * commands[2]; - commands[0] = "edit"; - commands[1] = templateFileName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - - // find the client and server paths - TpfFile templateFile; - IGNORE_RETURN(templateFile.loadTemplate(templateFileName)); - - // check out the client template iff file - Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, IFF_EXTENSION); - commands[1] = iffName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - - // Close connection - return client.Final( &e ); -} // checkOut +//int checkOut(const char *filename) +//{ +//MyPerforceUser ui; +//ClientApi client; +//Error e; +// +// // check filename extensions +// Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); +// Filename iffFileName = templateFileName; +// iffFileName.setExtension(IFF_EXTENSION); +// +// // Connect to Perforce server +// client.Init( &e ); +// if (e.Test()) +// { +// StrBufFixed msg; +// e.Fmt(&msg); +// fprintf(stderr, msg.Text()); +// return -1; +// } +// +// // check out the template file +// const char * commands[2]; +// commands[0] = "edit"; +// commands[1] = templateFileName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// +// // find the client and server paths +// TpfFile templateFile; +// IGNORE_RETURN(templateFile.loadTemplate(templateFileName)); +// +// // check out the client template iff file +// Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, IFF_EXTENSION); +// commands[1] = iffName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// +// // Close connection +// return client.Final( &e ); +//} // checkOut /** * Checks in a template file and the iff files associated with it to Perforce. @@ -363,78 +363,78 @@ Error e; * * @return 0 on success, error code on fail */ -int checkIn(const char *filename) -{ -MyPerforceUser ui; -ClientApi client; -Error e; - - // check filename extensions - Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); - Filename iffFileName = templateFileName; - iffFileName.setExtension(IFF_EXTENSION); - - // find the client and server paths - TpfFile templateFile; - int result = templateFile.loadTemplate(templateFileName); - if (result != 0) - { - // don't allow check-in if there are errors - return result; - } - - // Connect to Perforce server - client.Init( &e ); - if (e.Test()) - { - StrBufFixed msg; - e.Fmt(&msg); - fprintf(stderr, msg.Text()); - return -1; - } - - // try to submit the files - const char * commands[4]; - char param1[256]; - for (;;) - { - sprintf(param1, "//depot/.../%s.*", templateFileName.getName().c_str()); - commands[0] = "submit"; - commands[1] = param1; - - // don't report an error if the files need to be added before submitting - ui.addFilteredError(SUBMIT_NO_FILE_ERR); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (!ui.errorOccurred()) - break; - if (ui.getLastError() != SUBMIT_NO_FILE_ERR) - return -1; - ui.clearLastError(); - ui.clearFilteredErrors(); - - // we need to add the files to Perforce before submitting - commands[0] = "add"; - - // add the template file - commands[1] = templateFileName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - - // add the client iff file - Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, NULL); - commands[1] = iffName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - } - - // Close connection - return client.Final( &e ); -} // checkIn +//int checkIn(const char *filename) +//{ +//MyPerforceUser ui; +//ClientApi client; +//Error e; +// +// // check filename extensions +// Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); +// Filename iffFileName = templateFileName; +// iffFileName.setExtension(IFF_EXTENSION); +// +// // find the client and server paths +// TpfFile templateFile; +// int result = templateFile.loadTemplate(templateFileName); +// if (result != 0) +// { +// // don't allow check-in if there are errors +// return result; +// } +// +// // Connect to Perforce server +// client.Init( &e ); +// if (e.Test()) +// { +// StrBufFixed msg; +// e.Fmt(&msg); +// fprintf(stderr, msg.Text()); +// return -1; +// } +// +// // try to submit the files +// const char * commands[4]; +// char param1[256]; +// for (;;) +// { +// sprintf(param1, "//depot/.../%s.*", templateFileName.getName().c_str()); +// commands[0] = "submit"; +// commands[1] = param1; +// +// // don't report an error if the files need to be added before submitting +// ui.addFilteredError(SUBMIT_NO_FILE_ERR); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (!ui.errorOccurred()) +// break; +// if (ui.getLastError() != SUBMIT_NO_FILE_ERR) +// return -1; +// ui.clearLastError(); +// ui.clearFilteredErrors(); +// +// // we need to add the files to Perforce before submitting +// commands[0] = "add"; +// +// // add the template file +// commands[1] = templateFileName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// +// // add the client iff file +// Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, NULL); +// commands[1] = iffName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// } +// +// // Close connection +// return client.Final( &e ); +//} // checkIn /** * Prints the command syntax to the console. @@ -448,9 +448,9 @@ void printSyntax(void) // printf("-derive [.tpf] [.tpf]\n"); printf("-compile [.tpf] [[.tpf] ...]\n"); printf("-verify [.tpf] [[.tpf] ...]\n"); - printf("Perforce commands:\n"); - printf("-edit [.tpf] [[.tpf] ...]\n"); - printf("-submit [.tpf] [[.tpf] ...]\n"); +// printf("Perforce commands:\n"); +// printf("-edit [.tpf] [[.tpf] ...]\n"); +// printf("-submit [.tpf] [[.tpf] ...]\n"); } // printSyntax /** @@ -542,34 +542,34 @@ int processArgs(int argc, char *argv[ ]) } return result; } - else if (strcmp(argv[1], "-edit") == 0) - { - if (argc < 3) - { - printSyntax(); - return 0; - } - for (int i = 2; i < argc; ++i) - { - int result = checkOut(argv[i]); - if (result != 0) - return result; - } - } - else if (strcmp(argv[1], "-submit") == 0) - { - if (argc < 3) - { - printSyntax(); - return 0; - } - for (int i = 2; i < argc; ++i) - { - int result = checkIn(argv[i]); - if (result != 0) - return result; - } - } + //else if (strcmp(argv[1], "-edit") == 0) + //{ + // if (argc < 3) + // { + // printSyntax(); + // return 0; + // } + // for (int i = 2; i < argc; ++i) + // { + // int result = checkOut(argv[i]); + // if (result != 0) + // return result; + // } + //} + //else if (strcmp(argv[1], "-submit") == 0) + //{ + // if (argc < 3) + // { + // printSyntax(); + // return 0; + // } + // for (int i = 2; i < argc; ++i) + // { + // int result = checkIn(argv[i]); + // if (result != 0) + // return result; + // } + //} else { printSyntax(); diff --git a/src/engine/shared/application/TemplateDefinitionCompiler/src/linux/Makefile.am b/src/engine/shared/application/TemplateDefinitionCompiler/src/linux/Makefile.am index 21f8ebcfd..d47793189 100644 --- a/src/engine/shared/application/TemplateDefinitionCompiler/src/linux/Makefile.am +++ b/src/engine/shared/application/TemplateDefinitionCompiler/src/linux/Makefile.am @@ -5,7 +5,7 @@ TemplateDefinitionCompiler_CXXFLAGS=-I$(engine_dir)/shared/library/sharedFoundat -I$(engine_dir)/shared/library/sharedFoundationTypes/include/public \ -I$(engine_dir)/shared/library/sharedMemoryManager/include/public \ -I$(engine_dir)/shared/library/sharedDebug/include/public \ - -I$(stlport_dir)/stlport \ + \ -Wno-ctor-dtor-privacy TemplateDefinitionCompiler_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryManager/libsharedMemoryManager.la \ ../shared/libTemplateDefinitionCompilershared.la \ @@ -28,7 +28,7 @@ TemplateDefinitionCompiler_LDADD=$(top_builddir)/../engine/shared/library/shared $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a \ $(perforce_dir)/lib/$(platform)/libclient.a \ $(perforce_dir)/lib/$(platform)/librpc.a \ @@ -108,8 +108,8 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la: make -C $(top_builddir)/../external/ours/library/unicodeArchive -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/Makefile.am b/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/Makefile.am index 6a920ef6e..d7b4cc700 100644 --- a/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/Makefile.am +++ b/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/Makefile.am @@ -17,7 +17,7 @@ libTemplateDefinitionCompilersharedcore_la_CXXFLAGS=-I$(srcdir)/../../$(platform -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -Wno-ctor-dtor-privacy diff --git a/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp b/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp index 684501726..61e85ce83 100644 --- a/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp +++ b/src/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp @@ -21,9 +21,9 @@ #include "sharedTemplateDefinition/TemplateDefinitionFile.h" #include "sharedTemplateDefinition/TemplateData.h" -#pragma warning (disable:4100) // unreferenced formal parameters abound in the perforce clientAPI -#include "clientapi.h" -#pragma warning (default:4100) +//#pragma warning (disable:4100) // unreferenced formal parameters abound in the perforce clientAPI +//#include "clientapi.h" +//#pragma warning (default:4100) #include @@ -35,74 +35,74 @@ //============================================================================== // subclass Perforce API class ClientUser in order to trap errors -static const int SUBMIT_NO_FILE_ERR = 17; // need to add file before submitting - -class MyPerforceUser : public ClientUser -{ -public: - MyPerforceUser(void) : ClientUser(), m_errorOccurred(false) {} - virtual ~MyPerforceUser() {} - virtual void HandleError( Error *err ) - { - if (err != NULL && err->Test()) - { - m_errorOccurred = true; - m_lastError = err->GetGeneric(); - // test for filtered errors - for (size_t i = 0; i < m_filteredErrors.size(); ++i) - { - if (m_lastError == m_filteredErrors[i]) - return; - } - } - ClientUser::HandleError(err); - } - - bool errorOccurred(void) const - { - return m_errorOccurred; - } - - int getLastError(void) const - { - return m_lastError; - } - - void clearLastError(void) - { - m_errorOccurred = false; - m_lastError = 0; - } - - void addFilteredError(int error) - { - m_filteredErrors.push_back(error); - } - - void clearFilteredErrors(void) - { - m_filteredErrors.clear(); - } - -private: - bool m_errorOccurred; - int m_lastError; - std::vector m_filteredErrors; -}; - - -//============================================================================== -// subclass of the PerforceAPI StrBuf class, to workaround a bug -// in the destructor. We can't fix the bug because it's an external library -class StrBufFixed : public StrBuf -{ -public: - ~StrBufFixed() - { - delete buffer; - StringInit(); - } -}; +//static const int SUBMIT_NO_FILE_ERR = 17; // need to add file before submitting +// +//class MyPerforceUser : public ClientUser +//{ +//public: +// MyPerforceUser(void) : ClientUser(), m_errorOccurred(false) {} +// virtual ~MyPerforceUser() {} +// virtual void HandleError( Error *err ) +// { +// if (err != NULL && err->Test()) +// { +// m_errorOccurred = true; +// m_lastError = err->GetGeneric(); +// // test for filtered errors +// for (size_t i = 0; i < m_filteredErrors.size(); ++i) +// { +// if (m_lastError == m_filteredErrors[i]) +// return; +// } +// } +// ClientUser::HandleError(err); +// } +// +// bool errorOccurred(void) const +// { +// return m_errorOccurred; +// } +// +// int getLastError(void) const +// { +// return m_lastError; +// } +// +// void clearLastError(void) +// { +// m_errorOccurred = false; +// m_lastError = 0; +// } +// +// void addFilteredError(int error) +// { +// m_filteredErrors.push_back(error); +// } +// +// void clearFilteredErrors(void) +// { +// m_filteredErrors.clear(); +// } +// +//private: +// bool m_errorOccurred; +// int m_lastError; +// std::vector m_filteredErrors; +//}; +// +// +////============================================================================== +//// subclass of the PerforceAPI StrBuf class, to workaround a bug +//// in the destructor. We can't fix the bug because it's an external library +//class StrBufFixed : public StrBuf +//{ +//public: +// ~StrBufFixed() +// { +// delete buffer; +// StringInit(); +// } +//}; //============================================================================== @@ -468,86 +468,86 @@ TemplateDefinitionFile tdfFile; * * @return 0 on success, error code on fail */ -int checkOut(const char *filename) -{ -MyPerforceUser ui; -ClientApi client; -Error e; - - // check filename extensions - Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); - - // Connect to Perforce server - client.Init( &e ); - if (e.Test()) - { - StrBufFixed msg; - e.Fmt(&msg); - fprintf(stderr, msg.Text()); - return -1; - } - - // check out the template file - const char * commands[2]; - commands[0] = "edit"; - commands[1] = templateFileName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - - // find the client and server paths - File fp(templateFileName, "rt"); - if (!fp.isOpened()) - { - fprintf(stderr, "cannot open file %s\n", templateFileName.getFullFilename().c_str()); - return -1; - } - File::setBasePath(templateFileName.getPath().c_str()); - TemplateDefinitionFile tdfFile; - IGNORE_RETURN(tdfFile.parse(fp)); - fp.close(); - - if (tdfFile.getPath().getFullFilename().size() != 0) - { - // check out the source files - Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), - tdfFile.getTemplateName().c_str(), "cpp"); - commands[1] = sourceName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - sourceName.setExtension("h"); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - } - - if (tdfFile.getCompilerPath().getFullFilename().size() != 0) - { - // check out the compiler source files - std::string compilerFilename; - compilerFilename = EnumLocationTypes[tdfFile.getTemplateLocation()] + - filenameLowerToUpper(templateFileName.getName()); - Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), - tdfFile.getTemplateName().c_str(), "cpp"); - commands[1] = compilerName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - compilerName.setExtension("h"); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - } - - // Close connection - return client.Final( &e ); -} // checkOut +//int checkOut(const char *filename) +//{ +//MyPerforceUser ui; +//ClientApi client; +//Error e; +// +// // check filename extensions +// Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); +// +// // Connect to Perforce server +// client.Init( &e ); +// if (e.Test()) +// { +// StrBufFixed msg; +// e.Fmt(&msg); +// fprintf(stderr, msg.Text()); +// return -1; +// } +// +// // check out the template file +// const char * commands[2]; +// commands[0] = "edit"; +// commands[1] = templateFileName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// +// // find the client and server paths +// File fp(templateFileName, "rt"); +// if (!fp.isOpened()) +// { +// fprintf(stderr, "cannot open file %s\n", templateFileName.getFullFilename().c_str()); +// return -1; +// } +// File::setBasePath(templateFileName.getPath().c_str()); +// TemplateDefinitionFile tdfFile; +// IGNORE_RETURN(tdfFile.parse(fp)); +// fp.close(); +// +// if (tdfFile.getPath().getFullFilename().size() != 0) +// { +// // check out the source files +// Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), +// tdfFile.getTemplateName().c_str(), "cpp"); +// commands[1] = sourceName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// sourceName.setExtension("h"); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// } +// +// if (tdfFile.getCompilerPath().getFullFilename().size() != 0) +// { +// // check out the compiler source files +// std::string compilerFilename; +// compilerFilename = EnumLocationTypes[tdfFile.getTemplateLocation()] + +// filenameLowerToUpper(templateFileName.getName()); +// Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), +// tdfFile.getTemplateName().c_str(), "cpp"); +// commands[1] = compilerName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// compilerName.setExtension("h"); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// } +// +// // Close connection +// return client.Final( &e ); +//} // checkOut /** * Checks in a template file and the source files associated with it to Perforce. @@ -556,109 +556,109 @@ Error e; * * @return 0 on success, error code on fail */ -int checkIn(const char *filename) -{ -MyPerforceUser ui; -ClientApi client; -Error e; - - // check filename extensions - Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); - - // find the client and server paths - File fp(templateFileName, "rt"); - if (!fp.isOpened()) - { - fprintf(stderr, "cannot open file %s\n", templateFileName.getFullFilename().c_str()); - return -1; - } - File::setBasePath(templateFileName.getPath().c_str()); - TemplateDefinitionFile tdfFile; - int result = tdfFile.parse(fp); - if (result != 0) - { - // don't allow check-in if there are errors - return result; - } - fp.close(); - - // Connect to Perforce server - client.Init( &e ); - if (e.Test()) - { - StrBufFixed msg; - e.Fmt(&msg); - fprintf(stderr, msg.Text()); - return -1; - } - - // try to submit the files - const char * commands[4]; - char param1[256]; - for (;;) - { - sprintf(param1, "//depot/.../%s.*", templateFileName.getName().c_str()); - commands[0] = "submit"; - commands[1] = param1; - // don't report an error if the files need to be added before submitting - ui.addFilteredError(SUBMIT_NO_FILE_ERR); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (!ui.errorOccurred()) - break; - if (ui.getLastError() != SUBMIT_NO_FILE_ERR) - return -1; - ui.clearLastError(); - ui.clearFilteredErrors(); - - // we need to add the files to Perforce before submitting - commands[0] = "add"; - - // add the template file - commands[1] = templateFileName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - - if (tdfFile.getPath().getFullFilename().size() != 0) - { - // check in the source files - Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), - tdfFile.getTemplateName().c_str(), "cpp"); - commands[1] = sourceName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - sourceName.setExtension("h"); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - } - - if (tdfFile.getCompilerPath().getFullFilename().size() != 0) - { - // check in the compiler source files - Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), - tdfFile.getTemplateName().c_str(), "cpp"); - commands[1] = compilerName; - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - compilerName.setExtension("h"); - client.SetArgv( 1, const_cast(&commands[1]) ); - client.Run( commands[0], &ui ); - if (ui.errorOccurred()) - return -1; - } - } - - // Close connection - return client.Final( &e ); -} // checkIn +//int checkIn(const char *filename) +//{ +//MyPerforceUser ui; +//ClientApi client; +//Error e; +// +// // check filename extensions +// Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); +// +// // find the client and server paths +// File fp(templateFileName, "rt"); +// if (!fp.isOpened()) +// { +// fprintf(stderr, "cannot open file %s\n", templateFileName.getFullFilename().c_str()); +// return -1; +// } +// File::setBasePath(templateFileName.getPath().c_str()); +// TemplateDefinitionFile tdfFile; +// int result = tdfFile.parse(fp); +// if (result != 0) +// { +// // don't allow check-in if there are errors +// return result; +// } +// fp.close(); +// +// // Connect to Perforce server +// client.Init( &e ); +// if (e.Test()) +// { +// StrBufFixed msg; +// e.Fmt(&msg); +// fprintf(stderr, msg.Text()); +// return -1; +// } +// +// // try to submit the files +// const char * commands[4]; +// char param1[256]; +// for (;;) +// { +// sprintf(param1, "//depot/.../%s.*", templateFileName.getName().c_str()); +// commands[0] = "submit"; +// commands[1] = param1; +// // don't report an error if the files need to be added before submitting +// ui.addFilteredError(SUBMIT_NO_FILE_ERR); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (!ui.errorOccurred()) +// break; +// if (ui.getLastError() != SUBMIT_NO_FILE_ERR) +// return -1; +// ui.clearLastError(); +// ui.clearFilteredErrors(); +// +// // we need to add the files to Perforce before submitting +// commands[0] = "add"; +// +// // add the template file +// commands[1] = templateFileName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// +// if (tdfFile.getPath().getFullFilename().size() != 0) +// { +// // check in the source files +// Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), +// tdfFile.getTemplateName().c_str(), "cpp"); +// commands[1] = sourceName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// sourceName.setExtension("h"); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// } +// +// if (tdfFile.getCompilerPath().getFullFilename().size() != 0) +// { +// // check in the compiler source files +// Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), +// tdfFile.getTemplateName().c_str(), "cpp"); +// commands[1] = compilerName; +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// compilerName.setExtension("h"); +// client.SetArgv( 1, const_cast(&commands[1]) ); +// client.Run( commands[0], &ui ); +// if (ui.errorOccurred()) +// return -1; +// } +// } +// +// // Close connection +// return client.Final( &e ); +//} // checkIn /** * Prints the command syntax to the console. @@ -667,9 +667,9 @@ void printSyntax(void) { printf("Compiler commands:\n"); printf("-compile [.tdf] [[.tdf] ...]\n"); - printf("Perforce commands:\n"); - printf("-edit [.tdf] [[.tdf] ...]\n"); - printf("-submit [.tdf] [[.tdf] ...]\n"); + //printf("Perforce commands:\n"); + //printf("-edit [.tdf] [[.tdf] ...]\n"); + //printf("-submit [.tdf] [[.tdf] ...]\n"); } // printSyntax /** @@ -683,25 +683,25 @@ int processArgs(int argc, char *argv[ ]) return 0; } - if (strcmp(argv[1], "-edit") == 0) - { - for (int i = 2; i < argc; ++i) - { - int result = checkOut(argv[i]); - if (result != 0) - return result; - } - } - else if (strcmp(argv[1], "-submit") == 0) - { - for (int i = 2; i < argc; ++i) - { - int result = checkIn(argv[i]); - if (result != 0) - return result; - } - } - else if (strcmp(argv[1], "-compile") == 0) + //if (strcmp(argv[1], "-edit") == 0) + //{ + // for (int i = 2; i < argc; ++i) + // { + // int result = checkOut(argv[i]); + // if (result != 0) + // return result; + // } + //} + //else if (strcmp(argv[1], "-submit") == 0) + //{ + // for (int i = 2; i < argc; ++i) + // { + // int result = checkIn(argv[i]); + // if (result != 0) + // return result; + // } + //} + if (strcmp(argv[1], "-compile") == 0) { Filename filename; for (int i = 2; i < argc; ++i) diff --git a/src/engine/shared/application/TreeFileRspBuilder/src/win32/FirstTreeFileRspBuilder.h b/src/engine/shared/application/TreeFileRspBuilder/src/win32/FirstTreeFileRspBuilder.h index d766e8fa5..3ff5122f6 100644 --- a/src/engine/shared/application/TreeFileRspBuilder/src/win32/FirstTreeFileRspBuilder.h +++ b/src/engine/shared/application/TreeFileRspBuilder/src/win32/FirstTreeFileRspBuilder.h @@ -14,7 +14,7 @@ #define VC_EXTRALEAN -#include +#include "../../../../../../external/3rd/library/atlmfc/include/afxwin.h" #pragma warning(disable: 4786) diff --git a/src/engine/shared/application/Turf/src/shared/Makefile.am b/src/engine/shared/application/Turf/src/shared/Makefile.am index a6b47a7a8..6d68589b7 100644 --- a/src/engine/shared/application/Turf/src/shared/Makefile.am +++ b/src/engine/shared/application/Turf/src/shared/Makefile.am @@ -37,7 +37,7 @@ libTurfshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(boost_dir) \ -Wno-ctor-dtor-privacy diff --git a/src/engine/shared/application/WeaponExporterTool/src/linux/Makefile.am b/src/engine/shared/application/WeaponExporterTool/src/linux/Makefile.am index 014ac68c2..a78358091 100644 --- a/src/engine/shared/application/WeaponExporterTool/src/linux/Makefile.am +++ b/src/engine/shared/application/WeaponExporterTool/src/linux/Makefile.am @@ -22,7 +22,7 @@ WeaponExporterTool_LDADD=$(top_builddir)/../engine/shared/library/sharedMemoryMa $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(pcre_dir)/lib/libpcre.a WeaponExporterTool_LDFLAGS=-lpthread -ldl -lm -lncurses -lz @@ -84,7 +84,7 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/localization/liblocalization.la: make -C $(top_builddir)/../external/ours/library/localization -$(stlport_dir)/lib/libstlport_gcc.a: - cd $(stlport_dir)/src && $(MAKE) -j1 -f gcc-linux.mak + + include $(engine_dir)/../make_include/engine.include diff --git a/src/engine/shared/application/WeaponExporterTool/src/shared/Makefile.am b/src/engine/shared/application/WeaponExporterTool/src/shared/Makefile.am index 868d99869..c0361545f 100644 --- a/src/engine/shared/application/WeaponExporterTool/src/shared/Makefile.am +++ b/src/engine/shared/application/WeaponExporterTool/src/shared/Makefile.am @@ -29,7 +29,7 @@ libWeaponExporterToolshared_la_CXXFLAGS=-I$(srcdir)/../$(platform) \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ -I$(engine_dir)/shared/library/sharedXml/include/public \ -I$(engine_dir)/shared/library/sharedTemplateDefinition/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(perforce_dir)/include \ -I$(pcre_dir)/include \ -I$(boost_dir) \ diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h b/src/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h index 705a5d234..9a2d65455 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h +++ b/src/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h @@ -12,7 +12,7 @@ #define INCLUDED_BoxTree_H #include "sharedMath/AxialBox.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class BoxTreeNode; class DebugShapeRenderer; diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h index 7b2635f02..1d75fc8b3 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h +++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h @@ -15,7 +15,7 @@ #include "sharedMath/Vector.h" #include "sharedMath/Sphere.h" #include "sharedMath/Capsule.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class BaseExtent; class CellProperty; diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp index 99f1abb02..4c994abf8 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp @@ -913,7 +913,7 @@ void BuildConvexHull ( VertexList const & verts, VertexList & outPoly ) int count = verts.size(); - //BuildConvexHull( sortedVerts.begin(), count, outPoly ); + BuildConvexHull( &sortedVerts.front(), count, outPoly ); } // ---------------------------------------------------------------------- @@ -1512,7 +1512,7 @@ bool CalcAvoidancePoints3d ( Sphere const & mob, Vector const & delta, Sphere co Vector I,J; - if(abs(K.y) > 0.95) + if(std::abs(K.y) > 0.95) { // line A-B is almost vertical, build orthonormal basis using X axis @@ -1781,14 +1781,14 @@ bool testPortalVis ( CellProperty const * cellA, Vector const & pointA, CellProp bool epsilonEqual ( Sphere const & A, Sphere const & B, float epsilon ) { - if(abs(A.getRadius() - B.getRadius()) > epsilon) return false; + if(std::abs(A.getRadius() - B.getRadius()) > epsilon) return false; Vector cA = A.getCenter(); Vector cB = B.getCenter(); - if(abs(cA.x - cB.x) > epsilon) return false; - if(abs(cA.y - cB.y) > epsilon) return false; - if(abs(cA.z - cB.z) > epsilon) return false; + if(std::abs(cA.x - cB.x) > epsilon) return false; + if(std::abs(cA.y - cB.y) > epsilon) return false; + if(std::abs(cA.z - cB.z) > epsilon) return false; return true; } diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/Distance3d.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/Distance3d.cpp index 5a32dfe1d..0ea58d518 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/Distance3d.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/Distance3d.cpp @@ -718,9 +718,9 @@ Range ProjectAxis ( Line3d const & L, AxialBox const & B ) Vector const & N = L.getNormal(); Vector extent = B.getDelta(); - real x = abs( Collision3d::ComponentAlong( Vector::unitX, N ) ) * extent.x; - real y = abs( Collision3d::ComponentAlong( Vector::unitY, N ) ) * extent.y; - real z = abs( Collision3d::ComponentAlong( Vector::unitZ, N ) ) * extent.z; + real x = std::abs( Collision3d::ComponentAlong( Vector::unitX, N ) ) * extent.x; + real y = std::abs( Collision3d::ComponentAlong( Vector::unitY, N ) ) * extent.y; + real z = std::abs( Collision3d::ComponentAlong( Vector::unitZ, N ) ) * extent.z; real d = x + y + z; @@ -735,9 +735,9 @@ Range ProjectAxis ( Line3d const & L, OrientedBox const & B ) { Vector const & N = L.getNormal(); - real x = abs( Collision3d::ComponentAlong( B.getAxisX(), N ) ) * B.getExtentX(); - real y = abs( Collision3d::ComponentAlong( B.getAxisY(), N ) ) * B.getExtentY(); - real z = abs( Collision3d::ComponentAlong( B.getAxisZ(), N ) ) * B.getExtentZ(); + real x = std::abs( Collision3d::ComponentAlong( B.getAxisX(), N ) ) * B.getExtentX(); + real y = std::abs( Collision3d::ComponentAlong( B.getAxisY(), N ) ) * B.getExtentY(); + real z = std::abs( Collision3d::ComponentAlong( B.getAxisZ(), N ) ) * B.getExtentZ(); real d = x + y + z; diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp index 1a9659a28..7041fa862 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp @@ -6,7 +6,6 @@ // // ====================================================================== -#include #include "sharedCollision/FirstSharedCollision.h" #include "sharedCollision/DoorObject.h" @@ -33,6 +32,8 @@ #include "sharedObject/Portal.h" #include "sharedObject/Tweakable.h" +#include + static VectorArgb gs_forceFieldColor(0.6f,0.5f,0.5f,1.0f); // ====================================================================== diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/FirstSharedCollision.h b/src/engine/shared/library/sharedCollision/src/shared/core/FirstSharedCollision.h index 37c573b36..0190c335b 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/FirstSharedCollision.h +++ b/src/engine/shared/library/sharedCollision/src/shared/core/FirstSharedCollision.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp index 01ec23501..370f13b70 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp @@ -1614,7 +1614,7 @@ bool FloorMesh::findFloorTri ( FloorLocator const & testLoc, // ---------- - if(abs(dist) < gs_hopTolerance) + if(std::abs(dist) < gs_hopTolerance) { // Floor tri is above the test point but within the hop // tolerance and we're allowing hops - we can hop up onto it. @@ -2911,7 +2911,7 @@ PathWalkResult FloorMesh::pathWalkCircleGetIds ( FloorLocator const & inStartLoc { float stepDistance = delta.magnitude(); - float contactDist = abs(stepDistance * circleHitTime); + float contactDist = std::abs(stepDistance * circleHitTime); if((circleHitTime < 0) && (contactDist > wallEpsilon)) { @@ -3619,8 +3619,8 @@ bool FloorMesh::dropTest ( FloorLocator const & testLoc, float hopHeight, FloorL if( findClosestPair(line,-1,closestBelow,closestAbove) ) { - float distBelow = abs(closestBelow.getOffset()); - float distAbove = abs(closestAbove.getOffset()); + float distBelow = std::abs(closestBelow.getOffset()); + float distAbove = std::abs(closestAbove.getOffset()); closestAbove.setSurface(this); closestBelow.setSurface(this); @@ -3701,7 +3701,7 @@ bool FloorMesh::dropTest ( FloorLocator const & testLoc, int triID, FloorLocator if(testIntersect(line,triID,tempLoc)) { - float absDist = abs(tempLoc.getOffset()); + float absDist = std::abs(tempLoc.getOffset()); if(absDist <= ConfigSharedCollision::getHopHeight()) { diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h b/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h index bcc15ceee..d48f177d1 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h +++ b/src/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h @@ -11,8 +11,8 @@ // ====================================================================== #include "sharedCollision/CollisionMesh.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/DataResource.h" #include "sharedCollision/CollisionEnums.h" class FloorTri; diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/Footprint.h b/src/engine/shared/library/sharedCollision/src/shared/core/Footprint.h index e32e31abf..e7de02e7d 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/Footprint.h +++ b/src/engine/shared/library/sharedCollision/src/shared/core/Footprint.h @@ -14,7 +14,7 @@ #include "sharedCollision/FloorLocator.h" #include "sharedCollision/MultiList.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" class Floor; class FloorContactShape; diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.cpp index d51068360..ab3164245 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.cpp @@ -461,7 +461,7 @@ bool TestTriTri ( Triangle3d const & A, Triangle3d const & B ) bool TestSpherePlane ( Sphere const & A, Plane3d const & B ) { - float dist = abs(Distance3d::DistancePointPlane(A.getCenter(),B)); + float dist = std::abs(Distance3d::DistancePointPlane(A.getCenter(),B)); return dist <= A.getRadius(); } diff --git a/src/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp b/src/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp index 33558adb3..1602025bf 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp @@ -28,7 +28,7 @@ #include "sharedMath/Cylinder.h" #include "sharedMath/MultiShape.h" -#include +//#include #include static int gs_testCounter; diff --git a/src/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.h b/src/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.h index 099a3f0cb..86f6c2432 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.h +++ b/src/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.h @@ -17,7 +17,7 @@ class Extent; class Iff; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.h b/src/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.h index 38f515e33..0f8a25f9c 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.h +++ b/src/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.h @@ -15,7 +15,7 @@ #include "sharedCollision/BaseExtent.h" #include "sharedMath/MultiShape.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class Iff; class DebugShapeRenderer; diff --git a/src/engine/shared/library/sharedCommandParser/src/shared/FirstSharedCommandParser.h b/src/engine/shared/library/sharedCommandParser/src/shared/FirstSharedCommandParser.h index a9a7dbc15..7fa0fa792 100644 --- a/src/engine/shared/library/sharedCommandParser/src/shared/FirstSharedCommandParser.h +++ b/src/engine/shared/library/sharedCommandParser/src/shared/FirstSharedCommandParser.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedCompression/src/shared/FirstSharedCompression.h b/src/engine/shared/library/sharedCompression/src/shared/FirstSharedCompression.h index eda01e545..3cb28556f 100644 --- a/src/engine/shared/library/sharedCompression/src/shared/FirstSharedCompression.h +++ b/src/engine/shared/library/sharedCompression/src/shared/FirstSharedCompression.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BindableNetworkId.h b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BindableNetworkId.h index 244ff9ae0..2ff0dee18 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BindableNetworkId.h +++ b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BindableNetworkId.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDatabaseInterface/DbBindableInt64.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BufferString.cpp b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BufferString.cpp index 664ac0c8a..ae2cbc9d2 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BufferString.cpp +++ b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/BufferString.cpp @@ -5,7 +5,6 @@ // // ====================================================================== -#include #include "sharedDatabaseInterface/FirstSharedDatabaseInterface.h" #include "sharedDatabaseInterface/BufferString.h" @@ -15,6 +14,8 @@ #include "sharedDatabaseInterface/NullEncodedUnicodeString.h" #include "sharedLog/Log.h" +#include + using namespace DB; // ====================================================================== diff --git a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBitArray.h b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBitArray.h index c095021c9..5c0eed338 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBitArray.h +++ b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBitArray.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDatabaseInterface/DbBindableString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h" +#include "sharedFoundation/BitArray.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableDouble.cpp b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableDouble.cpp index 500e349c0..c3868f45d 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableDouble.cpp +++ b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableDouble.cpp @@ -5,14 +5,13 @@ // // ====================================================================== -#include - #include "sharedDatabaseInterface/FirstSharedDatabaseInterface.h" #include "sharedDatabaseInterface/DbBindableDouble.h" #include "sharedDatabaseInterface/DbServer.h" #include +#include // ====================================================================== diff --git a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/FirstSharedDatabaseInterface.h b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/FirstSharedDatabaseInterface.h index 931ffecb3..dacf606ae 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/FirstSharedDatabaseInterface.h +++ b/src/engine/shared/library/sharedDatabaseInterface/src/shared/core/FirstSharedDatabaseInterface.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" diff --git a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/DebugHelp.h b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/DebugHelp.h index c89de30e2..a0d0f9f4b 100644 --- a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/DebugHelp.h +++ b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/DebugHelp.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/DebugHelp.h" +#include "../../src/win32/DebugHelp.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/DebugHelp.h" +#include "../../src/linux/DebugHelp.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/RemoteDebug.h b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/RemoteDebug.h index d9b3ca821..fec418b3d 100644 --- a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/RemoteDebug.h +++ b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/RemoteDebug.h @@ -1 +1 @@ -#include "../../../src/shared/RemoteDebug.h" +#include "../../src/shared/RemoteDebug.h" diff --git a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/Report.h b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/Report.h index 3c929df2d..5aa8c121b 100644 --- a/src/engine/shared/library/sharedDebug/include/public/sharedDebug/Report.h +++ b/src/engine/shared/library/sharedDebug/include/public/sharedDebug/Report.h @@ -1 +1 @@ -#include "../../../src/shared/Report.h" +#include "../../src/shared/Report.h" diff --git a/src/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp b/src/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp index e5e0c980a..c02aa59f6 100644 --- a/src/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp +++ b/src/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp @@ -14,9 +14,10 @@ #include #include #include +#include #include #include -#include + // ====================================================================== class SymbolCache @@ -35,9 +36,9 @@ public: static SymbolInfo const &lookup(void const *addr); static char const *uniqueString(char const *s); static void *memPoolAllocate(size_t size); - static const size_t cms_memPoolMaxBytes = 8*1024*1024; -private: +//private: + static const size_t cms_memPoolMaxBytes = 8*1024*1024; static size_t ms_memPoolUsed; static char ms_memPool[cms_memPoolMaxBytes]; static char *ms_memPoolFreeList; diff --git a/src/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp b/src/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp index 59cd24bc1..3dff8883b 100644 --- a/src/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp +++ b/src/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp @@ -129,6 +129,8 @@ void DebugMonitor::install(void) if (tcgetattr(inputFd, &terminalAttributes) != 0) { DEBUG_WARNING(true, ("DebugMonitor: tcgetattr failed [%s].", strerror(errno))); + fclose(s_ttyOutputFile); + fclose(s_ttyInputFile); return; } @@ -146,6 +148,8 @@ void DebugMonitor::install(void) if (tcsetattr(inputFd, TCSAFLUSH, &terminalAttributes) != 0) { DEBUG_WARNING(true, ("DebugMonitor: tcsetattr failed [%s].", strerror(errno))); + fclose(s_ttyOutputFile); + fclose(s_ttyInputFile); return; } #endif @@ -208,6 +212,8 @@ void DebugMonitor::install(void) // Allow translation of arrow keys. if (keypad(s_outputWindow, true) == ERR) { + fclose(s_ttyOutputFile); + fclose(s_ttyInputFile); DEBUG_WARNING(true, ("DebugMonitor: keypad() failed [%s].", strerror(errno))); return; } @@ -218,6 +224,9 @@ void DebugMonitor::install(void) // NOTE: this can't go on the exit chain because the MemoryManager // will write to it way late in processing. //ExitChain::add(remove, "DebugMonitor"); + + fclose(s_ttyOutputFile); + fclose(s_ttyInputFile); } // ---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp b/src/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp index f8c3deb04..8e4010381 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp +++ b/src/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp @@ -208,7 +208,7 @@ void CallStackCollector::sample(char const * const name) //-- Get the desired node Node * node = 0; ConstCharCrcString const crcName(name); - NodeMap::iterator iter = ms_nodeMap.find(&crcName); + NodeMap::iterator iter = ms_nodeMap.find((const CrcString*)&crcName); if (iter != ms_nodeMap.end()) node = iter->second; else diff --git a/src/engine/shared/library/sharedDebug/src/shared/FirstSharedDebug.h b/src/engine/shared/library/sharedDebug/src/shared/FirstSharedDebug.h index f30ac0173..bb0862677 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/FirstSharedDebug.h +++ b/src/engine/shared/library/sharedDebug/src/shared/FirstSharedDebug.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDebug/src/shared/LeakFinder.h b/src/engine/shared/library/sharedDebug/src/shared/LeakFinder.h index e3a44d843..13fb282a4 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/LeakFinder.h +++ b/src/engine/shared/library/sharedDebug/src/shared/LeakFinder.h @@ -17,7 +17,7 @@ #include #include -#include +#include // ====================================================================== @@ -89,7 +89,7 @@ protected: ReferenceCountingData *referenceData; }; - typedef std::hash_map ObjectMap; + typedef std::unordered_map ObjectMap; ObjectMap liveObjects; }; diff --git a/src/engine/shared/library/sharedDebug/src/shared/PixCounter.h b/src/engine/shared/library/sharedDebug/src/shared/PixCounter.h index bfbabcc31..c7e580859 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/PixCounter.h +++ b/src/engine/shared/library/sharedDebug/src/shared/PixCounter.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" #include // ====================================================================== diff --git a/src/engine/shared/library/sharedDebug/src/shared/Profiler.h b/src/engine/shared/library/sharedDebug/src/shared/Profiler.h index 2f979c149..aaa11d16d 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/Profiler.h +++ b/src/engine/shared/library/sharedDebug/src/shared/Profiler.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDebug/src/shared/Report.cpp b/src/engine/shared/library/sharedDebug/src/shared/Report.cpp index 7946e8301..69de29bd3 100644 --- a/src/engine/shared/library/sharedDebug/src/shared/Report.cpp +++ b/src/engine/shared/library/sharedDebug/src/shared/Report.cpp @@ -169,14 +169,14 @@ void Report::puts(const char *buffer) } // fatal strings should be made very obvious, so pop up a message box - if ((flags & RF_dialog) && Os::isMainThread()) - { - const char *title = "Report"; - if (flags & RF_fatal) - title = "Fatal Report"; + //if ((flags & RF_dialog) && Os::isMainThread()) + //{ + // const char *title = "Report"; + // if (flags & RF_fatal) + // title = "Fatal Report"; - MessageBox(NULL, buffer, title, MB_OK | MB_ICONEXCLAMATION); - } + // MessageBox(NULL, buffer, title, MB_OK | MB_ICONEXCLAMATION); + //} } // ---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp b/src/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp index 4cef16a7b..b80a6a450 100644 --- a/src/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp +++ b/src/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp @@ -63,7 +63,7 @@ namespace DebugHelpNamespace // ---------------------------------------------------------------------- - static BOOL CALLBACK loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext); + //BOOL CALLBACK loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext); // ---------------------------------------------------------------------- @@ -356,7 +356,7 @@ using namespace DebugHelpNamespace; // ---------------------------------------------------------------------- -BOOL CALLBACK DebugHelpNamespace::loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext) +BOOL CALLBACK loadSymbolsForDllCallback(PSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext) { if (!library) return false; @@ -475,7 +475,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name) return false; CallbackData callbackData = { name, false }; - enumerateLoadedModules64(process, loadSymbolsForDllCallback, reinterpret_cast(&callbackData)); + enumerateLoadedModules64(process, (PENUMLOADED_MODULES_CALLBACK64)loadSymbolsForDllCallback, reinterpret_cast(&callbackData)); return callbackData.loaded; } diff --git a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h index c6b1d630a..c992ed112 100644 --- a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h +++ b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h @@ -13,7 +13,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedDebug/src/win32/VTune.h b/src/engine/shared/library/sharedDebug/src/win32/VTune.h index 4f8458bce..31125646d 100644 --- a/src/engine/shared/library/sharedDebug/src/win32/VTune.h +++ b/src/engine/shared/library/sharedDebug/src/win32/VTune.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" +#include "sharedFoundation/Production.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp b/src/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp index 6c47b26cb..1df4d6d68 100644 --- a/src/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp +++ b/src/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp @@ -123,8 +123,8 @@ FileStreamer::File *FileStreamer::open(const char *fileName, bool randomAccess) reportModDirectory(fileName, "appearance/", "Appearance") || reportModDirectory(fileName, "music/", "Music") || reportModDirectory(fileName, "sound/", "Sound") || - reportModDirectory(fileName, "camera/", "Camera") || - reportModDirectory(fileName, "shader/", "Shader"); + reportModDirectory(fileName, "camera/", "Camera"); // || + //reportModDirectory(fileName, "shader/", "Shader"); #endif // return the opened file diff --git a/src/engine/shared/library/sharedFile/src/shared/FirstSharedFile.h b/src/engine/shared/library/sharedFile/src/shared/FirstSharedFile.h index 136ecf9a4..7add7f5a7 100644 --- a/src/engine/shared/library/sharedFile/src/shared/FirstSharedFile.h +++ b/src/engine/shared/library/sharedFile/src/shared/FirstSharedFile.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" diff --git a/src/engine/shared/library/sharedFile/src/shared/Iff.cpp b/src/engine/shared/library/sharedFile/src/shared/Iff.cpp index 0f1c82e65..7dd0e31ca 100644 --- a/src/engine/shared/library/sharedFile/src/shared/Iff.cpp +++ b/src/engine/shared/library/sharedFile/src/shared/Iff.cpp @@ -21,6 +21,7 @@ #include "sharedMath/Vector.h" #include "sharedMath/VectorArgb.h" +#include #include // ====================================================================== diff --git a/src/engine/shared/library/sharedFile/src/shared/Iff.h b/src/engine/shared/library/sharedFile/src/shared/Iff.h index 99cb79404..71e07c443 100644 --- a/src/engine/shared/library/sharedFile/src/shared/Iff.h +++ b/src/engine/shared/library/sharedFile/src/shared/Iff.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class AbstractFile; class Quaternion; diff --git a/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp b/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp index 7596b1d16..9c63e47da 100644 --- a/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp +++ b/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp @@ -1055,7 +1055,7 @@ bool TreeFile::SearchCache::exists(char const * const fileName, bool & deleted) deleted = false; TemporaryCrcString const crcString(fileName, true); - return m_cachedFileMap->find(&crcString) != m_cachedFileMap->end(); + return m_cachedFileMap->find((const CrcString*)&crcString) != m_cachedFileMap->end(); } // ---------------------------------------------------------------------- @@ -1065,7 +1065,7 @@ int TreeFile::SearchCache::getFileSize(char const * const fileName, bool & delet deleted = false; TemporaryCrcString const crcString(fileName, true); - CachedFileMap::iterator iter = m_cachedFileMap->find(&crcString); + CachedFileMap::iterator iter = m_cachedFileMap->find((const CrcString*)&crcString); if (iter != m_cachedFileMap->end()) return iter->second->getUncompressedLength(); @@ -1101,7 +1101,7 @@ AbstractFile * TreeFile::SearchCache::open(char const * const fileName, Abstract deleted = false; TemporaryCrcString const crcString(fileName, true); - CachedFileMap::iterator iter = m_cachedFileMap->find(&crcString); + CachedFileMap::iterator iter = m_cachedFileMap->find((const CrcString*)&crcString); if (iter != m_cachedFileMap->end()) return iter->second->createAbstractFile(); diff --git a/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h b/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h index 4c76532dd..e6da01178 100644 --- a/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h +++ b/src/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h @@ -17,9 +17,9 @@ class MemoryBlockManager; #include "sharedFile/TreeFile.h" #include "sharedFile/FileStreamer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Os.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/LessPointerComparator.h" +#include "sharedFoundation/Os.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ApplicationVersion.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ApplicationVersion.h index e8cd7ae8f..be446638c 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ApplicationVersion.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ApplicationVersion.h @@ -1 +1 @@ -#include "../../../src/shared/ApplicationVersion.h" +#include "../../src/shared/ApplicationVersion.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h index 3aa7feddb..524cefc93 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h @@ -1 +1 @@ -#include "../../../src/shared/ArrayList.h" +#include "../../src/shared/ArrayList.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h index 5c70deae5..00dfd9849 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h @@ -1 +1 @@ -#include "../../../src/shared/Binary.h" +#include "../../src/shared/Binary.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h index d406b0bc9..5edacc682 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h @@ -1 +1 @@ -#include "../../../src/shared/BitArray.h" +#include "../../src/shared/BitArray.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Branch.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Branch.h index 2afde5ba6..4f7a0c303 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Branch.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Branch.h @@ -1 +1 @@ -#include "../../../src/shared/Branch.h" +#include "../../src/shared/Branch.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ByteOrder.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ByteOrder.h index f5dfebd5c..5dec355ed 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ByteOrder.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ByteOrder.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/ByteOrder.h" +#include "../../src/win32/ByteOrder.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/ByteOrder.h" +#include "../../src/linux/ByteOrder.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CalendarTime.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CalendarTime.h index 696fc47f5..35a07e338 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CalendarTime.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CalendarTime.h @@ -1 +1 @@ -#include "../../../src/shared/CalendarTime.h" +#include "../../src/shared/CalendarTime.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CallbackEntryBase.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CallbackEntryBase.h index 7370ad04a..7b4303792 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CallbackEntryBase.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CallbackEntryBase.h @@ -1 +1 @@ -#include "../../../src/shared/CallbackEntryBase.h" +#include "../../src/shared/CallbackEntryBase.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Clock.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Clock.h index c7f4475fe..c2ea66e51 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Clock.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Clock.h @@ -1 +1 @@ -#include "../../../src/shared/Clock.h" +#include "../../src/shared/Clock.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CommandLine.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CommandLine.h index e320989da..e7b2f48f9 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CommandLine.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CommandLine.h @@ -1 +1 @@ -#include "../../../src/shared/CommandLine.h" +#include "../../src/shared/CommandLine.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigFile.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigFile.h index 63e019391..a5200d271 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigFile.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigFile.h @@ -1 +1 @@ -#include "../../../src/shared/ConfigFile.h" +#include "../../src/shared/ConfigFile.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h index b68196d65..6c1c3863e 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/ConfigSharedFoundation.h" +#include "../../src/win32/ConfigSharedFoundation.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/ConfigSharedFoundation.h" +#include "../../src/linux/ConfigSharedFoundation.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcLowerString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcLowerString.h index 41a6429d2..accfec101 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcLowerString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcLowerString.h @@ -1 +1 @@ -#include "../../../src/shared/ConstCharCrcLowerString.h" +#include "../../src/shared/ConstCharCrcLowerString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcString.h index 9c030b0b8..2f52142d8 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConstCharCrcString.h @@ -1 +1 @@ -#include "../../../src/shared/ConstCharCrcString.h" +#include "../../src/shared/ConstCharCrcString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrashReportInformation.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrashReportInformation.h index 972495260..aa8d41286 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrashReportInformation.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrashReportInformation.h @@ -1 +1 @@ -#include "../../../src/shared/CrashReportInformation.h" +#include "../../src/shared/CrashReportInformation.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Crc.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Crc.h index b09a45451..af5b1ea57 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Crc.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Crc.h @@ -1 +1 @@ -#include "../../../src/shared/Crc.h" +#include "../../src/shared/Crc.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h index d17c49ce0..c531dc4f7 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h @@ -1 +1 @@ -#include "../../../src/shared/CrcLowerString.h" +#include "../../src/shared/CrcLowerString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h index dfd7d366b..6c7c9aa34 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h @@ -1 +1 @@ -#include "../../../src/shared/CrcString.h" +#include "../../src/shared/CrcString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcStringTable.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcStringTable.h index 79fa4ff9b..6f2bdce75 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcStringTable.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcStringTable.h @@ -1 +1 @@ -#include "../../../src/shared/CrcStringTable.h" +#include "../../src/shared/CrcStringTable.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h index 50bb36d8d..9bb6fc7bc 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h @@ -1 +1 @@ -#include "../../../src/shared/DataResource.h" +#include "../../src/shared/DataResource.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h index 7ac47b2a4..d6b56ebf4 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h @@ -1 +1 @@ -#include "../../../src/shared/DataResourceList.h" +#include "../../src/shared/DataResourceList.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DebugInfoManager.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DebugInfoManager.h index 0789cdfe9..b2f3bf902 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DebugInfoManager.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DebugInfoManager.h @@ -1 +1 @@ -#include "../../../src/shared/DebugInfoManager.h" +#include "../../src/shared/DebugInfoManager.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h index c4f872d40..10d9c397c 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h @@ -1 +1 @@ -#include "../../../src/shared/dynamicVariable/DynamicVariable.h" +#include "../../src/shared/dynamicVariable/DynamicVariable.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h index b450bf111..7c5519fc7 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h @@ -1 +1 @@ -#include "../../../src/shared/dynamicVariable/DynamicVariableList.h" +#include "../../src/shared/dynamicVariable/DynamicVariableList.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableListNestedList.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableListNestedList.h index 75396bd79..68c925eae 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableListNestedList.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableListNestedList.h @@ -1 +1 @@ -#include "../../../src/shared/dynamicVariable/DynamicVariableListNestedList.h" +#include "../../src/shared/dynamicVariable/DynamicVariableListNestedList.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableLocationData.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableLocationData.h index b8a901d66..59175634b 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableLocationData.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableLocationData.h @@ -1 +1 @@ -#include "../../../src/shared/dynamicVariable/DynamicVariableLocationData.h" +#include "../../src/shared/dynamicVariable/DynamicVariableLocationData.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h index 9ce909626..416a46fdc 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h @@ -1 +1 @@ -#include "../../../src/shared/ExitChain.h" +#include "../../src/shared/ExitChain.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Fatal.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Fatal.h index d7e4278e7..b1e25d33a 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Fatal.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Fatal.h @@ -1 +1 @@ -#include "../../../src/shared/Fatal.h" +#include "../../src/shared/Fatal.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h index 107c65e8e..5d30aa474 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/FirstPlatform.h" +#include "../../src/win32/FirstPlatform.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/FirstPlatform.h" +#include "../../src/linux/FirstPlatform.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h index 821d1da2c..9ba92c6b8 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h @@ -1 +1 @@ -#include "../../../src/shared/FirstSharedFoundation.h" +#include "../../src/shared/FirstSharedFoundation.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatMath.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatMath.h index 45855382a..adda22f2f 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatMath.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatMath.h @@ -1 +1 @@ -#include "../../../src/shared/FloatMath.h" +#include "../../src/shared/FloatMath.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatingPointUnit.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatingPointUnit.h index 40f06f858..4cdd53fc3 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatingPointUnit.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatingPointUnit.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/FloatingPointUnit.h" +#include "../../src/win32/FloatingPointUnit.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/FloatingPointUnit.h" +#include "../../src/linux/FloatingPointUnit.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FormattedString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FormattedString.h index b5e55c952..50788f1f8 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FormattedString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/FormattedString.h @@ -1 +1 @@ -#include "../../../src/shared/FormattedString.h" +#include "../../src/shared/FormattedString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.def b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.def index c956186ae..b71122d1c 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.def +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.def @@ -1 +1 @@ -#include "../../../src/shared/GameControllerMessage.def" +#include "../../src/shared/GameControllerMessage.def" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.h index c10d03006..f7bfa200f 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.h @@ -1 +1 @@ -#include "../../../src/shared/GameControllerMessage.h" +#include "../../src/shared/GameControllerMessage.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h index 7ffcad231..05ed2168d 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h @@ -1 +1 @@ -#include "../../../src/shared/LabelHash.h" +#include "../../src/shared/LabelHash.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h index 231413334..81ea03312 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h @@ -1 +1 @@ -#include "../../../src/shared/LessPointerComparator.h" +#include "../../src/shared/LessPointerComparator.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MacroFoundation.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MacroFoundation.h index d5083e4e1..195575ca8 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MacroFoundation.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MacroFoundation.h @@ -1 +1 @@ -#include "../../../src/shared/MacroFoundation.h" +#include "../../src/shared/MacroFoundation.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Md5.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Md5.h index 36fe6f32f..55f5ee2cd 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Md5.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Md5.h @@ -1 +1 @@ -#include "../../../src/shared/Md5.h" +#include "../../src/shared/Md5.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManager.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManager.h index 0099e9640..a29473e43 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManager.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManager.h @@ -1 +1 @@ -#include "../../../src/shared/MemoryBlockManager.h" +#include "../../src/shared/MemoryBlockManager.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h index c295e186a..932a80094 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h @@ -1 +1 @@ -#include "../../../src/shared/MemoryBlockManagerMacros.h" +#include "../../src/shared/MemoryBlockManagerMacros.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h index 21dfd5328..7103a7b0a 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h @@ -1 +1 @@ -#include "../../../src/shared/MessageQueue.h" +#include "../../src/shared/MessageQueue.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueueDataTemplate.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueueDataTemplate.h index 57ee3d413..8486adf0d 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueueDataTemplate.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueueDataTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/MessageQueueDataTemplate.h" +#include "../../src/shared/MessageQueueDataTemplate.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h index 1cf2cde44..793834897 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h @@ -1 +1 @@ -#include "../../../src/shared/Misc.h" +#include "../../src/shared/Misc.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h index 408c87145..f33be2cc0 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h @@ -1 +1 @@ -#include "../../../src/shared/NetworkId.h" +#include "../../src/shared/NetworkId.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h index 87e890179..a4204148e 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h @@ -1 +1 @@ -#include "../../../src/shared/NetworkIdArchive.h" +#include "../../src/shared/NetworkIdArchive.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Os.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Os.h index f64aca7bb..8578388e7 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Os.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Os.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/Os.h" +#include "../../src/win32/Os.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/Os.h" +#include "../../src/linux/Os.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PerThreadData.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PerThreadData.h index bc70933fa..31db1f7dc 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PerThreadData.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PerThreadData.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/PerThreadData.h" +#include "../../src/win32/PerThreadData.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/PerThreadData.h" +#include "../../src/linux/PerThreadData.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h index 2b2216fd3..ae0b6608e 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h @@ -1 +1 @@ -#include "../../../src/shared/PersistentCrcString.h" +#include "../../src/shared/PersistentCrcString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PlatformGlue.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PlatformGlue.h index 5bf96f950..394db13ff 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PlatformGlue.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PlatformGlue.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/PlatformGlue.h" +#include "../../src/win32/PlatformGlue.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/PlatformGlue.h" +#include "../../src/linux/PlatformGlue.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PointerDeleter.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PointerDeleter.h index 2341acee4..e1c3c5ad3 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PointerDeleter.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/PointerDeleter.h @@ -1 +1 @@ -#include "../../../src/shared/PointerDeleter.h" +#include "../../src/shared/PointerDeleter.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ProcessSpawner.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ProcessSpawner.h index a4ca58eb7..35e4a9da0 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ProcessSpawner.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/ProcessSpawner.h @@ -1 +1 @@ -#include "../../../src/win32/ProcessSpawner.h" +#include "../../src/win32/ProcessSpawner.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h index 673c024f5..68a323885 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h @@ -1 +1 @@ -#include "../../../src/shared/Production.h" +#include "../../src/shared/Production.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/RegistryKey.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/RegistryKey.h index ea3fb4718..ab5cf83c6 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/RegistryKey.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/RegistryKey.h @@ -1,5 +1,5 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/RegistryKey.h" +#include "../../src/win32/RegistryKey.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SafeCast.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SafeCast.h index dd48fd73e..525233d8d 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SafeCast.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SafeCast.h @@ -1 +1 @@ -#include "../../../src/shared/SafeCast.h" +#include "../../src/shared/SafeCast.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Scheduler.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Scheduler.h index b6306cd24..5237d7b77 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Scheduler.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Scheduler.h @@ -1 +1 @@ -#include "../../../src/shared/Scheduler.h" +#include "../../src/shared/Scheduler.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h index 98e203b85..61b743bfc 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/SetupSharedFoundation.h" +#include "../../src/win32/SetupSharedFoundation.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/SetupSharedFoundation.h" +#include "../../src/linux/SetupSharedFoundation.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StaticCallbackEntry.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StaticCallbackEntry.h index 37959b116..a372b9d74 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StaticCallbackEntry.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StaticCallbackEntry.h @@ -1 +1 @@ -#include "../../../src/shared/StaticCallbackEntry.h" +#include "../../src/shared/StaticCallbackEntry.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h index c5e9fe16d..472cc5244 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h @@ -1 +1 @@ -#include "../../../src/shared/StationId.h" +#include "../../src/shared/StationId.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h index 922b81de2..020bdaebf 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h @@ -1 +1 @@ -#include "../../../src/shared/StlForwardDeclaration.h" +#include "../../src/shared/StlForwardDeclaration.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StringCompare.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StringCompare.h index b6b1343b1..414d943e0 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StringCompare.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/StringCompare.h @@ -1 +1 @@ -#include "../../../src/shared/StringCompare.h" +#include "../../src/shared/StringCompare.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h index 500752c63..8e7912933 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h @@ -1 +1 @@ -#include "../../../src/shared/Tag.h" +#include "../../src/shared/Tag.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h index 4ff16782d..132e7a38e 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h @@ -1 +1 @@ -#include "../../../src/shared/TemporaryCrcString.h" +#include "../../src/shared/TemporaryCrcString.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h index c540f4a3a..293769fae 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h @@ -1 +1 @@ -#include "../../../src/shared/Timer.h" +#include "../../src/shared/Timer.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidBindSecond.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidBindSecond.h index eafa8e57b..cd9683582 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidBindSecond.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidBindSecond.h @@ -1 +1 @@ -#include "../../../src/shared/VoidBindSecond.h" +#include "../../src/shared/VoidBindSecond.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidMemberFunction.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidMemberFunction.h index 9e917cc0d..0f2be2a27 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidMemberFunction.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/VoidMemberFunction.h @@ -1 +1 @@ -#include "../../../src/shared/VoidMemberFunction.h" +#include "../../src/shared/VoidMemberFunction.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h index 222e86e17..bc4deeb8c 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h @@ -1 +1 @@ -#include "../../../src/shared/Watcher.h" +#include "../../src/shared/Watcher.h" diff --git a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/WindowsWrapper.h b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/WindowsWrapper.h index f302949a9..f432a850c 100644 --- a/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/WindowsWrapper.h +++ b/src/engine/shared/library/sharedFoundation/include/public/sharedFoundation/WindowsWrapper.h @@ -1,5 +1,5 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/WindowsWrapper.h" +#include "../../src/win32/WindowsWrapper.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedFoundation/src/linux/ByteOrder.h b/src/engine/shared/library/sharedFoundation/src/linux/ByteOrder.h index 0a3ff3348..acb0e335d 100644 --- a/src/engine/shared/library/sharedFoundation/src/linux/ByteOrder.h +++ b/src/engine/shared/library/sharedFoundation/src/linux/ByteOrder.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h" +#include "sharedFoundation/FirstPlatform.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/linux/FirstPlatform.h b/src/engine/shared/library/sharedFoundation/src/linux/FirstPlatform.h index 1ab235dc0..7d2ac3bc0 100644 --- a/src/engine/shared/library/sharedFoundation/src/linux/FirstPlatform.h +++ b/src/engine/shared/library/sharedFoundation/src/linux/FirstPlatform.h @@ -31,7 +31,7 @@ #include #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PlatformGlue.h" +#include "sharedFoundation/PlatformGlue.h" #include "sharedMemoryManager/MemoryManager.h" diff --git a/src/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h b/src/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h index 596e65a3e..df4fd5f61 100644 --- a/src/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h +++ b/src/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h" +#include "sharedFoundation/ExitChain.h" class Gate; diff --git a/src/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp b/src/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp index e2d7da295..21668a798 100644 --- a/src/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp +++ b/src/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp @@ -3,10 +3,10 @@ #include -real abs(real x) -{ - return fabs(x); -} +//real abs(real x) +//{ +// return fabs(x); +//} int _stricmp(const char* string1, const char* string2) { diff --git a/src/engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h b/src/engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h index 355047025..62d073adf 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h @@ -12,8 +12,8 @@ #include "Archive/AutoDeltaMap.h" #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "Archive/AutoDeltaPackedMap.h" // ====================================================================== @@ -26,7 +26,7 @@ namespace Archive * all respects except that packDeltas() will send the entire map * on the network. */ - + template<> void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { char temp[200]; @@ -58,6 +58,7 @@ namespace Archive } } + template<> void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { char temp[200]; diff --git a/src/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp b/src/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp index cb9fd7ade..f094d1405 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp +++ b/src/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp @@ -12,6 +12,8 @@ #include "Archive/Archive.h" #include "sharedFoundation/FormattedString.h" +#include + // ====================================================================== BitArray::BitArray() : diff --git a/src/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h b/src/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h index 6a62f1cdf..a4c034ed0 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h @@ -12,7 +12,7 @@ class StringCompare; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcLowerString.h b/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcLowerString.h index 764aad8ad..884b62724 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcLowerString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcLowerString.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcString.h b/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcString.h index edcd30f21..ac444d99f 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/ConstCharCrcString.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h" +#include "sharedFoundation/CrcString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/CrcLowerString.h b/src/engine/shared/library/sharedFoundation/src/shared/CrcLowerString.h index 1c35dcd25..5398264f7 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/CrcLowerString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/CrcLowerString.h @@ -12,8 +12,8 @@ // ====================================================================== -#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" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedFoundation/src/shared/DataResource.h b/src/engine/shared/library/sharedFoundation/src/shared/DataResource.h index 3a297470e..939272487 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/DataResource.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/DataResource.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h b/src/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h index 3ab9cf37d..c5574f7f7 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h @@ -12,12 +12,12 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LessPointerComparator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/TemporaryCrcString.h" +#include "sharedFoundation/ConfigSharedFoundation.h" +#include "sharedFoundation/CrcString.h" +#include "sharedFoundation/ExitChain.h" +#include "sharedFoundation/LessPointerComparator.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/TemporaryCrcString.h" #include #include @@ -365,7 +365,7 @@ inline T * DataResourceList::reload(Iff &source) NOT_NULL(ms_loaded); const TemporaryCrcString sourceCrcString (source.getFileName(), true); - typename LoadedDataResourceMap::iterator iter = ms_loaded->find(&sourceCrcString); + typename LoadedDataResourceMap::iterator iter = ms_loaded->find((const CrcString*)&sourceCrcString); if (iter == ms_loaded->end()) { DEBUG_WARNING(true, ("DataResourceList::reload: trying to reload unloaded resource %s!", source.getFileName())); @@ -388,7 +388,7 @@ inline const bool DataResourceList::isLoaded(const std::string & source) { NOT_NULL(ms_loaded); const TemporaryCrcString sourceCrcString (source.c_str (), true); - typename LoadedDataResourceMap::iterator iter = ms_loaded->find(&sourceCrcString); + typename LoadedDataResourceMap::iterator iter = ms_loaded->find((const CrcString*)&sourceCrcString); return (iter != ms_loaded->end()); } diff --git a/src/engine/shared/library/sharedFoundation/src/shared/FirstSharedFoundation.h b/src/engine/shared/library/sharedFoundation/src/shared/FirstSharedFoundation.h index f845ce12c..60793e0d0 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/FirstSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/FirstSharedFoundation.h @@ -32,9 +32,9 @@ // ====================================================================== // things we really have to have -#include "../../../../../../engine/shared/library/sharedFoundationTypes/include/public/sharedFoundationTypes/FoundationTypes.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstPlatform.h" -#include "../../../../../../engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/MemoryManager.h" +#include "sharedFoundationTypes/FoundationTypes.h" +#include "sharedFoundation/FirstPlatform.h" +#include "sharedMemoryManager/MemoryManager.h" // ====================================================================== @@ -70,16 +70,16 @@ const float REAL_MAX = FLT_MAX; #include #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MacroFoundation.h" +#include "sharedFoundation/MacroFoundation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Fatal.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h" -#include "../../../../../../engine/shared/library/sharedDebug/include/public/sharedDebug/RemoteDebug.h" -#include "../../../../../../engine/shared/library/sharedDebug/include/public/sharedDebug/Report.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FloatMath.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/SafeCast.h" +#include "sharedFoundation/Binary.h" +#include "sharedFoundation/Fatal.h" +#include "sharedFoundation/StlForwardDeclaration.h" +#include "sharedFoundation/Misc.h" +#include "sharedDebug/RemoteDebug.h" +#include "sharedDebug/Report.h" +#include "sharedFoundation/FloatMath.h" +#include "sharedFoundation/SafeCast.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/FloatMath.h b/src/engine/shared/library/sharedFoundation/src/shared/FloatMath.h index 2649abfef..fab909b68 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/FloatMath.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/FloatMath.h @@ -90,7 +90,6 @@ inline float abs(float f) { return std::abs(f); } -#endif inline float sqrt(float f) { @@ -131,6 +130,7 @@ inline float pow(float x, float y) { return std::pow(x, y); } +#endif #endif diff --git a/src/engine/shared/library/sharedFoundation/src/shared/FormattedString.h b/src/engine/shared/library/sharedFoundation/src/shared/FormattedString.h index e6e1fb266..b4e1f6de8 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/FormattedString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/FormattedString.h @@ -8,6 +8,8 @@ #ifndef INCLUDED_FormattedString_H #define INCLUDED_FormattedString_H +#include + // ---------------------------------------------------------------------- template class FormattedString diff --git a/src/engine/shared/library/sharedFoundation/src/shared/GameControllerMessage.h b/src/engine/shared/library/sharedFoundation/src/shared/GameControllerMessage.h index ec4404427..3f4264f3a 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/GameControllerMessage.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/GameControllerMessage.h @@ -37,6 +37,6 @@ namespace GameControllerMessageFlags DEST_SERVER; } -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.def" +#include "sharedFoundation/GameControllerMessage.def" #endif diff --git a/src/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp b/src/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp index 2ded12c96..c5c86efdd 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp +++ b/src/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp @@ -14,6 +14,7 @@ #include "sharedFoundation/ConfigSharedFoundation.h" #include "sharedSynchronization/Mutex.h" +#include #include #include diff --git a/src/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp b/src/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp index 18d1215b7..5af0285dc 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp +++ b/src/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp @@ -10,6 +10,7 @@ #include "sharedFoundation/FirstSharedFoundation.h" #include "sharedFoundation/MessageQueue.h" +#include #include // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/MessageQueueDataTemplate.h b/src/engine/shared/library/sharedFoundation/src/shared/MessageQueueDataTemplate.h index 93dd38a48..8d1f995f6 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/MessageQueueDataTemplate.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/MessageQueueDataTemplate.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueDataTemplate_H #define INCLUDED_MessageQueueDataTemplate_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" //====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/NetworkId.h b/src/engine/shared/library/sharedFoundation/src/shared/NetworkId.h index 1f42fc609..94978f558 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/NetworkId.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/NetworkId.h @@ -10,6 +10,8 @@ #ifndef INCLUDED_NetworkId_H #define INCLUDED_NetworkId_H +#include + namespace DB { class BindableNetworkId; @@ -27,8 +29,8 @@ public: static const NetworkIdType cms_maxNetworkIdWithoutClusterId; static const NetworkIdType cms_networkIdWithoutClusterIdMask; static const NetworkIdType cms_clusterIdMask; - struct Hash; - friend struct NetworkId::Hash; + struct NetHash; + friend struct NetworkId::NetHash; public: @@ -54,7 +56,7 @@ public: bool isValid() const; bool operator !() const; - struct Hash + struct NetHash { size_t operator()(const NetworkId & source) const { @@ -154,15 +156,5 @@ inline size_t NetworkId::getHashValue () const // ----------------------------------------------------------------------- // STL standard hash function -namespace std -{ - -template <> -struct hash // stl standard hash -{ - size_t operator()(const NetworkId &x) const { return x.getHashValue(); } -}; - -} #endif diff --git a/src/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.h b/src/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.h index b798a7541..239b7a1aa 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.h @@ -12,7 +12,7 @@ // ====================================================================== class MemoryBlockManager; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h" +#include "sharedFoundation/CrcString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/Scheduler.h b/src/engine/shared/library/sharedFoundation/src/shared/Scheduler.h index cc891fa06..97a2aaeef 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/Scheduler.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/Scheduler.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StaticCallbackEntry.h" +#include "sharedFoundation/StaticCallbackEntry.h" //----------------------------------------------------------------------- /** @brief Engine scheduler diff --git a/src/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h b/src/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h index 9f88814d0..110a0368b 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h b/src/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h index 9b62ab20f..d22956592 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h @@ -28,35 +28,19 @@ #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + // ====================================================================== - -namespace std -{ - template struct less; - template struct equal_to; - template struct pair; - template struct hash; - template class allocator; - template class basic_string; - template class char_traits; - - template class bitset; - template class deque; - template class list; - template class queue; - template class vector; - template class stack; - template class priority_queue; - template class map; - template class hash_map; - template class multimap; - template class set; - template class hash_set; - template class multiset; - - typedef basic_string, allocator > string; -} +using namespace std; template > struct stddeque { @@ -73,9 +57,14 @@ template , class _Alloc typedef std::map<_Key, _Tp, _Compare, _Alloc> fwd; }; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdhash_map +template , class _Alloc = std::allocator< std::pair > > struct stdhash_map { - typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; + typedef std::hash_map<_Key, _Tp, _Compare, _Alloc> fwd; +}; + +template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdunordered_map +{ + typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator< std::pair > > struct stdmultimap @@ -88,9 +77,14 @@ template , class _Alloc = std::allo typedef std::set<_Key, _Compare, _Alloc> fwd; }; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdhash_set +template , class _Alloc = std::allocator<_Key> > struct stdhash_set { - typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd; + typedef std::hash_set<_Key, _Compare, _Alloc> fwd; +}; + +template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set +{ + typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator<_Key> > struct stdmultiset diff --git a/src/engine/shared/library/sharedFoundation/src/shared/TemporaryCrcString.h b/src/engine/shared/library/sharedFoundation/src/shared/TemporaryCrcString.h index d82f3c35e..d9785f49c 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/TemporaryCrcString.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/TemporaryCrcString.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcString.h" +#include "sharedFoundation/CrcString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp index 1239bff1b..f11c603e3 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp +++ b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp @@ -492,7 +492,7 @@ bool DynamicVariable::get(std::vector &value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeIntArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeIntArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -503,7 +503,7 @@ bool DynamicVariable::get(std::vector &value) const char *bufpos=buffer; std::string packedString=Unicode::wideToNarrow(m_value); - for(std::string::const_iterator i = packedString.begin(); + for(std::string::const_iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + BUFSIZE; ++i) { if ((*i)==':') @@ -567,7 +567,7 @@ bool DynamicVariable::get(std::vector & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeRealArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeRealArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -578,7 +578,7 @@ bool DynamicVariable::get(std::vector & value) const char *bufpos=buffer; std::string packedString=Unicode::wideToNarrow(m_value); - for(std::string::iterator i = packedString.begin(); + for(std::string::iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + BUFSIZE; ++i) { if ((*i)==':') @@ -632,7 +632,7 @@ bool DynamicVariable::get(std::string & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::string(); - m_cachedValue[1] = DynamicVariableNamespace::freeStdString; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeStdString; } std::string & cachedValue = *(reinterpret_cast(m_cachedValue[0])); @@ -657,7 +657,7 @@ bool DynamicVariable::get(std::vector & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeUnicodeStringArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeUnicodeStringArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -724,7 +724,7 @@ bool DynamicVariable::get(std::vector & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeNetworkIdArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeNetworkIdArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -735,7 +735,7 @@ bool DynamicVariable::get(std::vector & value) const char *bufpos=buffer; std::string packedString=Unicode::wideToNarrow(m_value); - for (std::string::iterator i = packedString.begin(); + for (std::string::iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + BUFSIZE; ++i) { if ((*i)==':') @@ -776,7 +776,7 @@ bool DynamicVariable::get(DynamicVariableLocationData & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new DynamicVariableLocationData(); - m_cachedValue[1] = DynamicVariableNamespace::freeLocation; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeLocation; } DynamicVariableLocationData & cachedValue = *(reinterpret_cast(m_cachedValue[0])); @@ -852,7 +852,7 @@ bool DynamicVariable::get(std::vector & value) cons if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeLocationArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeLocationArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -864,7 +864,7 @@ bool DynamicVariable::get(std::vector & value) cons char *bufpos=buffer; std::string packedString=Unicode::wideToNarrow(m_value); - for(std::string::iterator i = packedString.begin(); + for(std::string::iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + VARBUFSIZE; ++i) { if ((*i)==':') @@ -956,7 +956,7 @@ bool DynamicVariable::get(StringId &value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new StringId(); - m_cachedValue[1] = DynamicVariableNamespace::freeStringId; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeStringId; } StringId & cachedValue = *(reinterpret_cast(m_cachedValue[0])); @@ -983,7 +983,7 @@ bool DynamicVariable::get(std::vector &value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeStringIdArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeStringIdArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -1021,7 +1021,7 @@ bool DynamicVariable::get(Transform &value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new Transform(); - m_cachedValue[1] = DynamicVariableNamespace::freeTransform; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeTransform; } Transform & cachedValue = *(reinterpret_cast(m_cachedValue[0])); @@ -1050,7 +1050,7 @@ bool DynamicVariable::get(std::vector & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeTransformArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeTransformArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -1061,7 +1061,7 @@ bool DynamicVariable::get(std::vector & value) const char *bufpos = buffer; std::string packedString = Unicode::wideToNarrow(m_value); - for (std::string::iterator i = packedString.begin(); + for (std::string::iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + BUFSIZE; ++i) { if ((*i) == ':') @@ -1108,7 +1108,7 @@ bool DynamicVariable::get(Vector &value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new Vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeVector; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeVector; } Vector & cachedValue = *(reinterpret_cast(m_cachedValue[0])); @@ -1133,7 +1133,7 @@ bool DynamicVariable::get(std::vector & value) const if (!m_cachedValue[0]) { m_cachedValue[0] = new std::vector(); - m_cachedValue[1] = DynamicVariableNamespace::freeVectorArray; + m_cachedValue[1] = (void*)DynamicVariableNamespace::freeVectorArray; } std::vector & cachedValue = *(reinterpret_cast *>(m_cachedValue[0])); @@ -1144,7 +1144,7 @@ bool DynamicVariable::get(std::vector & value) const char *bufpos = buffer; std::string packedString = Unicode::wideToNarrow(m_value); - for (std::string::iterator i = packedString.begin(); + for (std::string::iterator i = packedString.begin(); i != packedString.end() && bufpos < buffer + BUFSIZE; ++i) { if ((*i) == ':') diff --git a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h index 26605693e..6a5a22c31 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h @@ -13,10 +13,10 @@ // class DynamicVariableList - a list of DynamicVariables #include "Archive/AutoDeltaMap.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" //@todo: this should be removed -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableListNestedList.h" +#include "sharedFoundation/DynamicVariableListNestedList.h" const char LIST_SEPARATOR = '.'; class DynamicVariableListNestedList; diff --git a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h index f07135f2e..2d321764d 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h @@ -9,7 +9,7 @@ #define INCLUDED_DynamicVariableListNestedList_H #include "Archive/AutoDeltaMap.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include class DynamicVariableList; diff --git a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableLocationData.h b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableLocationData.h index 2fae02a22..d3220bfe4 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableLocationData.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableLocationData.h @@ -9,7 +9,7 @@ #ifndef _INCLUDED_DynamicVariableLocationData_H #define _INCLUDED_DynamicVariableLocationData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" diff --git a/src/engine/shared/library/sharedFoundation/src/win32/FirstPlatform.h b/src/engine/shared/library/sharedFoundation/src/win32/FirstPlatform.h index cd67c2afe..f743afac9 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/FirstPlatform.h +++ b/src/engine/shared/library/sharedFoundation/src/win32/FirstPlatform.h @@ -58,7 +58,7 @@ typedef HINSTANCE__ *HINSTANCE; typedef HWND__ *HWND; // @todo codereorg still working on this -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/WindowsWrapper.h" +#include "sharedFoundation/WindowsWrapper.h" // ====================================================================== // convienent fatal macros that check windows HRESULT codes @@ -69,7 +69,7 @@ typedef HWND__ *HWND; // ====================================================================== // include anything we need to replace missing functionality that other platforms provide -#include "../../../../../../engine/shared/library/sharedFoundation/src/win32/PlatformGlue.h" +#include "sharedFoundation/PlatformGlue.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundation/src/win32/Os.cpp b/src/engine/shared/library/sharedFoundation/src/win32/Os.cpp index 928979e5d..48322c7a4 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/Os.cpp +++ b/src/engine/shared/library/sharedFoundation/src/win32/Os.cpp @@ -30,7 +30,6 @@ #include #include #include -#include // ====================================================================== @@ -259,64 +258,25 @@ void Os::installCommon() CrashReportInformation::addStaticText("Os1: %d.%d.%d\n", versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, versionInfo.dwBuildNumber); char const * os = "Unknown"; - - char CDECL pwine_get_version; - HMODULE hntdll = GetModuleHandle("ntdll.dll"); - - switch (versionInfo.dwMajorVersion) { - case 4: - switch (versionInfo.dwMinorVersion){ - case 10: - os = "Windows 98"; - break; - case 90: - os = "Windows ME"; - break; - } - break; - case 5: - switch (versionInfo.dwMinorVersion) { - case 0: - os = "Windows 2000"; - break; - case 1: + if (versionInfo.dwMajorVersion == 4 && versionInfo.dwMinorVersion == 10) + os = "Windows 98"; + else + if (versionInfo.dwMajorVersion == 4 && versionInfo.dwMinorVersion == 90) + os = "Windows Me"; + else + if (versionInfo.dwMajorVersion == 5 && versionInfo.dwMinorVersion == 0) + os = "Windows 2000"; + else + if (versionInfo.dwMajorVersion == 5 && versionInfo.dwMinorVersion == 1) os = "Windows XP"; - break; - case 2: - os = "Windows 2003"; - break; - } - break; - case 6: - switch (versionInfo.dwMinorVersion){ - case 0: - os = "Windows Vista"; - break; - case 1: - os = "Windows 7"; - break; - case 2: - os = "Windows 8"; - break; - case 3: - os = "Windows 8.1"; - break; - } - break; - case 10: - os = "Windows 10"; - break; - } + else + if (versionInfo.dwMajorVersion == 5 && versionInfo.dwMinorVersion == 2) + os = "Windows Server 2003"; + else + if (versionInfo.dwMajorVersion == 6 && versionInfo.dwMinorVersion == 0) + os = "Windows Vista"; + - //detect WINE - if (hntdll) - { - pwine_get_version = (char)GetProcAddress(hntdll, "wine_get_version"); - if (pwine_get_version) - { - os = strcat("Wine ", &pwine_get_version); - } - } CrashReportInformation::addStaticText("Os2: %s %s\n", os, versionInfo.szCSDVersion); } @@ -657,7 +617,7 @@ void Os::setIMEHookFunction(IMEHookFunction imeHookFunction) ms_IMEHookFunction = imeHookFunction; // do not install the hotkey fix if the debugger is present. - if (ms_IMEHookFunction) //&& !IsDebuggerPresent() removed + if (ms_IMEHookFunction && !OsNamespace::IsDebuggerPresent()) { RegisterHotKey(ms_window, ms_hotKeyId, 0, VK_F5); } diff --git a/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.h b/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.h index e4b564ac8..e45a41708 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.h +++ b/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.h @@ -15,7 +15,7 @@ class Gate; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h" +#include "sharedFoundation/ExitChain.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundationTypes/include/public/sharedFoundationTypes/FoundationTypes.h b/src/engine/shared/library/sharedFoundationTypes/include/public/sharedFoundationTypes/FoundationTypes.h index 69cbbfa42..037fdff62 100644 --- a/src/engine/shared/library/sharedFoundationTypes/include/public/sharedFoundationTypes/FoundationTypes.h +++ b/src/engine/shared/library/sharedFoundationTypes/include/public/sharedFoundationTypes/FoundationTypes.h @@ -1 +1 @@ -#include "../../../src/shared/FoundationTypes.h" +#include "../../src/shared/FoundationTypes.h" diff --git a/src/engine/shared/library/sharedFractal/src/shared/FirstSharedFractal.h b/src/engine/shared/library/sharedFractal/src/shared/FirstSharedFractal.h index 44735be4c..9775607e1 100644 --- a/src/engine/shared/library/sharedFractal/src/shared/FirstSharedFractal.h +++ b/src/engine/shared/library/sharedFractal/src/shared/FirstSharedFractal.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" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AiDebugString.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AiDebugString.h index d9fe8efb3..18aac301b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AiDebugString.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AiDebugString.h @@ -1 +1 @@ -#include "../../../src/shared/core/AiDebugString.h" +#include "../../src/shared/core/AiDebugString.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AppearanceManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AppearanceManager.h index ca8735484..81dbb739c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AppearanceManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AppearanceManager.h @@ -1 +1 @@ -#include "../../../src/shared/object/AppearanceManager.h" +#include "../../src/shared/object/AppearanceManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AssetCustomizationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AssetCustomizationManager.h index 8d82b705f..37d1296e1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AssetCustomizationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AssetCustomizationManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/AssetCustomizationManager.h" +#include "../../src/shared/core/AssetCustomizationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AsteroidGenerationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AsteroidGenerationManager.h index aa13a05b1..6537375b7 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AsteroidGenerationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AsteroidGenerationManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/AsteroidGenerationManager.h" +#include "../../src/shared/space/AsteroidGenerationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribMod.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribMod.h index f41e76967..2ad1fdb0d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribMod.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribMod.h @@ -1 +1 @@ -#include "../../../src/shared/object/AttribMod.h" +#include "../../src/shared/object/AttribMod.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribModArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribModArchive.h index ab6430217..04982ad91 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribModArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AttribModArchive.h @@ -1 +1 @@ -#include "../../../src/shared/object/AttribModArchive.h" +#include "../../src/shared/object/AttribModArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionManager.h index 91d4e6ed8..07bd103f1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/AuctionManager.h" +#include "../../src/shared/core/AuctionManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionToken.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionToken.h index 02541f271..3400b7aa3 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionToken.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionToken.h @@ -1 +1 @@ -#include "../../../src/shared/core/AuctionToken.h" +#include "../../src/shared/core/AuctionToken.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionTokenArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionTokenArchive.h index 8a20e90d1..0138433af 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionTokenArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/AuctionTokenArchive.h @@ -1 +1 @@ -#include "../../../src/shared/core/AuctionTokenArchive.h" +#include "../../src/shared/core/AuctionTokenArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Buff.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Buff.h index 292190c74..48a67577d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Buff.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Buff.h @@ -1 +1 @@ -#include "../../../src/shared/object/Buff.h" +#include "../../src/shared/object/Buff.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CitizenRankDataTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CitizenRankDataTable.h index ab8e4c417..bc65d830d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CitizenRankDataTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CitizenRankDataTable.h @@ -1 +1 @@ -#include "../../../src/shared/core/CitizenRankDataTable.h" +#include "../../src/shared/core/CitizenRankDataTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CityData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CityData.h index 0533d94e2..678f8f23f 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CityData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CityData.h @@ -1 +1 @@ -#include "../../../src/shared/core/CityData.h" +#include "../../src/shared/core/CityData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ClientCombatManagerSupport.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ClientCombatManagerSupport.h index 5177badc8..fc4506dfc 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ClientCombatManagerSupport.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ClientCombatManagerSupport.h @@ -1 +1 @@ -#include "../../../src/shared/core/ClientCombatManagerSupport.h" +#include "../../src/shared/core/ClientCombatManagerSupport.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CollectionsDataTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CollectionsDataTable.h index 7952d148a..0e9ab44f3 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CollectionsDataTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CollectionsDataTable.h @@ -1 +1 @@ -#include "../../../src/shared/core/CollectionsDataTable.h" +#include "../../src/shared/core/CollectionsDataTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CollisionCallbackManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CollisionCallbackManager.h index a34614c43..e7be364e8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CollisionCallbackManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CollisionCallbackManager.h @@ -1 +1 @@ -#include "../../../src/shared/collision/CollisionCallbackManager.h" +#include "../../src/shared/collision/CollisionCallbackManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatDataTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatDataTable.h index e65bccec7..eee3b02a2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatDataTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatDataTable.h @@ -1 +1 @@ -#include "../../../src/shared/combat/CombatDataTable.h" +#include "../../src/shared/combat/CombatDataTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatTimingTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatTimingTable.h index 24e9aae0a..5e723b68d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatTimingTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CombatTimingTable.h @@ -1 +1 @@ -#include "../../../src/shared/combat/CombatTimingTable.h" +#include "../../src/shared/combat/CombatTimingTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Command.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Command.h index 317784859..251a4afae 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Command.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Command.h @@ -1 +1 @@ -#include "../../../src/shared/command/Command.h" +#include "../../src/shared/command/Command.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandChecks.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandChecks.h index c000c8627..605db20b8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandChecks.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandChecks.h @@ -1 +1 @@ -#include "../../../src/shared/command/CommandChecks.h" +#include "../../src/shared/command/CommandChecks.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandCppFunc.def b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandCppFunc.def index 31c26cfcf..696785830 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandCppFunc.def +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandCppFunc.def @@ -1 +1 @@ -#include "../../../src/shared/command/CommandCppFunc.def" +#include "../../src/shared/command/CommandCppFunc.def" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandTable.h index 28328f78e..43328354f 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommandTable.h @@ -1 +1 @@ -#include "../../../src/shared/command/CommandTable.h" +#include "../../src/shared/command/CommandTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommoditiesAdvancedSearchAttribute.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommoditiesAdvancedSearchAttribute.h index 53da326ca..669f5ce7c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CommoditiesAdvancedSearchAttribute.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CommoditiesAdvancedSearchAttribute.h @@ -1 +1 @@ -#include "../../../src/shared/core/CommoditiesAdvancedSearchAttribute.h" +#include "../../src/shared/core/CommoditiesAdvancedSearchAttribute.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ConfigSharedGame.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ConfigSharedGame.h index 6dcf1516d..74562ea7f 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ConfigSharedGame.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ConfigSharedGame.h @@ -1 +1 @@ -#include "../../../src/shared/core/ConfigSharedGame.h" +#include "../../src/shared/core/ConfigSharedGame.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingData.h index e0ce42409..38f97ddeb 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingData.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/core/CraftingData.h" +#include "../../src/shared/core/CraftingData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingDataArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingDataArchive.h index 49d4d18df..a4bea99e6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingDataArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CraftingDataArchive.h @@ -1 +1 @@ -#include "../../../src/shared/core/CraftingDataArchive.h" +#include "../../src/shared/core/CraftingDataArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager.h index d4853aa4a..f9dffd76c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/CustomizationManager.h" +#include "../../src/shared/core/CustomizationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager_MorphParameter.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager_MorphParameter.h index 087367217..55b2d70a6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager_MorphParameter.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/CustomizationManager_MorphParameter.h @@ -1 +1 @@ -#include "../../../src/shared/core/CustomizationManager_MorphParameter.h" +#include "../../src/shared/core/CustomizationManager_MorphParameter.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/DraftSchematicGroupManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/DraftSchematicGroupManager.h index 7617c705a..452aa6ef4 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/DraftSchematicGroupManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/DraftSchematicGroupManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/DraftSchematicGroupManager.h" +#include "../../src/shared/core/DraftSchematicGroupManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/FirstSharedGame.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/FirstSharedGame.h index f4770a1ff..5fb02c1ef 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/FirstSharedGame.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/FirstSharedGame.h @@ -1 +1 @@ -#include "../../../src/shared/core/FirstSharedGame.h" +#include "../../src/shared/core/FirstSharedGame.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/FormManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/FormManager.h index cd45f3d74..623932ae2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/FormManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/FormManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/FormManager.h" +#include "../../src/shared/core/FormManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameLanguageManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameLanguageManager.h index 4f1ff36d8..293b66453 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameLanguageManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameLanguageManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/GameLanguageManager.h" +#include "../../src/shared/core/GameLanguageManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameObjectTypes.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameObjectTypes.h index 0ac3b95ce..31040c9f7 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameObjectTypes.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameObjectTypes.h @@ -1 +1 @@ -#include "../../../src/shared/core/GameObjectTypes.h" +#include "../../src/shared/core/GameObjectTypes.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameScheduler.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameScheduler.h index 44148c887..06dbca2b3 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GameScheduler.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GameScheduler.h @@ -1 +1 @@ -#include "../../../src/shared/core/GameScheduler.h" +#include "../../src/shared/core/GameScheduler.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GroundZoneManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GroundZoneManager.h index ba216dbb7..687d23a3d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GroundZoneManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GroundZoneManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/GroundZoneManager.h" +#include "../../src/shared/core/GroundZoneManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GroupPickupPoint.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GroupPickupPoint.h index a5047ba1c..a08d18794 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GroupPickupPoint.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GroupPickupPoint.h @@ -1 +1 @@ -#include "../../../src/shared/object/GroupPickupPoint.h" +#include "../../src/shared/object/GroupPickupPoint.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/GuildRankDataTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/GuildRankDataTable.h index 5e6e1ce71..5913d8208 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/GuildRankDataTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/GuildRankDataTable.h @@ -1 +1 @@ -#include "../../../src/shared/core/GuildRankDataTable.h" +#include "../../src/shared/core/GuildRankDataTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/HoverPlaneHelper.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/HoverPlaneHelper.h index 12c138fe0..e20b87cb0 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/HoverPlaneHelper.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/HoverPlaneHelper.h @@ -1 +1 @@ -#include "../../../src/shared/core/HoverPlaneHelper.h" +#include "../../src/shared/core/HoverPlaneHelper.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/HyperspaceManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/HyperspaceManager.h index 938a437c1..bdc9e3847 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/HyperspaceManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/HyperspaceManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/HyperspaceManager.h" +#include "../../src/shared/core/HyperspaceManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgCharacterData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgCharacterData.h index 53bc338fd..8b4912dc8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgCharacterData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgCharacterData.h @@ -1 +1 @@ -#include "../../../src/shared/core/LfgCharacterData.h" +#include "../../src/shared/core/LfgCharacterData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgDataTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgDataTable.h index ea21d0b4d..22e0a36e7 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgDataTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/LfgDataTable.h @@ -1 +1 @@ -#include "../../../src/shared/core/LfgDataTable.h" +#include "../../src/shared/core/LfgDataTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/LotManagerNotification.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/LotManagerNotification.h index d78af04fc..1b33d115a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/LotManagerNotification.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/LotManagerNotification.h @@ -1 +1 @@ -#include "../../../src/shared/object/LotManagerNotification.h" +#include "../../src/shared/object/LotManagerNotification.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterPreferenceId.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterPreferenceId.h index 6241d472e..ebe73be72 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterPreferenceId.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterPreferenceId.h @@ -1 +1 @@ -#include "../../../src/shared/object/MatchMakingCharacterPreferenceId.h" +#include "../../src/shared/object/MatchMakingCharacterPreferenceId.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterProfileId.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterProfileId.h index 949db7a83..43f1f3f98 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterProfileId.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterProfileId.h @@ -1 +1 @@ -#include "../../../src/shared/object/MatchMakingCharacterProfileId.h" +#include "../../src/shared/object/MatchMakingCharacterProfileId.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterResult.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterResult.h index 280198b46..7f811adbb 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterResult.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingCharacterResult.h @@ -1 +1 @@ -#include "../../../src/shared/object/MatchMakingCharacterResult.h" +#include "../../src/shared/object/MatchMakingCharacterResult.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingId.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingId.h index e65832b3c..36bf0ab56 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingId.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MatchMakingId.h @@ -1 +1 @@ -#include "../../../src/shared/object/MatchMakingId.h" +#include "../../src/shared/object/MatchMakingId.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MoodManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MoodManager.h index 277ecd83d..3f409dc5d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MoodManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MoodManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/MoodManager.h" +#include "../../src/shared/core/MoodManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/MountValidScaleRangeTable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/MountValidScaleRangeTable.h index 6475303f7..326ac8141 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/MountValidScaleRangeTable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/MountValidScaleRangeTable.h @@ -1 +1 @@ -#include "../../../src/shared/mount/MountValidScaleRangeTable.h" +#include "../../src/shared/mount/MountValidScaleRangeTable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Nebula.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Nebula.h index e1fea7760..d96b26ce7 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Nebula.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Nebula.h @@ -1 +1 @@ -#include "../../../src/shared/space/Nebula.h" +#include "../../src/shared/space/Nebula.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/NebulaManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/NebulaManager.h index 3fb0ee2ec..127e7a196 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/NebulaManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/NebulaManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/NebulaManager.h" +#include "../../src/shared/space/NebulaManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/NoBuildNotification.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/NoBuildNotification.h index 1761a571c..7dba3590a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/NoBuildNotification.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/NoBuildNotification.h @@ -1 +1 @@ -#include "../../../src/shared/object/NoBuildNotification.h" +#include "../../src/shared/object/NoBuildNotification.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/NpcConversationData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/NpcConversationData.h index 2378d3ede..bc198c64d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/NpcConversationData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/NpcConversationData.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/core/NpcConversationData.h" +#include "../../src/shared/core/NpcConversationData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ObjectUsabilityManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ObjectUsabilityManager.h index 06a95458c..f3153e9dd 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ObjectUsabilityManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ObjectUsabilityManager.h @@ -1 +1 @@ -#include "../../../src/shared/object/ObjectUsabilityManager.h" +#include "../../src/shared/object/ObjectUsabilityManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBand.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBand.h index 41f67605c..ba9a826a2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBand.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBand.h @@ -1 +1 @@ -#include "../../../src/shared/core/OutOfBand.h" +#include "../../src/shared/core/OutOfBand.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandBase.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandBase.h index 834e8182a..eaf5d8fc9 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandBase.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandBase.h @@ -1 +1 @@ -#include "../../../src/shared/core/OutOfBandBase.h" +#include "../../src/shared/core/OutOfBandBase.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandPackager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandPackager.h index 930262948..096e6094a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandPackager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/OutOfBandPackager.h @@ -1 +1 @@ -#include "../../../src/shared/core/OutOfBandPackager.h" +#include "../../src/shared/core/OutOfBandPackager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlanetMapManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlanetMapManager.h index b5dca0ce6..f26caaf5d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlanetMapManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlanetMapManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/PlanetMapManager.h" +#include "../../src/shared/core/PlanetMapManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlatformFeatureBits.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlatformFeatureBits.h index de461e24a..2636309cd 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlatformFeatureBits.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlatformFeatureBits.h @@ -1 +1 @@ -#include "../../../src/shared/core/PlatformFeatureBits.h" +#include "../../src/shared/core/PlatformFeatureBits.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerCreationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerCreationManager.h index 5cd8d2d69..1967cbf93 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerCreationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerCreationManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/PlayerCreationManager.h" +#include "../../src/shared/core/PlayerCreationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerData.h index e0c990f87..77d2fbd9d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerData.h @@ -1 +1 @@ -#include "../../../src/shared/core/PlayerData.h" +#include "../../src/shared/core/PlayerData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerFormationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerFormationManager.h index 11c646c82..2f91b139b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerFormationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerFormationManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/PlayerFormationManager.h" +#include "../../src/shared/space/PlayerFormationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerQuestData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerQuestData.h index c540fcf26..8d470b5e8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerQuestData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PlayerQuestData.h @@ -1 +1 @@ -#include "../../../src/shared/quest/PlayerQuestData.h" +#include "../../src/shared/quest/PlayerQuestData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackage.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackage.h index 3d4ead044..8c8ebbde9 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackage.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackage.h @@ -1 +1 @@ -#include "../../../src/shared/core/ProsePackage.h" +#include "../../src/shared/core/ProsePackage.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageArchive.h index 556ce244a..fd973b1b2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageArchive.h @@ -1 +1 @@ -#include "../../../src/shared/core/ProsePackageArchive.h" +#include "../../src/shared/core/ProsePackageArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipant.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipant.h index 71242547b..80b8d2b29 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipant.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipant.h @@ -1 +1 @@ -#include "../../../src/shared/core/ProsePackageParticipant.h" +#include "../../src/shared/core/ProsePackageParticipant.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipantArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipantArchive.h index f0eaa2402..37edc6e92 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipantArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ProsePackageParticipantArchive.h @@ -1 +1 @@ -#include "../../../src/shared/core/ProsePackageParticipantArchive.h" +#include "../../src/shared/core/ProsePackageParticipantArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/PvpData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/PvpData.h index bf7c566ca..6ac67be4d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/PvpData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/PvpData.h @@ -1 +1 @@ -#include "../../../src/shared/core/PvpData.h" +#include "../../src/shared/core/PvpData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Quest.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Quest.h index 5510d7f37..ef1747afa 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Quest.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Quest.h @@ -1 +1 @@ -#include "../../../src/shared/quest/Quest.h" +#include "../../src/shared/quest/Quest.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestManager.h index 1257deac6..d92ff1e65 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestManager.h @@ -1 +1 @@ -#include "../../../src/shared/quest/QuestManager.h" +#include "../../src/shared/quest/QuestManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestTask.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestTask.h index 152588313..59985036d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestTask.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/QuestTask.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/quest/QuestTask.h" +#include "../../src/shared/quest/QuestTask.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/RadialMenuManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/RadialMenuManager.h index b19cfe6e2..24e80e28e 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/RadialMenuManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/RadialMenuManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/RadialMenuManager.h" +#include "../../src/shared/core/RadialMenuManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ResourceClassObject.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ResourceClassObject.h index 9faf684bc..f2dffa8d9 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ResourceClassObject.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ResourceClassObject.h @@ -1 +1 @@ -#include "../../../src/shared/object/ResourceClassObject.h" +#include "../../src/shared/object/ResourceClassObject.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SetupSharedGame.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SetupSharedGame.h index 5a6505742..ac3029ace 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SetupSharedGame.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SetupSharedGame.h @@ -1 +1 @@ -#include "../../../src/shared/core/SetupSharedGame.h" +#include "../../src/shared/core/SetupSharedGame.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBattlefieldMarkerObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBattlefieldMarkerObjectTemplate.h index 00738eef4..48068a55a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBattlefieldMarkerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBattlefieldMarkerObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuffBuilderManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuffBuilderManager.h index 19a667f75..83ffdb87b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuffBuilderManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuffBuilderManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/SharedBuffBuilderManager.h" +#include "../../src/shared/core/SharedBuffBuilderManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildingObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildingObjectTemplate.h index c5f6335f9..2ff94e268 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildingObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildingObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedBuildingObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedBuildingObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildoutAreaManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildoutAreaManager.h index 93ab9a8a5..9cff5345d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildoutAreaManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedBuildoutAreaManager.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/core/SharedBuildoutAreaManager.h" +#include "../../src/shared/core/SharedBuildoutAreaManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCellObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCellObjectTemplate.h index 73fe83bad..799a01dda 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCellObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCellObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedCellObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedCellObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedConstructionContractObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedConstructionContractObjectTemplate.h index cc6fda58a..214202f29 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedConstructionContractObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedConstructionContractObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCreatureObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCreatureObjectTemplate.h index b31f389e7..6a456b223 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCreatureObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedCreatureObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedCreatureObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedCreatureObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedDraftSchematicObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedDraftSchematicObjectTemplate.h index 03f3e038f..113e23096 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedDraftSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedDraftSchematicObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedFactoryObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedFactoryObjectTemplate.h index ee9f861d6..83da9e207 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedFactoryObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedFactoryObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedFactoryObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedFactoryObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGroupObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGroupObjectTemplate.h index 8c256b2ad..e82f98037 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGroupObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGroupObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedGroupObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedGroupObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGuildObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGuildObjectTemplate.h index 7037b8c0e..9abd3ae34 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGuildObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedGuildObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedGuildObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedGuildObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedHyperspaceStringIds.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedHyperspaceStringIds.h index 54d31bc16..43cba857d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedHyperspaceStringIds.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedHyperspaceStringIds.h @@ -1 +1 @@ -#include "../../../src/shared/core/SharedHyperspaceStringIds.h" +#include "../../src/shared/core/SharedHyperspaceStringIds.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedImageDesignerManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedImageDesignerManager.h index 71790323b..e24bfe951 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedImageDesignerManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedImageDesignerManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/SharedImageDesignerManager.h" +#include "../../src/shared/core/SharedImageDesignerManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedInstallationObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedInstallationObjectTemplate.h index 2c5a37bf9..6cdb24bb1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedInstallationObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedInstallationObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedInstallationObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedIntangibleObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedIntangibleObjectTemplate.h index 8c57f90d7..c8c621b4b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedIntangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedIntangibleObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedIntangibleObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedIntangibleObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedJediManagerObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedJediManagerObjectTemplate.h index b12cf4ec3..7e86da5ba 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedJediManagerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedJediManagerObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedJediManagerObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedJediManagerObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedManufactureSchematicObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedManufactureSchematicObjectTemplate.h index 34b54899f..b45f2b105 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedManufactureSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedManufactureSchematicObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedMissionObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedMissionObjectTemplate.h index 486050c9b..400b118ac 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedMissionObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedMissionObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedMissionObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedMissionObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectAttributes.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectAttributes.h index bf77c5a82..1a21e3540 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectAttributes.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectAttributes.h @@ -1 +1 @@ -#include "../../../src/shared/core/SharedObjectAttributes.h" +#include "../../src/shared/core/SharedObjectAttributes.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplate.h index 108dd86ad..ee00d9cb6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateClientData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateClientData.h index 4dc932402..d05d42143 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateClientData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateClientData.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedObjectTemplateClientData.h" +#include "../../src/shared/objectTemplate/SharedObjectTemplateClientData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateInterface.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateInterface.h index f0bf23a36..1414f0275 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateInterface.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedObjectTemplateInterface.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedObjectTemplateInterface.h" +#include "../../src/shared/objectTemplate/SharedObjectTemplateInterface.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerObjectTemplate.h index da8c62e47..fd18fc911 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedPlayerObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedPlayerObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerQuestObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerQuestObjectTemplate.h index 9c756f546..c4796c568 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerQuestObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedPlayerQuestObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedResourceContainerObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedResourceContainerObjectTemplate.h index a8f5b931d..5444f609e 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedResourceContainerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedResourceContainerObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedSaddleManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedSaddleManager.h index b0ca464cd..ea52c93d8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedSaddleManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedSaddleManager.h @@ -1 +1 @@ -#include "../../../src/shared/mount/SharedSaddleManager.h" +#include "../../src/shared/mount/SharedSaddleManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedShipObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedShipObjectTemplate.h index d8b8197f2..04c6c2256 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedShipObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedShipObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedShipObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedShipObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStaticObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStaticObjectTemplate.h index 9b4bb2da7..b60105931 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStaticObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStaticObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedStaticObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedStaticObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStringIds.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStringIds.h index 5a8a1d308..f4c92c594 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStringIds.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedStringIds.h @@ -1 +1 @@ -#include "../../../src/shared/core/SharedStringIds.h" +#include "../../src/shared/core/SharedStringIds.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTangibleObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTangibleObjectTemplate.h index f63647113..963d7aa30 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTangibleObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedTangibleObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedTangibleObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTerrainSurfaceObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTerrainSurfaceObjectTemplate.h index 7a308e953..1cdfb8670 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTerrainSurfaceObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedTerrainSurfaceObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedUniverseObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedUniverseObjectTemplate.h index 67a89c553..c24390df0 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedUniverseObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedUniverseObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/objectTemplate/SharedUniverseObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedUniverseObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedVehicleObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedVehicleObjectTemplate.h index 4d6e1a9cb..c95724dbe 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedVehicleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedVehicleObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedVehicleObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedVehicleObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWaypointObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWaypointObjectTemplate.h index a0db10f4e..724d6fb5d 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWaypointObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWaypointObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedWaypointObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedWaypointObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWeaponObjectTemplate.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWeaponObjectTemplate.h index d9cea76aa..612c723c9 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWeaponObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SharedWeaponObjectTemplate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/objectTemplate/SharedWeaponObjectTemplate.h" +#include "../../src/shared/objectTemplate/SharedWeaponObjectTemplate.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassis.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassis.h index 0ef70f659..cf039444c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassis.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassis.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipChassis.h" +#include "../../src/shared/space/ShipChassis.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlot.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlot.h index 5790631e1..edbe5237a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlot.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlot.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipChassisSlot.h" +#include "../../src/shared/space/ShipChassisSlot.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlotType.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlotType.h index c955d24c1..3a853b4e6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlotType.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisSlotType.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipChassisSlotType.h" +#include "../../src/shared/space/ShipChassisSlotType.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisWritable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisWritable.h index 588af11f0..0394d63db 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisWritable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipChassisWritable.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipChassisWritable.h" +#include "../../src/shared/space/ShipChassisWritable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentAttachmentManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentAttachmentManager.h index 3651b35f8..a4641298a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentAttachmentManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentAttachmentManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentAttachmentManager.h" +#include "../../src/shared/space/ShipComponentAttachmentManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentData.h index f7fa117d8..4a50b2a82 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentData.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentData.h" +#include "../../src/shared/space/ShipComponentData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptor.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptor.h index 05edb88d0..11a4266d6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptor.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptor.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentDescriptor.h" +#include "../../src/shared/space/ShipComponentDescriptor.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptorWritable.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptorWritable.h index fc27a2997..cf9d985a0 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptorWritable.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentDescriptorWritable.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentDescriptorWritable.h" +#include "../../src/shared/space/ShipComponentDescriptorWritable.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentFlags.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentFlags.h index 5c2c08729..63d497c87 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentFlags.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentFlags.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentFlags.h" +#include "../../src/shared/space/ShipComponentFlags.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentType.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentType.h index 5581c0493..43dcfff6c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentType.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentType.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentType.h" +#include "../../src/shared/space/ShipComponentType.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentWeaponManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentWeaponManager.h index 3b0f544ca..48539ff5f 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentWeaponManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipComponentWeaponManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipComponentWeaponManager.h" +#include "../../src/shared/space/ShipComponentWeaponManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipDynamicsModel.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipDynamicsModel.h index 8607fba89..ad42c5d8e 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipDynamicsModel.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipDynamicsModel.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/ShipDynamicsModel.h" +#include "../../src/shared/dynamics/ShipDynamicsModel.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipHitEffectsManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipHitEffectsManager.h index e469fcd8b..89b7d7e75 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipHitEffectsManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipHitEffectsManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipHitEffectsManager.h" +#include "../../src/shared/space/ShipHitEffectsManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipObjectInterface.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipObjectInterface.h index 98a3f626d..762bee26b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipObjectInterface.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipObjectInterface.h @@ -1 +1 @@ -#include "../../../src/shared/object/ShipObjectInterface.h" +#include "../../src/shared/object/ShipObjectInterface.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipSlotIdManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipSlotIdManager.h index 2d40e4e95..5c8348e1c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipSlotIdManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipSlotIdManager.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/space/ShipSlotIdManager.h" +#include "../../src/shared/space/ShipSlotIdManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTargeting.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTargeting.h index 9c1dec4ab..da7336631 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTargeting.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTargeting.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipTargeting.h" +#include "../../src/shared/space/ShipTargeting.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTurretManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTurretManager.h index 1a882e9ce..94ffa1b13 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTurretManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/ShipTurretManager.h @@ -1 +1 @@ -#include "../../../src/shared/space/ShipTurretManager.h" +#include "../../src/shared/space/ShipTurretManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SlopeEffectProperty.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SlopeEffectProperty.h index a1c32ad87..265a808c8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SlopeEffectProperty.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SlopeEffectProperty.h @@ -1 +1 @@ -#include "../../../src/shared/object/SlopeEffectProperty.h" +#include "../../src/shared/object/SlopeEffectProperty.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SlowDownProperty.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SlowDownProperty.h index b6d89c697..453d9abd7 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SlowDownProperty.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SlowDownProperty.h @@ -1 +1 @@ -#include "../../../src/shared/object/SlowDownProperty.h" +#include "../../src/shared/object/SlowDownProperty.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SocialsManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SocialsManager.h index a82c7f046..a179aacc3 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SocialsManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SocialsManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/SocialsManager.h" +#include "../../src/shared/core/SocialsManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SpaceStringIds.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SpaceStringIds.h index d3b686624..ee2400f1e 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SpaceStringIds.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SpaceStringIds.h @@ -1 +1 @@ -#include "../../../src/shared/core/SpaceStringIds.h" +#include "../../src/shared/core/SpaceStringIds.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SpatialChatManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SpatialChatManager.h index e71568bc6..ecf199269 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SpatialChatManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SpatialChatManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/SpatialChatManager.h" +#include "../../src/shared/core/SpatialChatManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationData.h index 79dac8cde..ff9ad8099 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationData.h @@ -1 +1 @@ -#include "../../../src/shared/core/StartingLocationData.h" +#include "../../src/shared/core/StartingLocationData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationDataArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationDataArchive.h index 5115ffd0a..95ddc02f2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationDataArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationDataArchive.h @@ -1 +1 @@ -#include "../../../src/shared/core/StartingLocationDataArchive.h" +#include "../../src/shared/core/StartingLocationDataArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationManager.h index fca0287fa..c1ae99460 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/StartingLocationManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/StartingLocationManager.h" +#include "../../src/shared/core/StartingLocationManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommand.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommand.h index e4ab6f251..f938389f2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommand.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommand.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiCommand.h" +#include "../../src/shared/sui/SuiCommand.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommandArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommandArchive.h index 62947c898..c7d7a22c2 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommandArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiCommandArchive.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiCommandArchive.h" +#include "../../src/shared/sui/SuiCommandArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventSubscription.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventSubscription.h index e33792a42..d464c5f18 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventSubscription.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventSubscription.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiEventSubscription.h" +#include "../../src/shared/sui/SuiEventSubscription.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventType.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventType.h index e11c76349..cfd399217 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventType.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiEventType.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiEventType.h" +#include "../../src/shared/sui/SuiEventType.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageData.h index 72138e5e4..e2b9c2d0b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageData.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiPageData.h" +#include "../../src/shared/sui/SuiPageData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageDataArchive.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageDataArchive.h index 200df2e8b..5c369e22b 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageDataArchive.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiPageDataArchive.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiPageDataArchive.h" +#include "../../src/shared/sui/SuiPageDataArchive.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiWidgetProperty.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiWidgetProperty.h index 612477c1f..1f7593b53 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiWidgetProperty.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/SuiWidgetProperty.h @@ -1 +1 @@ -#include "../../../src/shared/sui/SuiWidgetProperty.h" +#include "../../src/shared/sui/SuiWidgetProperty.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/TextIterator.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/TextIterator.h index a2d668c31..e248112e8 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/TextIterator.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/TextIterator.h @@ -1 +1 @@ -#include "../../../src/shared/core/TextIterator.h" +#include "../../src/shared/core/TextIterator.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/TextManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/TextManager.h index e024533af..902cde96a 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/TextManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/TextManager.h @@ -1 +1 @@ -#include "../../../src/shared/core/TextManager.h" +#include "../../src/shared/core/TextManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelManager.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelManager.h index 3c05da88d..0fdd3e9e1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelManager.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelManager.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/travel/TravelManager.h" +#include "../../src/shared/travel/TravelManager.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelPoint.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelPoint.h index 5c845e54a..59141f53f 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelPoint.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/TravelPoint.h @@ -1 +1 @@ -#include "../../../src/shared/travel/TravelPoint.h" +#include "../../src/shared/travel/TravelPoint.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Universe.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Universe.h index 2fa54c837..f63d0fb0c 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Universe.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Universe.h @@ -1 +1 @@ -#include "../../../src/shared/core/Universe.h" +#include "../../src/shared/core/Universe.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/VehicleHoverDynamics.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/VehicleHoverDynamics.h index 8bf547b93..84d7814d1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/VehicleHoverDynamics.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/VehicleHoverDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/object/VehicleHoverDynamics.h" +#include "../../src/shared/object/VehicleHoverDynamics.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/Waypoint.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/Waypoint.h index a689a7bc7..74b5aceb6 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/Waypoint.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/Waypoint.h @@ -1 +1 @@ -#include "../../../src/shared/object/Waypoint.h" +#include "../../src/shared/object/Waypoint.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/WaypointData.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/WaypointData.h index d6bfeb8e5..048535f30 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/WaypointData.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/WaypointData.h @@ -1 +1 @@ -#include "../../../src/shared/object/WaypointData.h" +#include "../../src/shared/object/WaypointData.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableAppearanceMap.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableAppearanceMap.h index 3894baa0d..4e9e7d2c4 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableAppearanceMap.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableAppearanceMap.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/WearableAppearanceMap.h" +#include "../../src/shared/appearance/WearableAppearanceMap.h" diff --git a/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableEntry.h b/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableEntry.h index cd776ec08..badd47be1 100644 --- a/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableEntry.h +++ b/src/engine/shared/library/sharedGame/include/public/sharedGame/WearableEntry.h @@ -1 +1 @@ -#include "../../../src/shared/core/WearableEntry.h" +#include "../../src/shared/core/WearableEntry.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp b/src/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp index 21bf8b235..705034f5a 100644 --- a/src/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include // ====================================================================== @@ -25,7 +25,7 @@ namespace CombatDataTableNamespace std::string const cs_columnActionNameCrc("actionNameCrc"); int s_actionNameCrcColumn; - std::hash_map s_commandsWithMinInvisLevelRequired; + std::unordered_map s_commandsWithMinInvisLevelRequired; } using namespace CombatDataTableNamespace; @@ -402,7 +402,7 @@ int CombatDataTable::getMinInvisLevelRequired(uint32 commandHash) if(commandHash == 0) return -1; - std::hash_map::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash); + std::unordered_map::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash); if (it != s_commandsWithMinInvisLevelRequired.end()) return it->second; diff --git a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp index 3f0fe7f6d..544cf1af1 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp @@ -543,8 +543,8 @@ void AiDebugString::addCircleAtObjectOffset(NetworkId const & target, Vector con // Object-space circle relative to the target if (radius > 0.0f) - { - m_circleList->push_back(std::make_pair(target, std::make_pair(Circle(position_o, radius), color))); + { + m_circleList->push_back(std::make_pair(CachedNetworkId(target), std::make_pair(Circle(position_o, radius), color))); } else { diff --git a/src/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h b/src/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h index 9f113887c..64537442e 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h @@ -9,7 +9,7 @@ #ifndef INCLUDED_CollectionsDataTable_H #define INCLUDED_CollectionsDataTable_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include @@ -88,12 +88,12 @@ public: private: CollectionInfoCollection(); CollectionInfoCollection(CollectionInfoCollection const &); - CollectionInfoCollection &operator =(CollectionInfoCollection const &); + CollectionInfoCollection &operator =(CollectionInfoCollection const &); }; class CollectionInfoSlot { - friend CollectionsDataTable; + friend class CollectionsDataTable; public: CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, stdvector::fwd const & pCategories, stdvector::fwd const & pPrereqs, std::string const & pMusic, std::vector const & pTitles, CollectionInfoCollection const & pCollection) : @@ -128,7 +128,7 @@ public: CollectionInfoSlot(); CollectionInfoSlot(CollectionInfoSlot const &); - CollectionInfoSlot &operator =(CollectionInfoSlot const &); + CollectionInfoSlot &operator =(CollectionInfoSlot const &); }; // *****NOTE***** the pointers returned by these functions *****ARE NOT!!!***** diff --git a/src/engine/shared/library/sharedGame/src/shared/core/CraftingData.h b/src/engine/shared/library/sharedGame/src/shared/core/CraftingData.h index 153b46f17..dbd89dcbf 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/CraftingData.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/CraftingData.h @@ -9,7 +9,7 @@ #ifndef INCLUDED_CraftingData_H #define INCLUDED_CraftingData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "boost/smart_ptr.hpp" #include "StringId.h" #include diff --git a/src/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp b/src/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp index 670d76c90..4c2b7a178 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp @@ -15,6 +15,8 @@ #include "sharedObject/ObjectTemplateList.h" #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" + +#include #include #include diff --git a/src/engine/shared/library/sharedGame/src/shared/core/FirstSharedGame.h b/src/engine/shared/library/sharedGame/src/shared/core/FirstSharedGame.h index 555f69270..2047f92bb 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/FirstSharedGame.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/FirstSharedGame.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" #include "StringId.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/core/FormManager.h b/src/engine/shared/library/sharedGame/src/shared/core/FormManager.h index 079c6e97d..19ac513ae 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/FormManager.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/FormManager.h @@ -12,7 +12,7 @@ class DataTable; -//#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h" +//#include "sharedFoundation/StlForwardDeclaration.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp b/src/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp index 05cf4344b..4edd9e15f 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp @@ -17,6 +17,8 @@ #include "sharedCollision/Footprint.h" #include "sharedTerrain/TerrainObject.h" +#include + //---------------------------------------------------------------------- namespace diff --git a/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp b/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp index 615cf0b85..21d8d4b56 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp @@ -17,6 +17,8 @@ #include "unicodeArchive/UnicodeArchive.h" #include "UnicodeUtils.h" +#include + // ====================================================================== namespace LfgCharacterDataNamespace diff --git a/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h b/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h index 69dd2612f..2357d1771 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h @@ -9,9 +9,9 @@ #ifndef INCLUDED_LfgCharacterData_H #define INCLUDED_LfgCharacterData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedGame/include/public/sharedGame/SharedCreatureObjectTemplate.h" +#include "sharedFoundation/BitArray.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedGame/SharedCreatureObjectTemplate.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/core/ProsePackageParticipant.h b/src/engine/shared/library/sharedGame/src/shared/core/ProsePackageParticipant.h index ff52fa707..59921fd9a 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/ProsePackageParticipant.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/ProsePackageParticipant.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_ProsePackageParticipant_H #define INCLUDED_ProsePackageParticipant_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp b/src/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp index aa61c8176..c567d82d2 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp @@ -12,6 +12,7 @@ #include "sharedFile/TreeFile.h" #include "sharedUtility/DataTable.h" #include "sharedNetworkMessages/ObjectMenuRequestData.h" +#include #include //====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp index 5e3a6ee38..40e7ffb8e 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp @@ -16,6 +16,7 @@ #include "UnicodeUtils.h" +#include #include // ====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h index 93ce1cb9c..c373f4c9c 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/BuffBuilderChangeMessage.h" #include @@ -99,4 +99,4 @@ private: // ====================================================================== -#endif \ No newline at end of file +#endif diff --git a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp index 792cf3c2f..cec5ff33b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp @@ -223,7 +223,7 @@ void SharedBuildoutAreaManager::install() int const areaCount = areaListTable.getNumRows(); for (int areaRow = 0; areaRow < areaCount; ++areaRow) { - areasForScene.push_back(); + areasForScene.push_back(BuildoutArea()); BuildoutArea &buildoutArea = areasForScene.back(); buildoutArea.areaIndex = i*100+areaRow; buildoutArea.areaName = areaListTable.getStringValue("area", areaRow); diff --git a/src/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.h b/src/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.h index 5950686e7..4f3828865 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/PaletteArgb.h" #include "sharedNetworkMessages/ImageDesignChangeMessage.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h b/src/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h index cb1e9357a..6af2afdbe 100644 --- a/src/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h +++ b/src/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h @@ -11,7 +11,7 @@ // ====================================================================== #include "Archive/AutoByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/BaselinesMessage.h" #include "boost/smart_ptr.hpp" diff --git a/src/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp b/src/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp index 0bdc106cb..775c81191 100644 --- a/src/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp @@ -250,7 +250,7 @@ void MountValidScaleRangeTableNamespace::loadTableData(char const *filename) //-- Find or create new MountableCreature instance for this creature name. MountableCreature *mountableCreature = NULL; - MountableCreatureTable::iterator lowerBoundIt = s_mountableCreatureTable.lower_bound(&mountableCreatureAppearanceNameCrc); + MountableCreatureTable::iterator lowerBoundIt = s_mountableCreatureTable.lower_bound((const CrcString*)&mountableCreatureAppearanceNameCrc); bool const mountableCreatureEntryExists = ((lowerBoundIt != s_mountableCreatureTable.end()) && !s_mountableCreatureTable.key_comp()(static_cast(&mountableCreatureAppearanceNameCrc), lowerBoundIt->first)); if (mountableCreatureEntryExists) diff --git a/src/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp b/src/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp index 092cf3276..0ab8b6288 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp @@ -89,7 +89,7 @@ void AppearanceManager::install() //-- Look up the source name CrcStringVector * crcStringVector = 0; { - ObjectTemplateAppearanceTemplateMap::iterator iter = ms_objectTemplateAppearanceTemplateMap.find(&crcSourceName); + ObjectTemplateAppearanceTemplateMap::iterator iter = ms_objectTemplateAppearanceTemplateMap.find((const CrcString*)&crcSourceName); if (iter != ms_objectTemplateAppearanceTemplateMap.end()) { DEBUG_WARNING(true, ("AppearanceManager::install(%s): duplicate entry found for %s", appearanceTableFileName, crcSourceName.getString())); @@ -100,7 +100,7 @@ void AppearanceManager::install() crcStringVector = new CrcStringVector(); crcStringVector->reserve(static_cast(numberOfColumns)); - ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair(new PersistentCrcString(crcSourceName), crcStringVector)); + ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair((const CrcString*)new PersistentCrcString(crcSourceName), crcStringVector)); } } @@ -161,7 +161,7 @@ void AppearanceManagerNamespace::remove() bool AppearanceManager::isAppearanceManaged(std::string const &fileName) { TemporaryCrcString const crcFileName(fileName.c_str(), true); - return ms_objectTemplateAppearanceTemplateMap.find(&crcFileName) != ms_objectTemplateAppearanceTemplateMap.end(); + return ms_objectTemplateAppearanceTemplateMap.find((const CrcString*)&crcFileName) != ms_objectTemplateAppearanceTemplateMap.end(); } // ---------------------------------------------------------------------- @@ -172,7 +172,7 @@ bool AppearanceManager::getAppearanceName(std::string &targetName, std::string c TemporaryCrcString const crcSourceName(sourceName.c_str(), true); //-- Look up the source name - ObjectTemplateAppearanceTemplateMap::iterator iter = ms_objectTemplateAppearanceTemplateMap.find(&crcSourceName); + ObjectTemplateAppearanceTemplateMap::iterator iter = ms_objectTemplateAppearanceTemplateMap.find((const CrcString*)&crcSourceName); if (iter == ms_objectTemplateAppearanceTemplateMap.end()) return false; diff --git a/src/engine/shared/library/sharedGame/src/shared/object/Buff.cpp b/src/engine/shared/library/sharedGame/src/shared/object/Buff.cpp index 6100bff7a..a3b97550f 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/Buff.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/object/Buff.cpp @@ -2,7 +2,7 @@ // // Buff.cpp // -// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. // Author: Adam Hunter // ====================================================================== @@ -48,11 +48,11 @@ m_duration(duration), m_caster(caster), m_stackCount(stackCount) { - m_nameCrc = Crc::calculate(buffName.c_str()); + m_nameCrc = Crc::calculate(buffName.c_str()); } // ====================================================================== - + Buff::Buff(uint32 buffNameCrc, Buff::PackedBuff buffValues) : m_name(""), m_nameCrc(buffNameCrc), @@ -61,7 +61,7 @@ m_value(buffValues.value), m_duration(buffValues.duration), m_caster(buffValues.caster), m_stackCount(buffValues.stackCount) -{ +{ } // ====================================================================== @@ -74,7 +74,7 @@ m_value(value), m_duration(duration), m_caster(caster), m_stackCount(stackCount) -{ +{ } // ====================================================================== @@ -87,7 +87,7 @@ Buff::~Buff() Buff &Buff::operator=(Buff const &rhs) { - if (this != (&rhs)) + if (this != (&rhs)) { m_name = rhs.m_name; m_nameCrc = rhs.m_nameCrc; @@ -159,4 +159,4 @@ Buff::PackedBuff Buff::makePackedBuff(uint64 oldSchoolPackedBuff) result.stackCount = 1; return result; -} \ No newline at end of file +} diff --git a/src/engine/shared/library/sharedGame/src/shared/object/Buff.h b/src/engine/shared/library/sharedGame/src/shared/object/Buff.h index b2e30c98b..f189e4612 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/Buff.h +++ b/src/engine/shared/library/sharedGame/src/shared/object/Buff.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Buff { diff --git a/src/engine/shared/library/sharedGame/src/shared/object/MatchMakingCharacterPreferenceId.h b/src/engine/shared/library/sharedGame/src/shared/object/MatchMakingCharacterPreferenceId.h index 719e14b60..c3c1bf9dd 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/MatchMakingCharacterPreferenceId.h +++ b/src/engine/shared/library/sharedGame/src/shared/object/MatchMakingCharacterPreferenceId.h @@ -9,7 +9,7 @@ #define INCLUDED_MatchMakingCharacterPreferenceId_H #include "Archive/AutoByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/BitArray.h" +#include "sharedFoundation/BitArray.h" //----------------------------------------------------------------------------- class MatchMakingCharacterPreferenceId diff --git a/src/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp b/src/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp index 16c68c7d3..fc3a915ee 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp @@ -16,6 +16,7 @@ #include "sharedObject/CustomizationDataProperty.h" #include "sharedObject/CustomizationData.h" #include "sharedTerrain/TerrainObject.h" +#include //====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp b/src/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp index a0a4a71bf..08cc44792 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp @@ -19,13 +19,13 @@ #include "sharedMessageDispatch/Transceiver.h" #include "unicodeArchive/UnicodeArchive.h" #include "UnicodeUtils.h" -#include +#include // ====================================================================== namespace WaypointNamespace { - typedef std::hash_map WaypointMapById; + typedef std::unordered_map WaypointMapById; WaypointMapById s_waypointMapById; bool s_installed; @@ -106,7 +106,7 @@ namespace Archive if (networkId.isValid()) { WaypointData *data = 0; - std::hash_map::iterator f = s_waypointMapById.find(networkId); + std::unordered_map::iterator f = s_waypointMapById.find(networkId); if (f == s_waypointMapById.end()) data = new WaypointData(networkId); else @@ -331,7 +331,7 @@ std::string const &Waypoint::getColorNameById(uint8 id) // static Waypoint const Waypoint::getWaypointById(NetworkId const &id) // static { Waypoint result; - std::hash_map::iterator f = s_waypointMapById.find(id); + std::unordered_map::iterator f = s_waypointMapById.find(id); if (f != s_waypointMapById.end()) result.releaseData(f->second); return result; diff --git a/src/engine/shared/library/sharedGame/src/shared/object/WaypointData.h b/src/engine/shared/library/sharedGame/src/shared/object/WaypointData.h index 0560e0329..3df00f671 100644 --- a/src/engine/shared/library/sharedGame/src/shared/object/WaypointData.h +++ b/src/engine/shared/library/sharedGame/src/shared/object/WaypointData.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedUtility/Location.h" #include "Unicode.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp index 23867f840..9e973c368 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h index 1ed71812d..296726363 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedBattlefieldMarkerObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp index 3886ce427..793143b05 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h index 2d1768164..1c37d84e5 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedBuildingObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp index c68ebeb3e..1cdcca726 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h index baaf7aa7f..01c055874 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedCellObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp index ebb5f9eed..ba6ece470 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h index ffd667c63..20804df07 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedConstructionContractObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp index 83eca1e71..36f524dc2 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp @@ -24,7 +24,8 @@ #include "sharedObject/BasicRangedIntCustomizationVariable.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h index 12328b815..53645aa7b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedCreatureObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp index 590422aaa..fe3956f44 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h index ea0ab9cf9..e84be62c2 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedDraftSchematicObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp index cf7c46fb2..5a07a2935 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h index 8f61a093b..3bab50b6b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedFactoryObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp index a6e77be1e..1c30083d7 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h index 44a9b858e..a114b920b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedGroupObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp index 03f2c4436..4243b93c7 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h index f2e3a1d3f..43a7c2d39 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedGuildObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp index 1613d8305..081581170 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h index 752315fe6..36e3aabe9 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedInstallationObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp index 909749fa7..0e9edb7cc 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h index 89e5b98c7..bf0ae9d30 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedIntangibleObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp index f87a92f06..c48408851 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h index 08aec251c..b2be5b141 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedJediManagerObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp index a5d97f52d..8b5e09651 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h index 49d286a23..71a6c26e9 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedManufactureSchematicObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp index 4b48b0684..b2745f8e1 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h index 575157cc1..7830dc893 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedMissionObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp index 1d2abd821..034adea55 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp @@ -28,7 +28,8 @@ #include "sharedObject/SlotDescriptorList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h index 0737bffa0..5fc7686fc 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h @@ -13,9 +13,9 @@ #ifndef _INCLUDED_SharedObjectTemplate_H #define _INCLUDED_SharedObjectTemplate_H -#include "../../../../../../engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" -#include "../../../../../../engine/shared/library/sharedUtility/include/public/sharedUtility/TemplateParameter.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" class ArrangementDescriptor; diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplateClientData.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplateClientData.h index c5ac65412..d5f8d966b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplateClientData.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplateClientData.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h" +#include "sharedFoundation/DataResource.h" //=================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp index 50ec4bcdb..03213f9f4 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h index dfbc88a60..5b64f2f85 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedPlayerObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp index cb3f6f771..c475f7532 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h index 6dc427a98..e5c9260c1 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedPlayerQuestObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp index 8f9dfe89d..9eb6e5802 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h index 9ef061dbf..86067879b 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedResourceContainerObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp index cbea91d78..8dce0c07f 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -25,6 +25,7 @@ //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS +#include #include const std::string DefaultString(""); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h index 18d4f308e..abbdb08ed 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedShipObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp index 65ee046bb..597d379a7 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h index d20e4aef5..cc22dc7e5 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedStaticObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp index da8dccd0a..57f841e28 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp @@ -27,7 +27,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h index 9e8aeadd1..7cd54f536 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedTangibleObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp index b45b93c1f..cd2c216b9 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h index d41a3412a..bf5265e7d 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedTerrainSurfaceObjectTemplate_H #include "sharedObject/ObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp index 893c4aa64..adf09d85f 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h index 15ddbfa96..1968e4ebc 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedUniverseObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp index 8ebac887f..ccc2cb770 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h index c6d7b7e49..4da4d4c1c 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedVehicleObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp index 70d98cd21..71ef4b397 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h index 56a5e3b9f..4fb31a6b8 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedWaypointObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp index 1630d5575..7c9fa9775 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h index fa0fa789a..ba4d771ce 100644 --- a/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h +++ b/src/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedWeaponObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.cpp b/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.cpp index e944ed62c..4bb2ae1ea 100644 --- a/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.cpp @@ -253,6 +253,7 @@ namespace Archive put(target,source.m_hasReceivedReward); } + template<> void Archive::AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { char temp[200]; @@ -307,6 +308,7 @@ namespace Archive } } + template<> void Archive::AutoDeltaPackedMap::pack(ByteStream & target, std::string const & buffer) { char temp[200]; diff --git a/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h b/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h index 5bde5d34d..6cd7e7699 100644 --- a/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h +++ b/src/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/quest/Quest.h b/src/engine/shared/library/sharedGame/src/shared/quest/Quest.h index 7533970d6..44f7ad7b0 100644 --- a/src/engine/shared/library/sharedGame/src/shared/quest/Quest.h +++ b/src/engine/shared/library/sharedGame/src/shared/quest/Quest.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" #include "StringId.h" class QuestTask; diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h index 287baae44..2ff808388 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h @@ -11,7 +11,7 @@ //====================================================================== #include "sharedGame/ShipChassisSlotType.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class ShipChassisSlot; diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h index 387c6545e..9642ef342 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h @@ -11,7 +11,7 @@ //====================================================================== #include "sharedGame/ShipChassisSlotType.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class ShipComponentDescriptor; diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp index ab0bd1b85..470249929 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp @@ -12,7 +12,7 @@ #include "Unicode.h" -#include +#include //====================================================================== @@ -273,7 +273,7 @@ namespace ShipChassisSlotTypeNamespace static_cast(ShipComponentType::SCT_weapon), // SCST_weapon_99 }; - typedef stdhash_map::fwd SlotNameTypeMap; + typedef stdunordered_map::fwd SlotNameTypeMap; SlotNameTypeMap s_slotNameTypeMap; bool s_installed = false; diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h index 8af416af9..87ee4c489 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h index cdbaabe9d..f27929699 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h @@ -11,7 +11,7 @@ //====================================================================== #include "sharedGame/ShipComponentType.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class ObjectTemplate; diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp index 04e92f3e2..a13af943f 100644 --- a/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp @@ -8,7 +8,7 @@ #include "sharedGame/FirstSharedGame.h" #include "sharedGame/ShipComponentType.h" -#include +#include //====================================================================== @@ -48,7 +48,7 @@ namespace ShipComponentTypeNamespace "mod_" }; - typedef stdhash_map::fwd ComponentNameTypeMap; + typedef stdunordered_map::fwd ComponentNameTypeMap; ComponentNameTypeMap s_componentNameTypeMap; bool s_installed = false; diff --git a/src/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h b/src/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h index 4c389e375..d29703a78 100644 --- a/src/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h +++ b/src/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedGame/SuiCommand.h" #include "sharedMath/Vector.h" #include diff --git a/src/engine/shared/library/sharedGame/src/shared/travel/TravelManager.cpp b/src/engine/shared/library/sharedGame/src/shared/travel/TravelManager.cpp index 14f621789..aceea77ed 100644 --- a/src/engine/shared/library/sharedGame/src/shared/travel/TravelManager.cpp +++ b/src/engine/shared/library/sharedGame/src/shared/travel/TravelManager.cpp @@ -375,7 +375,7 @@ bool TravelManagerNamespace::getPlanetAnyHopLeastCost(int planetIndex1, int plan std::swap (planetIndex1, planetIndex2); AnyHopLeastCostRouteList::const_iterator iterFind = ms_anyHopLeastCostRouteList.find(std::make_pair(planetIndex1, planetIndex2)); - if (iterFind != ms_singleHopRouteList.end()) + if (iterFind != ms_anyHopLeastCostRouteList.end()) { planetCost = iterFind->second.first; return true; diff --git a/src/engine/shared/library/sharedImage/src/shared/FirstSharedImage.h b/src/engine/shared/library/sharedImage/src/shared/FirstSharedImage.h index e4ebbc032..5b93e4317 100644 --- a/src/engine/shared/library/sharedImage/src/shared/FirstSharedImage.h +++ b/src/engine/shared/library/sharedImage/src/shared/FirstSharedImage.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp b/src/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp index e85772d53..3957c9ab9 100644 --- a/src/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp +++ b/src/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp @@ -1197,6 +1197,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(&header, sizeof(header), 1, f); if (numWritten != 1) { + fclose(f); DEBUG_WARNING(true, ("Targa header not written successfully.\n")); return false; } @@ -1230,6 +1231,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(destPixelsLine, destYStride, 1, f); if (numWritten!=1) { + fclose(f); DEBUG_WARNING(true, ("Targa image data not written successfully for %s\n", filename)); return false; } @@ -1244,6 +1246,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(piter, sourceYStride, 1, f); if (numWritten!=1) { + fclose(f); DEBUG_WARNING(true, ("Targa image data not written successfully for %s\n", filename)); return false; } @@ -1267,7 +1270,8 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(&footer, sizeof(footer), 1, f); if (numWritten != 1) { - DEBUG_WARNING(true, ("Targa footer not written successfully for %s\n", filename)); + fclose(f); + DEBUG_WARNING(true, ("Targa footer not written successfully for %s\n", filename)); return false; } //------------------------------------------ diff --git a/src/engine/shared/library/sharedInputMap/src/shared/FirstSharedInputMap.h b/src/engine/shared/library/sharedInputMap/src/shared/FirstSharedInputMap.h index 1d4dd063f..03dd79ee6 100644 --- a/src/engine/shared/library/sharedInputMap/src/shared/FirstSharedInputMap.h +++ b/src/engine/shared/library/sharedInputMap/src/shared/FirstSharedInputMap.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedIoWin/src/shared/FirstSharedIoWin.h b/src/engine/shared/library/sharedIoWin/src/shared/FirstSharedIoWin.h index 2633020c4..6e4e074e6 100644 --- a/src/engine/shared/library/sharedIoWin/src/shared/FirstSharedIoWin.h +++ b/src/engine/shared/library/sharedIoWin/src/shared/FirstSharedIoWin.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedLog/src/shared/FirstSharedLog.h b/src/engine/shared/library/sharedLog/src/shared/FirstSharedLog.h index 70bfcfc59..ede852809 100644 --- a/src/engine/shared/library/sharedLog/src/shared/FirstSharedLog.h +++ b/src/engine/shared/library/sharedLog/src/shared/FirstSharedLog.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedMath/include/public/sharedMath/CatmullRomSpline.h b/src/engine/shared/library/sharedMath/include/public/sharedMath/CatmullRomSpline.h index de5938a3a..97aaf96a3 100644 --- a/src/engine/shared/library/sharedMath/include/public/sharedMath/CatmullRomSpline.h +++ b/src/engine/shared/library/sharedMath/include/public/sharedMath/CatmullRomSpline.h @@ -1 +1 @@ -#include "../../src/shared/CatmullRomSpline.h" \ No newline at end of file +#include "../../src/shared/CatmullRomSpline.h" diff --git a/src/engine/shared/library/sharedMath/include/public/sharedMath/Transform.h b/src/engine/shared/library/sharedMath/include/public/sharedMath/Transform.h index 265ce30bf..8d316203c 100644 --- a/src/engine/shared/library/sharedMath/include/public/sharedMath/Transform.h +++ b/src/engine/shared/library/sharedMath/include/public/sharedMath/Transform.h @@ -1 +1 @@ -#include "../../../src/shared/Transform.h" +#include "../../src/shared/Transform.h" diff --git a/src/engine/shared/library/sharedMath/include/public/sharedMath/Vector.h b/src/engine/shared/library/sharedMath/include/public/sharedMath/Vector.h index 10f4b3bf3..73858df8c 100644 --- a/src/engine/shared/library/sharedMath/include/public/sharedMath/Vector.h +++ b/src/engine/shared/library/sharedMath/include/public/sharedMath/Vector.h @@ -1 +1 @@ -#include "../../../src/shared/Vector.h" +#include "../../src/shared/Vector.h" diff --git a/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm.h b/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm.h index 6ea6ceed7..c9c5e83e0 100644 --- a/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm.h +++ b/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm.h @@ -1 +1 @@ -#include "../../src/shared/WaveForm.h" \ No newline at end of file +#include "../../src/shared/WaveForm.h" diff --git a/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm3D.h b/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm3D.h index 046b67d9c..851b7c72b 100644 --- a/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm3D.h +++ b/src/engine/shared/library/sharedMath/include/public/sharedMath/WaveForm3D.h @@ -1 +1 @@ -#include "../../src/shared/WaveForm3D.h" \ No newline at end of file +#include "../../src/shared/WaveForm3D.h" diff --git a/src/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp b/src/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp index d3cf61ba3..b41c59809 100644 --- a/src/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp @@ -11,6 +11,7 @@ #include "sharedMath/Quaternion.h" +#include #include #include @@ -260,7 +261,7 @@ void CompressedQuaternionNamespace::findClosestBase(int baseShiftCount, float mi for (int testBaseIndex = 0; testBaseIndex < baseCount; ++testBaseIndex) { const float testBaseValue = -1.0f + (testBaseIndex + 1) * baseSeparation; - const float testDistance = abs(testBaseValue - midpoint); + const float testDistance = std::abs(testBaseValue - midpoint); if (testDistance < closestBaseDistance) { @@ -349,7 +350,7 @@ uint32 CompressedQuaternionNamespace::doCompress(float w, float x, float y, floa #ifdef _DEBUG // If w is small enough, we won't be able to take the square root. - if (abs(w) >= cs_wAcceptableEpsilon) + if (std::abs(w) >= cs_wAcceptableEpsilon) { const float calculatedW = sqrt(1.0f - (x*x + y*y + z*z)); DEBUG_FATAL(!WithinEpsilonInclusive(calculatedW, w, cs_wAcceptableEpsilon), ("Quaternion (w=%g,x=%g,y=%g,z=%g) does not appear to be a unit quaternion.", w, x, y, z)); @@ -546,10 +547,10 @@ void CompressedQuaternion::compressRotations(const QuaternionVector &sourceRotat sourceRotation.z = -sourceRotation.z; } - const float deltaW = abs(expandedRotation.w - sourceRotation.w); - const float deltaX = abs(expandedRotation.x - sourceRotation.x); - const float deltaY = abs(expandedRotation.y - sourceRotation.y); - const float deltaZ = abs(expandedRotation.z - sourceRotation.z); + const float deltaW = std::abs(expandedRotation.w - sourceRotation.w); + const float deltaX = std::abs(expandedRotation.x - sourceRotation.x); + const float deltaY = std::abs(expandedRotation.y - sourceRotation.y); + const float deltaZ = std::abs(expandedRotation.z - sourceRotation.z); if ( (deltaW > cs_wAcceptableEpsilon) || (deltaX > cs_xAcceptableEpsilon) || diff --git a/src/engine/shared/library/sharedMath/src/shared/FirstSharedMath.h b/src/engine/shared/library/sharedMath/src/shared/FirstSharedMath.h index c2f7f8063..c5397bc74 100644 --- a/src/engine/shared/library/sharedMath/src/shared/FirstSharedMath.h +++ b/src/engine/shared/library/sharedMath/src/shared/FirstSharedMath.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp b/src/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp index 81aa40128..0b77b2ec2 100644 --- a/src/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp @@ -10,6 +10,8 @@ #include "sharedMath/MxCifQuadTree.h" #include "sharedMath/MxCifQuadTreeBounds.h" +#include + //============================================================================== diff --git a/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp b/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp index 097826bee..a1d12e7c7 100644 --- a/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp @@ -263,6 +263,7 @@ bool PaletteArgb::write(const char *pathName) const const size_t unitsWritten = fwrite(buffer, static_cast(numberOfBytesWritten), 1, file); if (unitsWritten != 1) { + fclose(file); WARNING(true, ("failed to write palette data (%d bytes) to file [%s].", numberOfBytesWritten, pathName)); return false; } diff --git a/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.h b/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.h index 76dd7ab1f..4df62ae02 100644 --- a/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.h +++ b/src/engine/shared/library/sharedMath/src/shared/PaletteArgb.h @@ -16,7 +16,7 @@ class PackedArgb; class PaletteArgbList; class MemoryBlockManager; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== /** diff --git a/src/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h b/src/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h index 8fc181d5f..31b2a8435 100644 --- a/src/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h +++ b/src/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h @@ -12,7 +12,7 @@ #include "sharedMath/Vector.h" -#include +#include // ====================================================================== @@ -42,7 +42,7 @@ private: private: - typedef std::hash_multimap VertexIndexMap; + typedef std::unordered_multimap VertexIndexMap; VectorVector * m_vertices; VertexIndexMap * m_indexMap; diff --git a/src/engine/shared/library/sharedMath/src/shared/Rectangle2d.h b/src/engine/shared/library/sharedMath/src/shared/Rectangle2d.h index a8c4dcbdf..7854b884d 100644 --- a/src/engine/shared/library/sharedMath/src/shared/Rectangle2d.h +++ b/src/engine/shared/library/sharedMath/src/shared/Rectangle2d.h @@ -11,6 +11,9 @@ #ifndef INCLUDED_Rectangle2d_H #define INCLUDED_Rectangle2d_H +#include +#include + //------------------------------------------------------------------- class Line2d; @@ -97,14 +100,14 @@ inline void Rectangle2d::set (const float newX0, const float newY0, const float inline float Rectangle2d::getWidth () const { - return abs(x1 - x0); + return std::abs(x1 - x0); } //------------------------------------------------------------------- inline float Rectangle2d::getHeight () const { - return abs(y1 - y0); + return std::abs(y1 - y0); } //------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h b/src/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h index 1ec86b6f8..706f846d1 100644 --- a/src/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h +++ b/src/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h @@ -7,11 +7,11 @@ //----------------------------------------------------------------------- -#include "../../include/public/sharedMath/Sphere.h" -#include "../../include/public/sharedMath/Capsule.h" -#include "../../include/public/sharedMath/SpatialSubdivision.h" -#include +#include "sharedMath/Sphere.h" +#include "sharedMath/Capsule.h" +#include "sharedMath/SpatialSubdivision.h" +#include #include static const float SphereTreeEpsilon = 0.01f; @@ -1437,7 +1437,7 @@ inline void SphereTreeNode::resizeRealSphere(const f float BR = realSphere.getRadius(); float D = A.magnitudeBetween(B); - float O = abs(AR - (D + BR)); + float O = std::abs(AR - (D + BR)); // Fatal if the error is significant, otherwise just warn. diff --git a/src/engine/shared/library/sharedMath/src/shared/Vector.cpp b/src/engine/shared/library/sharedMath/src/shared/Vector.cpp index 341cfed8b..8f3ee55d0 100644 --- a/src/engine/shared/library/sharedMath/src/shared/Vector.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/Vector.cpp @@ -12,6 +12,7 @@ #include "sharedRandom/Random.h" +#include #include // ====================================================================== @@ -284,7 +285,7 @@ bool Vector::inPolygon(const std::vector &convexPolygonVertices) const */ bool Vector::withinEpsilon(const Vector &rhs, float epsilon) const { - return (abs(x - rhs.x) < epsilon) && (abs(y - rhs.y) < epsilon) && (abs(z - rhs.z) < epsilon); + return (std::abs(x - rhs.x) < epsilon) && (std::abs(y - rhs.y) < epsilon) && (std::abs(z - rhs.z) < epsilon); } @@ -297,9 +298,9 @@ bool Vector::withinEpsilon(const Vector &rhs, float epsilon) const const Vector Vector::perpendicular(Vector const & direction) { // Measure the projection of "direction" onto each of the axes - float const id = abs(direction.dot(Vector::unitX)); - float const jd = abs(direction.dot(Vector::unitY)); - float const kd = abs(direction.dot(Vector::unitZ)); + float const id = std::abs(direction.dot(Vector::unitX)); + float const jd = std::abs(direction.dot(Vector::unitY)); + float const kd = std::abs(direction.dot(Vector::unitZ)); Vector result; diff --git a/src/engine/shared/library/sharedMath/src/shared/Vector.h b/src/engine/shared/library/sharedMath/src/shared/Vector.h index ceda3509c..60f76432c 100644 --- a/src/engine/shared/library/sharedMath/src/shared/Vector.h +++ b/src/engine/shared/library/sharedMath/src/shared/Vector.h @@ -11,6 +11,7 @@ #define INCLUDED_Vector_H // ====================================================================== +#include class Vector { @@ -265,9 +266,9 @@ inline real Vector::magnitudeSquared(void) const inline real Vector::approximateMagnitude(void) const { - real minc = abs(x); - real midc = abs(y); - real maxc = abs(z); + real minc = std::abs(x); + real midc = std::abs(y); + real maxc = std::abs(z); // sort the vectors // we do our own swapping to avoid heavy-weight includes in such a low-level class diff --git a/src/engine/shared/library/sharedMath/src/shared/core/MultiShape.cpp b/src/engine/shared/library/sharedMath/src/shared/core/MultiShape.cpp index cb556d622..2cd99f1dc 100644 --- a/src/engine/shared/library/sharedMath/src/shared/core/MultiShape.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/core/MultiShape.cpp @@ -221,7 +221,7 @@ float MultiShape::calcAvoidanceRadius ( void ) const float sinTheta = m_axisY.y; float cosTheta = sqrt( m_axisY.x * m_axisY.x + m_axisY.z * m_axisY.z ); - float twoContactRadius = abs(m_extentY * sinTheta + m_extentX * cosTheta); + float twoContactRadius = std::abs(m_extentY * sinTheta + m_extentX * cosTheta); float blah = m_extentY * sinTheta; diff --git a/src/engine/shared/library/sharedMath/src/shared/core/Range.h b/src/engine/shared/library/sharedMath/src/shared/core/Range.h index a30a9577a..790e33781 100644 --- a/src/engine/shared/library/sharedMath/src/shared/core/Range.h +++ b/src/engine/shared/library/sharedMath/src/shared/core/Range.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_Range_H #define INCLUDED_Range_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Misc.h" +#include "sharedFoundation/Misc.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp b/src/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp index 1fab47230..9a4358fe7 100644 --- a/src/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp +++ b/src/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp @@ -11,6 +11,8 @@ #include "sharedFoundation/ConfigFile.h" #include "sharedMath/ConfigSharedMath.h" +#include + // ---------- float RangeLoop::clip ( float x ) @@ -89,7 +91,7 @@ RangeLoop::RangeLoop ( float min, float max ) : m_min( clip(min) ), m_max( clip(max) ) { - if(abs(max-min) >= 1.0f) + if(std::abs(max-min) >= 1.0f) { m_min = 0.0f; m_max = 1.0f; diff --git a/src/engine/shared/library/sharedMathArchive/src/shared/FirstSharedMathArchive.h b/src/engine/shared/library/sharedMathArchive/src/shared/FirstSharedMathArchive.h index 243bbcc40..8e338aa1f 100644 --- a/src/engine/shared/library/sharedMathArchive/src/shared/FirstSharedMathArchive.h +++ b/src/engine/shared/library/sharedMathArchive/src/shared/FirstSharedMathArchive.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/MemoryManager.h b/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/MemoryManager.h index de72842e5..d99f899bd 100644 --- a/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/MemoryManager.h +++ b/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/MemoryManager.h @@ -1 +1 @@ -#include "../../../src/shared/MemoryManager.h" +#include "../../src/shared/MemoryManager.h" diff --git a/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/OsNewDel.h b/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/OsNewDel.h index d93bfa43a..6ddbc618d 100644 --- a/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/OsNewDel.h +++ b/src/engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/OsNewDel.h @@ -1,7 +1,7 @@ #if defined(PLATFORM_WIN32) -#include "../../../src/win32/OsNewDel.h" +#include "../../src/win32/OsNewDel.h" #elif defined(PLATFORM_LINUX) -#include "../../../src/linux/OsNewDel.h" +#include "../../src/linux/OsNewDel.h" #else #error unsupported platform #endif diff --git a/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp b/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp index 553adc93c..29280ef84 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp +++ b/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp @@ -59,35 +59,35 @@ extern "C" // ====================================================================== -void *operator new(size_t size, MemoryManagerNotALeak) throw (std::bad_alloc) +void *operator new(size_t size, MemoryManagerNotALeak) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, false); } // ---------------------------------------------------------------------- -void *operator new(size_t size) throw (std::bad_alloc) +void *operator new(std::size_t size) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, true); } // ---------------------------------------------------------------------- -void *operator new[](size_t size) throw (std::bad_alloc) +void *operator new[](size_t size) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), true, true); } // ---------------------------------------------------------------------- -void *operator new(size_t size, const char *file, int line) throw (std::bad_alloc) +void *operator new(size_t size, const char *file, int line) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, true); } // ---------------------------------------------------------------------- -void *operator new[](size_t size, const char *file, int line) throw (std::bad_alloc) +void *operator new[](size_t size, const char *file, int line) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), true, true); } diff --git a/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h b/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h index ad3d4df87..46595a623 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h +++ b/src/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h @@ -10,17 +10,18 @@ #define INCLUDED_OsNewDel_H // ====================================================================== +#include enum MemoryManagerNotALeak { MM_notALeak }; -void *operator new(size_t size, MemoryManagerNotALeak) throw(std::bad_alloc); -void *operator new(size_t size) throw(std::bad_alloc); -void *operator new[](size_t size) throw(std::bad_alloc); -void *operator new(size_t size, char const *file, int line) throw(std::bad_alloc); -void *operator new[](size_t size, char const *file, int line) throw(std::bad_alloc); +void *operator new(size_t size, MemoryManagerNotALeak); +void *operator new(size_t size); +void *operator new[](std::size_t size); +void *operator new(size_t size, char const *file, int line); +void *operator new[](size_t size, char const *file, int line); void operator delete(void *pointer) throw(); void operator delete[](void *pointer) throw(); diff --git a/src/engine/shared/library/sharedMemoryManager/src/shared/FirstSharedMemoryManager.h b/src/engine/shared/library/sharedMemoryManager/src/shared/FirstSharedMemoryManager.h index 18768bf0d..0beb0fc51 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/shared/FirstSharedMemoryManager.h +++ b/src/engine/shared/library/sharedMemoryManager/src/shared/FirstSharedMemoryManager.h @@ -12,7 +12,7 @@ #include "sharedFoundationTypes/FoundationTypes.h" #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.h b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.h index 407d93222..0f170c554 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.h +++ b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.h @@ -12,12 +12,12 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedDebug/include/public/sharedDebug/DebugHelp.h" +#include "sharedDebug/DebugHelp.h" // ====================================================================== #include -#include "../../../../../../engine/shared/library/sharedMemoryManager/include/public/sharedMemoryManager/OsNewDel.h" +#include "sharedMemoryManager/OsNewDel.h" // ====================================================================== // Memory manager class. diff --git a/src/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp b/src/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp index 5fdfadbe3..8d161e585 100644 --- a/src/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp +++ b/src/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp @@ -229,7 +229,7 @@ void Emitter::receiverDestroyed(const Receiver & target) const for(ReceiverList::Container::iterator i = receiverList->c.begin(); i != receiverList->c.end(); ++i) { ReceiverList::ReceiverSet & targets = (*i).second; - const ReceiverList::ReceiverSet::const_iterator j = targets.find(const_cast(&target)); //stl is broken + const ReceiverList::ReceiverSet::iterator j = targets.find(const_cast(&target)); //stl is broken if(j != targets.end()) { diff --git a/src/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h b/src/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h index 939f4acbb..47585ed6f 100644 --- a/src/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h +++ b/src/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h @@ -10,13 +10,13 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedMessageDispatch/Emitter.h" #include "sharedMessageDispatch/MessageManager.h" #include "sharedMessageDispatch/Message.h" #include "sharedMessageDispatch/Receiver.h" #include -#include +#include // ====================================================================== diff --git a/src/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp b/src/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp index d0d81454b..d6b5666a0 100644 --- a/src/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp +++ b/src/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp @@ -7,7 +7,7 @@ #include "sharedMessageDispatch/Receiver.h" #include -#include +#include namespace MessageDispatch { @@ -15,8 +15,8 @@ MessageManager MessageManager::ms_instance; struct MessageManager::Data { - std::hash_map > receivers; - std::hash_map > staticCallbacks; + std::unordered_map > receivers; + std::unordered_map > staticCallbacks; }; //--------------------------------------------------------------------- @@ -72,7 +72,7 @@ void MessageManager::addReceiver(Receiver & target, const MessageBase & source) void MessageManager::addReceiver(Receiver & target, const unsigned long int messageType) { - std::hash_map >::iterator i = data->receivers.find(messageType); + std::unordered_map >::iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { target.setHasTargets(true); @@ -92,7 +92,7 @@ void MessageManager::addReceiver(Receiver & target, const unsigned long int mess void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const MessageBase &), const unsigned long int messageType) { - std::hash_map >::iterator f = data->staticCallbacks.find(messageType); + std::unordered_map >::iterator f = data->staticCallbacks.find(messageType); if(f != data->staticCallbacks.end()) { std::set & targets = f->second; @@ -121,7 +121,7 @@ void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const M void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & message) const { const unsigned long int messageType = message.getType(); - std::hash_map >::const_iterator i = data->receivers.find(messageType); + std::unordered_map >::const_iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { const std::set targets = (*i).second; @@ -136,7 +136,7 @@ void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & me } } - std::hash_map >::iterator f = data->staticCallbacks.find(messageType); + std::unordered_map >::iterator f = data->staticCallbacks.find(messageType); if(f != data->staticCallbacks.end()) { const std::set targets = f->second; @@ -160,12 +160,12 @@ void MessageManager::receiverDestroyed(const Receiver & target) return; } // find receiver - std::hash_map >::iterator i; + std::unordered_map >::iterator i; for(i = data->receivers.begin(); i != data->receivers.end(); ++i) { std::set & targets = (*i).second; // const cast to satisfy STL semantics, target remains unchanged - std::set::const_iterator j = targets.find(const_cast(&target)); + std::set::iterator j = targets.find(const_cast(&target)); if(j != targets.end()) { targets.erase(j); @@ -200,7 +200,7 @@ void MessageManager::removeReceiver(const Receiver & target, const char * const void MessageManager::removeReceiver(const Receiver & target, const unsigned long int messageType) { - std::hash_map >::iterator i = data->receivers.find(messageType); + std::unordered_map >::iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { std::set & targets = (*i).second; diff --git a/src/engine/shared/library/sharedMessageDispatch/src/shared/Transceiver.h b/src/engine/shared/library/sharedMessageDispatch/src/shared/Transceiver.h index 3368ab663..42d301b51 100644 --- a/src/engine/shared/library/sharedMessageDispatch/src/shared/Transceiver.h +++ b/src/engine/shared/library/sharedMessageDispatch/src/shared/Transceiver.h @@ -157,6 +157,7 @@ */ //----------------------------------------------------------------------- +#include #include #include #include diff --git a/src/engine/shared/library/sharedNetwork/src/shared/Connection.cpp b/src/engine/shared/library/sharedNetwork/src/shared/Connection.cpp index 4decdbef4..c895adbaa 100644 --- a/src/engine/shared/library/sharedNetwork/src/shared/Connection.cpp +++ b/src/engine/shared/library/sharedNetwork/src/shared/Connection.cpp @@ -1,5 +1,5 @@ // Connection.cpp -// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. //----------------------------------------------------------------------- @@ -251,7 +251,7 @@ m_disconnectReason() else { do - { + { TcpClient *t = new TcpClient(a, p); t->addRef(); m_tcpClient = t; @@ -259,7 +259,7 @@ m_disconnectReason() if (isPortReserved(getBindPort()) || (getBindPort() == p)) { t->release(); - m_tcpClient = 0; + m_tcpClient = 0; } } while (!m_tcpClient); m_tcpClient->setConnection(this); @@ -362,7 +362,7 @@ Connection::~Connection() std::vector::iterator f = std::find(s_connections.begin(), s_connections.end(), this); if (f != s_connections.end()) s_connections.erase(f); - + f = std::find(s_clientConnections.begin(), s_clientConnections.end(), this); if (f != s_clientConnections.end()) s_clientConnections.erase(f); @@ -388,7 +388,7 @@ Connection::~Connection() m_connectionHandler->Release(); m_connectionHandler = 0; } - + std::for_each(m_deferredMessages.begin(), m_deferredMessages.end(), PointerDeleter()); m_deferredMessages.clear(); @@ -488,7 +488,7 @@ void Connection::flush() { if (!m_deferredMessages.empty()) { - + for (std::vector::const_iterator i = m_deferredMessages.begin(); i != m_deferredMessages.end(); ++i) { DeferredSend * d = (*i); @@ -663,7 +663,7 @@ void Connection::receive(const unsigned char * buffer, int length) { m_tcpInput->put( buffer, length ); NetworkHandler::onReceive(this, m_tcpInput->getBuffer(), m_tcpInput->getSize()); - m_tcpInput->clear(); + m_tcpInput->clear(); return; } // check current state of the header @@ -755,7 +755,7 @@ void Connection::receive(const Archive::ByteStream & bs) if (bytesPerSecond > m_recvPeakBytesPerSecond) m_recvPeakBytesPerSecond = bytesPerSecond; - + m_recvAverageBytesPerSecond = m_bytesReceived / lifeTime; std::string logChan = "Network:ConnectionStatsRecv:" + getRemoteAddress() + ":"; @@ -797,7 +797,7 @@ void Connection::reportSend(const int sendSize) static const int packetSizeWarnThreshold = ConfigSharedNetwork::getPacketSizeWarnThreshold(); static const int reportInterval = ConfigSharedNetwork::getReportStatisticsInterval(); - + if (reportInterval > 0 && !isNetLogConnection()) { if (packetSizeWarnThreshold > 0) @@ -823,7 +823,7 @@ void Connection::reportSend(const int sendSize) if (bytesPerSecond > m_sendPeakBytesPerSecond) m_sendPeakBytesPerSecond = bytesPerSecond; - + m_sendAverageBytesPerSecond = m_bytesSent / lifeTime; std::string logChan = "Network:ConnectionStatsSend:" + getRemoteAddress() + ":"; @@ -833,7 +833,7 @@ void Connection::reportSend(const int sendSize) LOG(logChan, ("Current(%d/sec), Average(%d/sec), Peak(%d/sec) Total Bytes(%d) Total Time(%lu)", bytesPerSecond, m_sendAverageBytesPerSecond, m_sendPeakBytesPerSecond, m_bytesSent, lifeTime)); m_lastSendReportTime = m_lastSendTime; m_sendBytesReportInterval = 0; - + if (m_managerHandler->getSendCompressedByteCount() > 0) LOG(logChan, ("Compression Ratio: %.2f : 1.0 Send(%d / %d)", m_managerHandler->getCompressionRatio(), m_managerHandler->getSendUncompressedByteCount(), m_managerHandler->getSendCompressedByteCount())); } @@ -849,7 +849,7 @@ void Connection::send(const Archive::ByteStream & bs, const bool r) { if (NetworkHandler::removing()) return; - + if (NetworkHandler::getCurrentFrame() != m_currentFrame) { // clear pending packet vector @@ -862,7 +862,7 @@ void Connection::send(const Archive::ByteStream & bs, const bool r) { if (reportMessages) reportSend(bs); - + reportSend(bs.getSize()); static const bool logAllNetworkTraffic = ConfigSharedNetwork::getLogAllNetworkTraffic(); @@ -924,7 +924,7 @@ void Connection::sendSharedPacket(const LogicalPacket * packet, const bool relia { if (NetworkHandler::removing()) return; - + if (packet) reportSend(packet->GetDataLen()); @@ -1029,7 +1029,7 @@ void Connection::remove() c->onConnectionClosed(); delete c; } - + TcpClient::remove(); } @@ -1127,7 +1127,7 @@ void Connection::update() c->m_tcpClient->checkKeepalive(); } } - + // update client connections { std::vector activeConnections = s_clientConnections; @@ -1180,5 +1180,5 @@ void Connection::setRawTCP( bool bNewValue ) m_rawTCP = bNewValue; m_tcpClient->setRawTCP( bNewValue ); } - -} \ No newline at end of file + +} diff --git a/src/engine/shared/library/sharedNetwork/src/shared/Connection.h b/src/engine/shared/library/sharedNetwork/src/shared/Connection.h index 5439b6f94..b1f7a4d9d 100644 --- a/src/engine/shared/library/sharedNetwork/src/shared/Connection.h +++ b/src/engine/shared/library/sharedNetwork/src/shared/Connection.h @@ -11,7 +11,7 @@ #include "sharedNetwork/NetworkHandler.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include #include @@ -32,8 +32,9 @@ class Connection : public NetworkHandler { public: Connection (const std::string & remoteAddress, const unsigned short remotePort, const NetworkSetupData & setup); - Connection (UdpConnectionMT * newConnection, TcpClient * t); + explicit Connection (UdpConnectionMT * newConnection, TcpClient * t = 0); + virtual ~Connection (); void disconnect (); void describeConnection (const std::string &); const std::string & getConnectionDescription () const; @@ -77,7 +78,6 @@ protected: friend class Service; friend class NetworkHandler; friend class TcpClient; - virtual ~Connection (); virtual void onConnectionClosed (Connection *); void onConnectionOpened (UdpConnectionMT *); int flushAndConfirmAllData (); diff --git a/src/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h b/src/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h index bcbc83d19..2408bc7bd 100644 --- a/src/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h +++ b/src/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h @@ -11,7 +11,7 @@ //#pragma warning ( disable : 4514 ) // unreferenced inline function has been removed (STL) //#pragma warning ( disable : 4702 ) // unreachable code (STL) -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedDebug/FirstSharedDebug.h" #include "sharedMemoryManager/FirstSharedMemoryManager.h" diff --git a/src/engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp b/src/engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp index c81cb7b87..c63585353 100644 --- a/src/engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp +++ b/src/engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp @@ -24,6 +24,7 @@ #include "TcpClient.h" +#include #include #include #include @@ -255,7 +256,7 @@ void NetworkHandler::onReceive(Connection * c, const unsigned char * d, int s) { if(c) { - services.inputQueue.push_back(); + services.inputQueue.push_back(IncomingData()); services.inputQueue.back().connection = c; services.inputQueue.back().byteStream.put(d, s); diff --git a/src/engine/shared/library/sharedNetwork/src/shared/UdpLibraryMT/Events.h b/src/engine/shared/library/sharedNetwork/src/shared/UdpLibraryMT/Events.h index 3891382a1..9616d94db 100644 --- a/src/engine/shared/library/sharedNetwork/src/shared/UdpLibraryMT/Events.h +++ b/src/engine/shared/library/sharedNetwork/src/shared/UdpLibraryMT/Events.h @@ -12,6 +12,7 @@ // ====================================================================== #include "UdpLibraryMT.h" +#include "UdpManagerHandlerMT.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetwork/src/win32/Address.cpp b/src/engine/shared/library/sharedNetwork/src/win32/Address.cpp index 52f113dda..0d4b0b2a9 100644 --- a/src/engine/shared/library/sharedNetwork/src/win32/Address.cpp +++ b/src/engine/shared/library/sharedNetwork/src/win32/Address.cpp @@ -56,7 +56,13 @@ hostAddress(newHostAddress) // The first byte is a letter, resolve it if( (h = gethostbyname(hostAddress.c_str())) != 0) { - memcpy(&addr4->sin_addr, h->h_addr_list[0], sizeof(addr4->sin_addr)); + int i = 0; + while (h->h_addr_list[i] != 0) { + memcpy(&addr4->sin_addr, h->h_addr_list[i++], sizeof(addr4->sin_addr)); + //addr4->sin_addr = *(u_long *) h->h_addr_list[i++]; + //printf("\tIP Address #%d: %s\n", i, inet_ntoa(addr)); + } + //memcpy(&addr4->sin_addr, h->h_addr_list[0], sizeof(addr4->sin_addr)); } else { @@ -368,7 +374,7 @@ size_t Address::hashFunction() const Example: \code - typedef std::hash_map AddressMap; + typedef std::unordered_map AddressMap; \endcode @return true if the left hand side and right hand side are equal diff --git a/src/engine/shared/library/sharedNetwork/src/win32/NetworkGetHostName.cpp b/src/engine/shared/library/sharedNetwork/src/win32/NetworkGetHostName.cpp index ed0abc578..faebb2b90 100644 --- a/src/engine/shared/library/sharedNetwork/src/win32/NetworkGetHostName.cpp +++ b/src/engine/shared/library/sharedNetwork/src/win32/NetworkGetHostName.cpp @@ -22,6 +22,8 @@ struct HN HN::HN() { + WSADATA wsaData; + int iResult = WSAStartup(MAKEWORD(2, 2), &wsaData); char name[512] = {"\0"}; if(gethostname(name, sizeof(name)) == 0) { @@ -38,6 +40,22 @@ const std::string & NetworkHandler::getHostName() return hn.hostName; } +const std::string & NetworkHandler::getHumanReadableHostName() +{ + char name[512] = {"\0"}; + static std::string nameString; + if(nameString.empty()) + { + if(gethostname(name, sizeof(name)) == 0) + { + name[sizeof(name) - 1] = 0; + //hostName = name; + nameString = name; + } + } + return nameString; +} + //----------------------------------------------------------------------- const std::vector > & NetworkHandler::getInterfaceAddresses() diff --git a/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h b/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h index 6bc2b207a..ef04414d1 100644 --- a/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h @@ -1 +1 @@ -#include "../../src/shared/clientGameServer/IncubatorCommitMessage.h" \ No newline at end of file +#include "../../src/shared/clientGameServer/IncubatorCommitMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h b/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h index b281341d6..00f63b4dd 100644 --- a/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h @@ -1 +1 @@ -#include "../../src/shared/clientGameServer/IncubatorStartMessage.h" \ No newline at end of file +#include "../../src/shared/clientGameServer/IncubatorStartMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h index 0383f1b12..b3dbd0bba 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h @@ -13,7 +13,7 @@ #include "sharedNetworkMessages/GameNetworkMessage.h" #include "unicodeArchive/UnicodeArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h index 88038d99e..117cccf0f 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h @@ -9,8 +9,8 @@ #define INCLUDED_ChatDeleteAllPersistentMessages_H #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h index 6c99d980e..3f204fda8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h @@ -9,7 +9,7 @@ #include "sharedNetworkMessages/GameNetworkMessage.h" #include "sharedNetworkMessages/ChatAvatarId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h index e53fd74ff..d4a5deb6e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h @@ -11,7 +11,7 @@ //----------------------------------------------------------------------- #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "sharedMath/Transform.h" #include "sharedMathArchive/TransformArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h index 9c3574bf5..624381d38 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h index adb006a0e..525af5c2f 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h @@ -14,8 +14,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h index 41c8d7860..daf646ec5 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/Vector2d.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h index e14e1b4b9..bb7237b25 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h index bc908ce24..aad150087 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "unicodeArchive/UnicodeArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h index 72811083a..58021cc60 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h @@ -13,7 +13,7 @@ #include #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // These ***MUST*** be kept in sync in src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h and src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h #ifndef AUCTION_PREMIUM_AUCTION diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h index a35a38d1e..830bdaa58 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h @@ -12,9 +12,9 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/Tag.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h index cc7a31e88..93e1a5005 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h index 9e2ecfcaf..bc251b40b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h index 8f76897c3..ff1c0d818 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h index da2efe16e..c406b86eb 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h @@ -14,8 +14,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h index 4ff410c2a..824febe40 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h @@ -6,7 +6,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h index 39ac5a1c4..1fcc3b405 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h @@ -10,7 +10,7 @@ #define _BuffBuilderStartMessage_H //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h index 7e24b0cdb..329a00cec 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h index c0b49cbc9..6e711ba39 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h @@ -14,8 +14,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h index 5ad94d6d9..943594529 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h @@ -10,8 +10,8 @@ #include "StringId.h" #include "Unicode.h" #include "localizationArchive/StringIdArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp index fe8be3a43..bddc64322 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp @@ -89,8 +89,8 @@ const std::string& PlayClientEffectObjectMessage::getLabel() const //-- PlayClientEffectObjectTransformMessage //---------------------------------------------------------------------- -PlayClientEffectObjectTransformMessage::PlayClientEffectObjectTransformMessage(const NetworkId& id, - const std::string& effectName, +PlayClientEffectObjectTransformMessage::PlayClientEffectObjectTransformMessage(const NetworkId& id, + const std::string& effectName, Transform const & transform, const std::string& label) : GameNetworkMessage(MESSAGE_TYPE), @@ -184,7 +184,7 @@ PlayClientEffectLocMessage::PlayClientEffectLocMessage(Archive::ReadIterator& so m_cell(), m_terrainDelta(), m_label() -{ +{ addVariable (m_effectName); addVariable (m_planet); addVariable (m_locationX); @@ -290,8 +290,8 @@ const std::string& PlayClientEventObjectMessage::getHardpoint() const //-- PlayClientEventObjectTransformMessage //---------------------------------------------------------------------- -PlayClientEventObjectTransformMessage::PlayClientEventObjectTransformMessage(const NetworkId& id, - const std::string& eventName, +PlayClientEventObjectTransformMessage::PlayClientEventObjectTransformMessage(const NetworkId& id, + const std::string& eventName, Transform const & transform) : GameNetworkMessage(MESSAGE_TYPE), m_eventName(eventName), @@ -951,4 +951,4 @@ uint32 CreateClientProjectileObjectToLocationMessage::getTrailArgb() const { return m_trailArgb.get(); } -//----------------------------------------------------------------------- \ No newline at end of file +//----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h index 770ec0911..bd4eff2ee 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h @@ -13,7 +13,7 @@ #include "Archive/Archive.h" #include "Unicode.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedMath/Transform.h" #include "sharedMath/Vector.h" #include "sharedMathArchive/TransformArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp index b03047897..d9aa95e77 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp @@ -11,6 +11,8 @@ #include "sharedMathArchive/VectorArchive.h" #include "sharedNetworkMessages/ClientMfdStatusUpdateMessage.h" +#include + //----------------------------------------------------------------------- const char * const ClientMfdStatusUpdateMessage::MESSAGE_TYPE = "ClientMfdStatusUpdateMessage"; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h index a240deed8..f241deb5d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h @@ -13,7 +13,7 @@ #include "sharedMath/Vector.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h index 95e8cd097..2db767606 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h index fb6f70437..8ad6c9da0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h index 7d77dfa06..3440ea7c5 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h @@ -12,8 +12,8 @@ #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h index 4f4ad3800..f6224e280 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/MessageQueueGenericValueType.h" namespace Archive diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h index 00a07a2d1..1ae78e161 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h index 13631ab41..66a0a263a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h index 56e679880..9dddd233a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h index 95a88277b..ed05cf7b6 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h @@ -11,7 +11,7 @@ // ====================================================================== #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedMathArchive/VectorArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h index 4c92cc900..6eb251100 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h index 9574388ab..1ac31239e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h index 6837fe383..e8cabccde 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h index 03f4cd12f..a2516c424 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h @@ -6,7 +6,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h index bf7eb3bd3..46daf53f6 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h index aafb93210..af723fadc 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h index 064bcc9ad..a6eaace89 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h @@ -11,7 +11,7 @@ // ================================================================== #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" // ================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h index e80f06393..5d234018c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h @@ -10,7 +10,7 @@ // ====================================================================== -//#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +//#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h index 57d9115be..275d3ada6 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h index 7cb5a580d..c0799e4db 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include "sharedNetworkMessages/MapLocation.h" #include "sharedNetworkMessages/MapLocationArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h index a45d7309e..19c3f6f2a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include "sharedNetworkMessages/MapLocation.h" #include "sharedNetworkMessages/MapLocationArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h index 6c98a684e..f03791268 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Transform.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h index cc53cfa1d..07c176e08 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h @@ -6,7 +6,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h index e91e65c06..bfe11d947 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h @@ -11,7 +11,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h index 1f084746d..349b8e221 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h @@ -10,7 +10,7 @@ #define _IncubatorCommitMessage_H //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h index 8ae14528f..ca8b156d2 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h @@ -10,7 +10,7 @@ #define _IncubatorStartMessage_H //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h index 693ed1e62..2bbabf4cd 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h index 6e9a7ae1e..c51cec516 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h @@ -14,7 +14,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h index 33d04ddc1..383726c58 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h @@ -6,7 +6,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector2d.h" #include "Unicode.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h index dd83d02f9..a3edba80d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueChangeRoleIconChoice_H #define INCLUDED_MessageQueueChangeRoleIconChoice_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h index ced20a5b0..3da65d84f 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueCombatCommand_H #define INCLUDED_MessageQueueCombatCommand_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class MemoryBlockManager; //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h index 60dd5bf31..ac405d85c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include "Unicode.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h index 61ed4bf7b..415623388 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h @@ -9,7 +9,7 @@ #define INCLUDED_MessageQueueCombatSpamArchive_H #include "Archive/ByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueCombatSpam; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h index beeb00305..489c7ec62 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h index c38182ca8..185283dd1 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h index 88ffecb89..912785eaa 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftCustomization_H #define INCLUDED_MessageQueueCraftCustomization_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedGame/CraftingData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h index 92bc99f7c..c272fa715 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftEmptySlot_H #define INCLUDED_MessageQueueCraftEmptySlot_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h index d75b35af9..921c3dba0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftExperiment_H #define INCLUDED_MessageQueueCraftExperiment_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; @@ -24,8 +24,8 @@ public: struct ExperimentInfo { - const int attributeIndex; // which attribute is being experiemnted - const int experimentPoints; // how many experiment points are allocated + int attributeIndex; // which attribute is being experiemnted + int experimentPoints; // how many experiment points are allocated ExperimentInfo(int attribute, int points) : attributeIndex(attribute), @@ -33,8 +33,8 @@ public: { } - private: - ExperimentInfo & operator = (const ExperimentInfo &); + //private: + // ExperimentInfo & operator = (const ExperimentInfo &); }; public: diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h index 3aa2a751b..9b552b207 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftFillSlot_H #define INCLUDED_MessageQueueCraftFillSlot_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h index 5b5906630..6c60af36c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftIngredients_H #define INCLUDED_MessageQueueCraftIngredients_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedGame/CraftingData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" @@ -38,14 +38,14 @@ public: int maxValue; }; - Ingredient::Ingredient(const Unicode::String & _name, IngredientType _type, int _quantity) : + Ingredient(const Unicode::String & _name, IngredientType _type, int _quantity) : name(_name), type(_type), quantity(_quantity) { } - Ingredient::Ingredient(const Unicode::String & _name, int _minValue, int _maxValue) : + Ingredient(const Unicode::String & _name, int _minValue, int _maxValue) : name(_name), minValue(_minValue), maxValue(_maxValue) diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h index e40493f44..d432cc0ce 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftRequestSession_H #define INCLUDED_MessageQueueCraftRequestSession_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h index 44facbc17..4f4e71f56 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueCraftSelectSchematic_H #define INCLUDED_MessageQueueCraftSelectSchematic_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h index e0b143ed4..d6c19455c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_MessageQueueCreateSaga_H #define INCLUDED_MessageQueueCreateSaga_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; @@ -43,8 +43,8 @@ public: int numParameters; std::vector parameters; - private: - TaskInfo & operator = (const TaskInfo &); + //private: + // TaskInfo & operator = (const TaskInfo &); }; public: diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h index 4b0e1a86d..7f6ea909d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueCyberneticsChangeRequest_H #define INCLUDED_MessageQueueCyberneticsChangeRequest_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h index 16cbc2f92..cd28f54d0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_MessageQueueCyberneticsOpen_H #define INCLUDED_MessageQueueCyberneticsOpen_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h index 1d3981505..2244d2338 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedMath/Transform.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h index 3fcbbaf5f..69689c767 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h @@ -10,8 +10,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Transform.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h index 7ecf68fad..39acc351c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueDraftSchematics_H #define INCLUDED_MessageQueueDraftSchematics_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/MessageQueueDraftSchematicsData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h index d2e4c8aee..8514b2f3e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_MessageQueueDraftSlots_H #define INCLUDED_MessageQueueDraftSlots_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/MessageQueueDraftSlotsData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h index 0958cd7a1..4d9df6947 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/MessageQueueDraftSlotsData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h index 9670c9e63..508535304 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h index ea4479319..4cf9f3c55 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h index b5b4aa09f..1d6da9552 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h @@ -9,7 +9,7 @@ #define INCLUDED_MessageQueueGenericIntResponseArchive_H #include "Archive/ByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueGenericIntResponse; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h index 51ad178a0..e77516fd9 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h index 4e0c58e66..1059cca46 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h @@ -9,7 +9,7 @@ #define INCLUDED_MessageQueueGenericResponseArchive_H #include "Archive/ByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueGenericResponse; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h index dd54de738..ed4d03eb5 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueGenericString_H #define INCLUDED_MessageQueueGenericString_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h index d717f125f..bb1e435bf 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueHarvesterResourceData_H #define INCLUDED_MessageQueueHarvesterResourceData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedUtility/InstallationResourceData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h index 80cd6e7d8..e9ff7c21b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h index 2229aca77..002a74978 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h index c22c99654..3bb40ad4a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h @@ -7,8 +7,8 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h index adf830c89..4620d2b3a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h index 3a69d0943..638584077 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h @@ -11,7 +11,7 @@ //====================================================================== #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "StringId.h" class Token; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h index cea802e0e..4937f1040 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h index ae4e5e51f..de42c95e8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h index ae921714d..49894dacf 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h @@ -7,8 +7,8 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h index 4e981d1bf..1ad6b0ce8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/MessageQueueMissionListResponseData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h index bf48d177a..ccdce2468 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "StringId.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h index 240439f7c..fe947beb6 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueNetworkId_H #define INCLUDED_MessageQueueNetworkId_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h index 2cf7c086e..f06e2b27e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueNetworkIdPair_H #define INCLUDED_MessageQueueNetworkIdPair_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h index 7f2c66ea5..11fa0f1fe 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueNpcConversationMessage_H #define INCLUDED_MessageQueueNpcConversationMessage_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h index 38591caa1..cb7bad650 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h @@ -11,8 +11,8 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/ObjectMenuRequestDataArchive.h" #include "Unicode.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h index fda7b8dae..55de51afe 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueOpponentInfo_H #define INCLUDED_MessageQueueOpponentInfo_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h index 3202e0971..2c5b03acf 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h index 67fd469f9..065038b01 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_MessageQueuePushCreature_H #define INCLUDED_MessageQueuePushCreature_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h index 3a95aa443..60fc624f3 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueQuestTaskCounterMessage_H #define INCLUDED_MessageQueueQuestTaskCounterMessage_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h index 39090f1d3..7e06e8d34 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueQuestTaskLocationMessage_H #define INCLUDED_MessageQueueQuestTaskLocationMessage_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include "sharedUtility/Location.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h index 5ec6db017..a3cc762a5 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h @@ -8,8 +8,8 @@ #ifndef INCLUDED_MessageQueueQuestTaskTimerMessage_H #define INCLUDED_MessageQueueQuestTaskTimerMessage_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h index 54adb32c1..197fdb3df 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueResourceEmptyHopper_H #define INCLUDED_MessageQueueResourceEmptyHopper_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h index 16c940765..f4a866a7e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h @@ -9,7 +9,7 @@ #define INCLUDED_MessageQueueResourceEmptyHopperArchive_H #include "Archive/ByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueResourceEmptyHopper; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h index 6f8ad7c09..b0960ad21 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_MessageQueueResourceWeights_H #define INCLUDED_MessageQueueResourceWeights_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h index f2c6ea0bc..2b12c2831 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueSecureTrade_H #define INCLUDED_MessageQueueSecureTrade_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h index 1b182ba0a..0df635df0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueSelectCurrentWorkingSkill_H #define INCLUDED_MessageQueueSelectCurrentWorkingSkill_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h index b47ab07cd..2f6d8639a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueSelectProfessionTemplate_H #define INCLUDED_MessageQueueSelectProfessionTemplate_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h index 2740bc18a..573d10c2d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include "sharedMath/Vector.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h index 5bf1b3c2a..151399e2c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h @@ -11,7 +11,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "StringId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h index fcbdf3cf0..8d3a1cc63 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h @@ -9,7 +9,7 @@ #ifndef INCLUDED_MessageQueueShowCombatTextArchive_H #define INCLUDED_MessageQueueShowCombatTextArchive_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" //====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h index e7a34cb75..66826515b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h @@ -11,7 +11,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "StringId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h index 30131f9aa..0305c414a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h @@ -9,7 +9,7 @@ #ifndef INCLUDED_MessageQueueShowFlyTextArchive_H #define INCLUDED_MessageQueueShowFlyTextArchive_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" //====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h index f4b594125..eb4c0e3b1 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h @@ -11,7 +11,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h index fae09ddf1..f0282b684 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h @@ -10,7 +10,7 @@ #define INCLUDED_MessageQueueSitOnObjectArchive_H #include "Archive/ByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueSpatialChat; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h index 9ea5b0501..fc4e9a67b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h index 1489ec3ee..d2da5327b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h index c5551cf78..218efd35c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueSocialArchive_H #define INCLUDED_MessageQueueSocialArchive_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueSocial; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h index e4bb688f1..b6b6b83a6 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h index 14df6edda..919638f33 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h index 969b5f66f..2278344f8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueSpatialChatArchive_H #define INCLUDED_MessageQueueSpatialChatArchive_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueSpatialChat; class MessageQueueData; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h index 5095369d9..31a04073f 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueStartNpcConversation_H #define INCLUDED_MessageQueueStartNpcConversation_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedGame/NpcConversationData.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h index 68be55ed8..eb5cea386 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" #include "StringId.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h index 5615dca54..92a6c0dad 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_MessageQueueString_H #define INCLUDED_MessageQueueString_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h index 5e2e1e116..fb74d8ae4 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_MessageQueueStringList_H #define INCLUDED_MessageQueueStringList_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h index 3e4921cd6..c9eddecb0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h index 3f5d05259..c8e385baa 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/GameNetworkMessage.h" class Object; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h index 4f94bdd76..5290710f9 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h @@ -15,7 +15,7 @@ #include "Unicode.h" #include "StringId.h" #include "unicodeArchive/UnicodeArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h index 0b85b1920..6d6fc88f1 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h @@ -13,7 +13,7 @@ //----------------------------------------------------------------------- #include "unicodeArchive/UnicodeArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/ObjectMenuRequestData.h" #include "Archive/Archive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h index a1bf699f8..bbbf3e457 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h @@ -11,7 +11,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h index cfe08561b..192865b0c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h @@ -11,7 +11,7 @@ // ================================================================== #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" // ================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h index b15e845fc..7854292aa 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h index 808268411..0a6221445 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h index 2fc994217..e29d18707 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h index 40dc0d392..4c55c428b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h @@ -14,8 +14,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/AuctionErrorCodes.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp index 9ed2e9390..ce12270c3 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp @@ -11,6 +11,8 @@ #include "sharedMathArchive/TransformArchive.h" #include "sharedFoundation/MemoryBlockManager.h" +#include + //----------------------------------------------------------------------- namespace SceneChannelMessagesNamespace diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h index 5475072c0..db11fc100 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h @@ -12,7 +12,7 @@ namespace Archive class ByteStream; } -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "sharedMath/Transform.h" #include "sharedMathArchive/TransformArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h index 318e3e9ac..e3140fa1d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h @@ -13,8 +13,8 @@ #include "Archive/Archive.h" #include "Unicode.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h index 3593ae281..f480e84ba 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h @@ -9,7 +9,7 @@ #define INCLUDED_ShipDamageMessage_H #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h index 64b0b950c..a1662ca5a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h @@ -12,7 +12,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Transform.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h index 13b76f9fd..effac2e71 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h @@ -16,8 +16,8 @@ class Object; #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h index bbaea255d..3032fd8a8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h @@ -10,7 +10,7 @@ // ====================================================================== -//#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +//#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h index 347513aa0..dc8ceed5b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h @@ -26,7 +26,7 @@ public: public: explicit SuiCreatePageMessage(SuiPageData const & pageData); - explicit SuiCreatePageMessage::SuiCreatePageMessage(Archive::ReadIterator & source); + explicit SuiCreatePageMessage(Archive::ReadIterator & source); SuiPageData const & getPageData() const; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h index d94625448..4afa4d438 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h @@ -24,7 +24,7 @@ public: public: SuiEventNotification(int pageId, int subscribedEventIndex, int reservePropertyCount); - explicit SuiEventNotification::SuiEventNotification(Archive::ReadIterator & source); + explicit SuiEventNotification(Archive::ReadIterator & source); int getPageId() const; int getSubscribedEventIndex() const; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h index 1c3e88d4d..6376eb088 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h @@ -25,7 +25,7 @@ public: public: explicit SuiUpdatePageMessage(SuiPageData const & pageData); - explicit SuiUpdatePageMessage::SuiUpdatePageMessage(Archive::ReadIterator & source); + explicit SuiUpdatePageMessage(Archive::ReadIterator & source); SuiPageData const & getPageData() const; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h index f5bcd10c8..83f4d913a 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h @@ -15,8 +15,8 @@ class Object; #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h index 9831af1e6..8e6dd5ac4 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h @@ -13,7 +13,7 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h index ae7a33162..7eee444f4 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h @@ -11,7 +11,7 @@ // ====================================================================== #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedMathArchive/VectorArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h index 3e5caf9b7..9883a04a4 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h @@ -11,8 +11,8 @@ class Object; #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h index ea9cd5dfe..932c9f161 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h @@ -15,8 +15,8 @@ class Object; #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h index a47442dba..ed0b830f3 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h @@ -11,8 +11,8 @@ class Object; #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h index 988f0ef36..9664b9002 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h @@ -12,8 +12,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp index 52e86288c..b9ee8cf64 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp @@ -11,13 +11,13 @@ const char * const ClientNotificationBoxMessage::MessageType = "ClientNotificationBoxMessage"; -ClientNotificationBoxMessage::ClientNotificationBoxMessage( +ClientNotificationBoxMessage::ClientNotificationBoxMessage( int sequenceId, - NetworkId player, - Unicode::String const &contents, - bool useNotificationIcon, - int iconStyle, - float timeout, + NetworkId player, + Unicode::String const &contents, + bool useNotificationIcon, + int iconStyle, + float timeout, int channel, std::string const & sound) : GameNetworkMessage("ClientNotificationBoxMessage"), @@ -40,7 +40,7 @@ m_sound(sound) AutoByteStream::addVariable(m_sound); } - + ClientNotificationBoxMessage::ClientNotificationBoxMessage(Archive::ReadIterator &source) : GameNetworkMessage("ClientNotificationBoxMessage"), m_sequenceId(0), @@ -60,6 +60,6 @@ m_sound() AutoByteStream::addVariable(m_timeout); AutoByteStream::addVariable(m_channel); AutoByteStream::addVariable(m_sound); - + unpack(source); -} \ No newline at end of file +} diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h index e60297060..c3b550e38 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h @@ -1,20 +1,20 @@ // ClientNotificationBoxMessage.h -// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. #ifndef _INCLUDED_ClientNotificationBoxMessage_H #define _INCLUDED_ClientNotificationBoxMessage_H #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "Unicode.h" class ClientNotificationBoxMessage : public GameNetworkMessage { public: - + static const char * const MessageType; - + enum IconStyle { IS_NONE, @@ -33,9 +33,9 @@ public: ClientNotificationBoxMessage( int sequenceId, NetworkId player, Unicode::String const & contents, bool useNotificationIcon, int iconStyle, float timeout, int channel, std::string const & sound ); - + explicit ClientNotificationBoxMessage(Archive::ReadIterator & source); - + public: int getSequenceId() const; const NetworkId &getPlayer() const; @@ -96,4 +96,4 @@ inline std::string const & ClientNotificationBoxMessage::getSound() const return m_sound.get(); } -#endif // _INCLUDED_MessageQueueCommandTimer_H \ No newline at end of file +#endif // _INCLUDED_MessageQueueCommandTimer_H diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h index 30e8fd452..d6fe25001 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h @@ -9,8 +9,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp index 3fbdeb5c7..bd1a5db36 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp @@ -13,7 +13,7 @@ #include "sharedFoundation/CrcString.h" #include "sharedNetworkMessages/NetworkMessageFactory.h" #include -#include +#include // ====================================================================== @@ -22,7 +22,7 @@ std::string const GameNetworkMessage::NetworkVersionId = "20100225-17:43"; namespace GameNetworkMessageNamespace { - std::hash_map gs_messageCount; + std::unordered_map gs_messageCount; // ---------------------------------------------------------------------- @@ -34,7 +34,7 @@ namespace GameNetworkMessageNamespace } }; - std::hash_map s_messageTypes; + std::unordered_map s_messageTypes; } using namespace GameNetworkMessageNamespace; @@ -105,7 +105,7 @@ std::vector > const GameNetworkMessage::getMessageCo { std::vector > result; - for (std::hash_map::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i) + for (std::unordered_map ::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i) result.push_back(std::make_pair(s_messageTypes[(*i).first], (*i).second)); std::sort(result.begin(), result.end(), SortPair()); diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h index 557bdeb61..741c51437 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h @@ -1,10 +1,10 @@ // MessageQueueCommandTimer.h -// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. +// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. #ifndef _INCLUDED_MessageQueueCommandTimer_H #define _INCLUDED_MessageQueueCommandTimer_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" class MessageQueueCommandTimer : public MessageQueue::Data { @@ -15,28 +15,28 @@ public: F_execute, F_cooldown, F_failed, - F_failedRetry, + F_failedRetry, F_cooldown2, F_MAX }; MessageQueueCommandTimer( uint32 sequenceId, int cooldownGroup, int cooldownGroup2, uint32 commandNameCrc ); - - /** + + /** * @brief sets the current time for the given state */ void setCurrentTime( Flags flag, float time ); - + /** * @brief gets the current time for the requested state */ float getCurrentTime( Flags flag ) const; - + /** * @brief gets the maximum time for the given state */ void setMaxTime( Flags flag, float time ); - + /** * @brief sets the maximum time for the given state */ @@ -46,14 +46,14 @@ public: * @brief sets the cooldown group for this command */ void setCooldownGroup( int group ); - + /** * @brief gets the cooldown group for this command, if it has one. * this method returns -1 if this command is not part of a cooldown group. * NOTE: the -1 value is reserved for future use; all commands are part of a cooldown group. */ int getCooldownGroup() const; - + /** * @brief returns true if this command is part of a cooldown group. as per * the current design, this method should always return true. @@ -64,7 +64,7 @@ public: * @brief sets the cooldown group for this command */ void setCooldownGroup2( int group ); - + /** * @brief gets the cooldown group 2 for this command, if it has one. * this method returns -1 if this command is not part of a cooldown group 2. @@ -101,28 +101,28 @@ public: * @brief returns the flag bit field */ uint32 getFlags() const; - + /** * @brief returns true if this packet contains time information * for the requested state. */ bool hasTime( Flags flag ) const; - + /** * @brief sets the sequence id for this command */ void setSequenceId( uint32 id ); - + /** * @brief gets the sequence id for this command */ uint32 getSequenceId() const; - + /** * @brief sets the command name crc for this command */ void setCommandNameCrc( uint32 commandNameCrc ); - + /** * @brief gets the command name crc for this command */ @@ -132,7 +132,7 @@ public: * @brief returns the given flag as a bit value */ static uint32 toBitValue( Flags flag ); - + private: uint32 m_commandNameCrc; uint32 m_flags; @@ -254,7 +254,7 @@ inline void MessageQueueCommandTimer::setFailed() } inline bool MessageQueueCommandTimer::getFailed() const -{ +{ return ( m_flags & toBitValue( F_failed ) ) != 0; } @@ -264,8 +264,8 @@ inline void MessageQueueCommandTimer::setFailedRetry() } inline bool MessageQueueCommandTimer::getFailedRetry() const -{ +{ return ( m_flags & toBitValue( F_failedRetry ) ) != 0; } -#endif // _INCLUDED_MessageQueueCommandTimer_H \ No newline at end of file +#endif // _INCLUDED_MessageQueueCommandTimer_H diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h index 6d89f781a..14bf82124 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h index 9740df6e0..aee6d30e8 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h @@ -7,8 +7,8 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Transform.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h index f6bcebb92..14f186f51 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h @@ -10,10 +10,10 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/GameControllerMessage.h" +#include "sharedFoundation/GameControllerMessage.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h index 9bc97d370..18ee43f34 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h @@ -10,7 +10,7 @@ #define INCLUDED_ControllerMessageMacros_H // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "Archive/Archive.h" #define CONTROLLER_MESSAGE_INTERFACE \ diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h index a8500f9d1..1796d15a1 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h @@ -10,14 +10,14 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include #include "sharedNetworkMessages/ClientCentralMessages.h" #include "sharedNetworkMessages/ClientLoginMessages.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "unicodeArchive/UnicodeArchive.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h index aa1056d4c..0c097869b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h index 95d88ec88..c64cc7e1c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h index 4d98b0ccc..63c56e19d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h index 11f18eef2..8ff831181 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h index bc6b49d77..52a7f21a9 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h index eeab429fe..235a2a3e4 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h index ad2ba004b..26dc79fa9 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h index 070b1cd44..b5c2700e2 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h index 68e2aaa46..63e103531 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h index c82cc143b..7416ec406 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h index f2d16bafc..163f1877f 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h index 58be5e0fb..5cd394514 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h index 0546cf17c..205be3a7b 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h index 645023eb3..288286514 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/CustomerServiceComment.h" #include "sharedNetworkMessages/CustomerServiceCommentArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h index 4f95f0566..5c2740ee5 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h index 79a7ecc07..ec8de2b94 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/CustomerServiceTicket.h" #include "sharedNetworkMessages/CustomerServiceTicketArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h index d1917413c..3d41b2afe 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h @@ -13,8 +13,8 @@ #include "Archive/AutoDeltaByteStream.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Tag.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h index 73c581719..49a2133cd 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------- #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/CustomerServiceSearchResult.h" #include "sharedNetworkMessages/CustomerServiceSearchResultArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h index 07950f970..54b3dc2c0 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h index 67dad7bbb..f50fcb6bb 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h @@ -10,9 +10,9 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h index b1f5806e1..cacfae81c 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h @@ -5,7 +5,7 @@ #ifndef _INCLUDED_VoiceChatChannelInfo_H #define _INCLUDED_VoiceChatChannelInfo_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp index 26e0bdbcf..5d88bdd04 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp @@ -8,7 +8,7 @@ const char* const VoiceChatAddClientToChannel::cms_name = "VoiceChatAddClientToC VoiceChatAddClientToChannel::VoiceChatAddClientToChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName, bool forceShortlist) : GameNetworkMessage(cms_name), - m_clientId(clientId), + m_clientId(clientId), m_clientName(clientName), m_channelName(roomName), m_forceShortlist(forceShortlist) @@ -21,7 +21,7 @@ VoiceChatAddClientToChannel::VoiceChatAddClientToChannel(NetworkId const & clien VoiceChatAddClientToChannel::VoiceChatAddClientToChannel(Archive::ReadIterator &source) : GameNetworkMessage(cms_name), - m_clientId(), + m_clientId(), m_clientName(), m_channelName(), m_forceShortlist(false) @@ -45,7 +45,7 @@ const char* const VoiceChatRemoveClientFromChannel::cms_name = "VoiceChatRemoveC VoiceChatRemoveClientFromChannel::VoiceChatRemoveClientFromChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName) : GameNetworkMessage(cms_name), -m_clientId(clientId), +m_clientId(clientId), m_clientName(clientName), m_channelName(roomName) { @@ -56,7 +56,7 @@ m_channelName(roomName) VoiceChatRemoveClientFromChannel::VoiceChatRemoveClientFromChannel(Archive::ReadIterator &source) : GameNetworkMessage(cms_name), -m_clientId(), +m_clientId(), m_clientName(), m_channelName() { @@ -193,7 +193,7 @@ VoiceChatDeleteChannel::~VoiceChatDeleteChannel() //----------------------------------------------------------------------- const char* const VoiceChatChannelCommand::cms_name = "VoiceChatChannelCommand"; -VoiceChatChannelCommand::VoiceChatChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, +VoiceChatChannelCommand::VoiceChatChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, std::string const & _channelName, uint32 _command, uint32 _banTimeout) : GameNetworkMessage(cms_name), m_srcUserName(_srcUserName), @@ -234,7 +234,7 @@ VoiceChatChannelCommand::~VoiceChatChannelCommand() //----------------------------------------------------------------------- const char* const VoiceChatOnChannelCommand::cms_name = "VoiceChatOnChannelCommand"; -VoiceChatOnChannelCommand::VoiceChatOnChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, +VoiceChatOnChannelCommand::VoiceChatOnChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, std::string const & _channelName, uint32 _command, uint32 _banTimeout, uint32 _result) : GameNetworkMessage(cms_name), m_srcUserName(_srcUserName), @@ -463,4 +463,4 @@ m_channelName() VoiceChatRequestChannelInfo::~VoiceChatRequestChannelInfo() { -} \ No newline at end of file +} diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h index c48097fe7..95d90171e 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h @@ -5,8 +5,8 @@ #ifndef _INCLUDED_VoiceChatMiscMessages_H #define _INCLUDED_VoiceChatMiscMessages_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h index 2ed4109ad..235671052 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h @@ -5,7 +5,7 @@ #ifndef _INCLUDED_VoiceChatOnGetAccount_H #define _INCLUDED_VoiceChatOnGetAccount_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterResult.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterResult.h index 1cfa94593..eb40937e3 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterResult.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterResult.h @@ -1 +1 @@ -#include "../../../src/shared/object/AlterResult.h" +#include "../../src/shared/object/AlterResult.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterScheduler.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterScheduler.h index 317f758da..f7ccf1adf 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterScheduler.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/AlterScheduler.h @@ -1 +1 @@ -#include "../../../src/shared/object/AlterScheduler.h" +#include "../../src/shared/object/AlterScheduler.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Appearance.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Appearance.h index 40d1f2ff2..53fe49c74 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Appearance.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Appearance.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/Appearance.h" +#include "../../src/shared/appearance/Appearance.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplate.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplate.h index 2fc37a1c4..1ba0e4b8c 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplate.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/AppearanceTemplate.h" +#include "../../src/shared/appearance/AppearanceTemplate.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplateList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplateList.h index 55b3298e2..d5fea6255 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplateList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/AppearanceTemplateList.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/AppearanceTemplateList.h" +#include "../../src/shared/appearance/AppearanceTemplateList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptor.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptor.h index d0adee719..b4f55606c 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptor.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptor.h @@ -1 +1 @@ -#include "../../../src/shared/container/ArrangementDescriptor.h" +#include "../../src/shared/container/ArrangementDescriptor.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptorList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptorList.h index 5d1b8e5f5..8f22c159f 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptorList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ArrangementDescriptorList.h @@ -1 +1 @@ -#include "../../../src/shared/container/ArrangementDescriptorList.h" +#include "../../src/shared/container/ArrangementDescriptorList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/BasicRangedIntCustomizationVariable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/BasicRangedIntCustomizationVariable.h index f4f271d4a..f0b2e0686 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/BasicRangedIntCustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/BasicRangedIntCustomizationVariable.h @@ -1 +1 @@ -#include "../../../src/shared/customization/BasicRangedIntCustomizationVariable.h" +#include "../../src/shared/customization/BasicRangedIntCustomizationVariable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkId.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkId.h index 8017be405..b1c0c2325 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkId.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkId.h @@ -1 +1 @@ -#include "../../../src/shared/object/CachedNetworkId.h" +#include "../../src/shared/object/CachedNetworkId.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkIdArchive.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkIdArchive.h index 3e0bf92a1..1a79c49e3 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkIdArchive.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CachedNetworkIdArchive.h @@ -1 +1 @@ -#include "../../../src/shared/object/CachedNetworkIdArchive.h" +#include "../../src/shared/object/CachedNetworkIdArchive.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CellProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CellProperty.h index b7cedc4d0..107f726de 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CellProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CellProperty.h @@ -1 +1 @@ -#include "../../../src/shared/portal/CellProperty.h" +#include "../../src/shared/portal/CellProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ConfigSharedObject.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ConfigSharedObject.h index 4b82b6092..67c9bf6cd 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ConfigSharedObject.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ConfigSharedObject.h @@ -1 +1 @@ -#include "../../../src/shared/core/ConfigSharedObject.h" +#include "../../src/shared/core/ConfigSharedObject.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ContainedByProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ContainedByProperty.h index 7abdc0782..bfd311183 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ContainedByProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ContainedByProperty.h @@ -1 +1 @@ -#include "../../../src/shared/container/ContainedByProperty.h" +#include "../../src/shared/container/ContainedByProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Container.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Container.h index 27bf281fb..a747a4ff0 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Container.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Container.h @@ -1 +1 @@ -#include "../../../src/shared/container/Container.h" +#include "../../src/shared/container/Container.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Controller.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Controller.h index 9860f7bf3..77b6448d0 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Controller.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Controller.h @@ -1 +1 @@ -#include "../../../src/shared/controller/Controller.h" +#include "../../src/shared/controller/Controller.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationData.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationData.h index 886af91dd..e261a19dd 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationData.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationData.h @@ -1 +1 @@ -#include "../../../src/shared/customization/CustomizationData.h" +#include "../../src/shared/customization/CustomizationData.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationDataProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationDataProperty.h index 29ddcacab..877be9a38 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationDataProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationDataProperty.h @@ -1 +1 @@ -#include "../../../src/shared/property/CustomizationDataProperty.h" +#include "../../src/shared/property/CustomizationDataProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationIdManager.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationIdManager.h index f2300c12d..a99f6cd32 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationIdManager.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationIdManager.h @@ -1 +1 @@ -#include "../../../src/shared/customization/CustomizationIdManager.h" +#include "../../src/shared/customization/CustomizationIdManager.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationVariable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationVariable.h index 4ad999e90..7dc71e197 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/CustomizationVariable.h @@ -1 +1 @@ -#include "../../../src/shared/customization/CustomizationVariable.h" +#include "../../src/shared/customization/CustomizationVariable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugNotification.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugNotification.h index f6bf5d439..171fab65c 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugNotification.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugNotification.h @@ -1 +1 @@ -#include "../../../src/shared/object/DebugNotification.h" +#include "../../src/shared/object/DebugNotification.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugYawedFloorNotification.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugYawedFloorNotification.h index 0d0c189ea..215596887 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugYawedFloorNotification.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/DebugYawedFloorNotification.h @@ -1 +1 @@ -#include "../../../src/shared/object/DebugYawedFloorNotification.h" +#include "../../src/shared/object/DebugYawedFloorNotification.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Dynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Dynamics.h index 4ca76f7d2..c2b91f538 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Dynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Dynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/Dynamics.h" +#include "../../src/shared/dynamics/Dynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/FirstSharedObject.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/FirstSharedObject.h index 5dd76e61f..066b370d8 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/FirstSharedObject.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/FirstSharedObject.h @@ -1 +1 @@ -#include "../../../src/shared/core/FirstSharedObject.h" +#include "../../src/shared/core/FirstSharedObject.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Hardpoint.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Hardpoint.h index b4feafa99..ddd57db5c 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Hardpoint.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Hardpoint.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/Hardpoint.h" +#include "../../src/shared/appearance/Hardpoint.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/LayerProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/LayerProperty.h index 064234150..3c7459612 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/LayerProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/LayerProperty.h @@ -1 +1 @@ -#include "../../../src/shared/property/LayerProperty.h" +#include "../../src/shared/property/LayerProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/LotManager.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/LotManager.h index 48ab93bbe..8de62c0f2 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/LotManager.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/LotManager.h @@ -1 +1 @@ -#include "../../../src/shared/lot/LotManager.h" +#include "../../src/shared/lot/LotManager.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/LotType.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/LotType.h index 9bd5e5369..518103992 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/LotType.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/LotType.h @@ -1 +1 @@ -#include "../../../src/shared/lot/LotType.h" +#include "../../src/shared/lot/LotType.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/MemoryBlockManagedObject.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/MemoryBlockManagedObject.h index 27267044f..d0f2330ee 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/MemoryBlockManagedObject.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/MemoryBlockManagedObject.h @@ -1 +1 @@ -#include "../../../src/shared/object/MemoryBlockManagedObject.h" +#include "../../src/shared/object/MemoryBlockManagedObject.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/MovementTable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/MovementTable.h index 4661dc180..155e04215 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/MovementTable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/MovementTable.h @@ -1 +1 @@ -#include "../../../src/shared/movement/MovementTable.h" +#include "../../src/shared/movement/MovementTable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkController.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkController.h index f2a84df03..a58f27b61 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkController.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkController.h @@ -1 +1 @@ -#include "../../../src/shared/controller/NetworkController.h" +#include "../../src/shared/controller/NetworkController.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkIdManager.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkIdManager.h index 3d630e80c..5010b3b88 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkIdManager.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/NetworkIdManager.h @@ -1 +1 @@ -#include "../../../src/shared/object/NetworkIdManager.h" +#include "../../src/shared/object/NetworkIdManager.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearance.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearance.h index 74f54d600..e5fb74980 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearance.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearance.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/NoRenderAppearance.h" +#include "../../src/shared/appearance/NoRenderAppearance.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearanceTemplate.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearanceTemplate.h index c89bf2fe7..208e45633 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearanceTemplate.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/NoRenderAppearanceTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/NoRenderAppearanceTemplate.h" +#include "../../src/shared/appearance/NoRenderAppearanceTemplate.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Object.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Object.h index d4cb2de0f..94f4dc49f 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Object.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Object.h @@ -1 +1 @@ -#include "../../../src/shared/object/Object.h" +#include "../../src/shared/object/Object.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectList.h index 9acaf34cf..6f6594189 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectList.h @@ -1 +1 @@ -#include "../../../src/shared/object/ObjectList.h" +#include "../../src/shared/object/ObjectList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectNotification.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectNotification.h index ce2ccc67b..4a467d6b5 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectNotification.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectNotification.h @@ -1 +1 @@ -#include "../../../src/shared/object/ObjectNotification.h" +#include "../../src/shared/object/ObjectNotification.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.def b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.def index 92272771f..139a3c254 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.def +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.def @@ -1 +1 @@ -#include "../../../src/shared/controller/ObjectSetMessage.def" +#include "../../src/shared/controller/ObjectSetMessage.def" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.h index 09e64c64f..0c5274c10 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectSetMessage.h @@ -1 +1 @@ -#include "../../../src/shared/controller/ObjectSetMessage.h" +#include "../../src/shared/controller/ObjectSetMessage.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplate.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplate.h index bf8c13307..1d2b37866 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplate.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/object/ObjectTemplate.h" +#include "../../src/shared/object/ObjectTemplate.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateCustomizationDataWriter.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateCustomizationDataWriter.h index bf0f06c84..96d0b797a 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateCustomizationDataWriter.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateCustomizationDataWriter.h @@ -1 +1 @@ -#include "../../../src/shared/customization/ObjectTemplateCustomizationDataWriter.h" +#include "../../src/shared/customization/ObjectTemplateCustomizationDataWriter.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateList.h index b979548a0..c9d67c709 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectTemplateList.h @@ -1 +1 @@ -#include "../../../src/shared/object/ObjectTemplateList.h" +#include "../../src/shared/object/ObjectTemplateList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectWatcherList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectWatcherList.h index 233c9a80e..3e589c909 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectWatcherList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ObjectWatcherList.h @@ -1 +1 @@ -#include "../../../src/shared/ObjectWatcherList.h" +#include "../../src/shared/ObjectWatcherList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PaletteColorCustomizationVariable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PaletteColorCustomizationVariable.h index 8d32d46a2..30f8fa775 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PaletteColorCustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PaletteColorCustomizationVariable.h @@ -1 +1 @@ -#include "../../../src/shared/customization/PaletteColorCustomizationVariable.h" +#include "../../src/shared/customization/PaletteColorCustomizationVariable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Portal.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Portal.h index 484e399fa..656b5aa88 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Portal.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Portal.h @@ -1 +1 @@ -#include "../../../src/shared/portal/Portal.h" +#include "../../src/shared/portal/Portal.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalProperty.h index 771ee37cf..6f8586eb0 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalProperty.h @@ -1 +1 @@ -#include "../../../src/shared/portal/PortalProperty.h" +#include "../../src/shared/portal/PortalProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplate.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplate.h index 48226339d..c6d9f8d5b 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplate.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplate.h @@ -1 +1 @@ -#include "../../../src/shared/portal/PortalPropertyTemplate.h" +#include "../../src/shared/portal/PortalPropertyTemplate.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplateList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplateList.h index 6ff7ace17..89e6bc062 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplateList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortalPropertyTemplateList.h @@ -1 +1 @@ -#include "../../../src/shared/portal/PortalPropertyTemplateList.h" +#include "../../src/shared/portal/PortalPropertyTemplateList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortallizedSphereTree.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortallizedSphereTree.h index 0ca2e4980..f9e7ec7ec 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PortallizedSphereTree.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PortallizedSphereTree.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/portal/PortallizedSphereTree.h" +#include "../../src/shared/portal/PortallizedSphereTree.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Property.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Property.h index 62cb92349..92168d864 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Property.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Property.h @@ -1 +1 @@ -#include "../../../src/shared/property/Property.h" +#include "../../src/shared/property/Property.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PropertyId.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PropertyId.h index 826d9add4..cbd58dd58 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PropertyId.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PropertyId.h @@ -1 +1 @@ -#include "../../../src/shared/property/PropertyId.h" +#include "../../src/shared/property/PropertyId.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/PulseDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/PulseDynamics.h index 549bbdfbe..e74884353 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/PulseDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/PulseDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/PulseDynamics.h" +#include "../../src/shared/dynamics/PulseDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/RangedIntCustomizationVariable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/RangedIntCustomizationVariable.h index 8d8aa1aec..b41e112dd 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/RangedIntCustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/RangedIntCustomizationVariable.h @@ -1 +1 @@ -#include "../../../src/shared/customization/RangedIntCustomizationVariable.h" +#include "../../src/shared/customization/RangedIntCustomizationVariable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/RotationDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/RotationDynamics.h index 9c0c2c733..9e0f79311 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/RotationDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/RotationDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/RotationDynamics.h" +#include "../../src/shared/dynamics/RotationDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/ScheduleData.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/ScheduleData.h index 5cb8cebe9..b30c398d2 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/ScheduleData.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/ScheduleData.h @@ -1 +1 @@ -#include "../../../src/shared/object/ScheduleData.h" +#include "../../src/shared/object/ScheduleData.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SeesawDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SeesawDynamics.h index 2caaa0eaf..1634fe67a 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SeesawDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SeesawDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/SeesawDynamics.h" +#include "../../src/shared/dynamics/SeesawDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SetupSharedObject.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SetupSharedObject.h index da134bd2c..f9881f2e3 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SetupSharedObject.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SetupSharedObject.h @@ -1 +1 @@ -#include "../../../src/shared/core/SetupSharedObject.h" +#include "../../src/shared/core/SetupSharedObject.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SimpleDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SimpleDynamics.h index 0d508172c..8e3342f1d 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SimpleDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SimpleDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/SimpleDynamics.h" +#include "../../src/shared/dynamics/SimpleDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptor.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptor.h index 04d57eee4..f492b62e9 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptor.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptor.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlotDescriptor.h" +#include "../../src/shared/container/SlotDescriptor.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptorList.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptorList.h index 6838838fd..6d751ce0a 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptorList.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotDescriptorList.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlotDescriptorList.h" +#include "../../src/shared/container/SlotDescriptorList.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotId.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotId.h index 7b16f1f0c..53885eb85 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotId.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotId.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlotId.h" +#include "../../src/shared/container/SlotId.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdArchive.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdArchive.h index c3b9b5a3c..f44b89dbe 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdArchive.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdArchive.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlotIdArchive.h" +#include "../../src/shared/container/SlotIdArchive.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdManager.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdManager.h index 718134065..103c59d3d 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdManager.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotIdManager.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlotIdManager.h" +#include "../../src/shared/container/SlotIdManager.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotType.def b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotType.def index 9ca2b369f..8deb581de 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotType.def +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlotType.def @@ -1 +1 @@ -#include "../../../src/shared/container/SlotType.def" +#include "../../src/shared/container/SlotType.def" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainer.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainer.h index a1742741c..0dd18cb71 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainer.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainer.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlottedContainer.h" +#include "../../src/shared/container/SlottedContainer.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainmentProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainmentProperty.h index a01609150..ad58afd1b 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainmentProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SlottedContainmentProperty.h @@ -1 +1 @@ -#include "../../../src/shared/container/SlottedContainmentProperty.h" +#include "../../src/shared/container/SlottedContainmentProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SphereGrid.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SphereGrid.h index 9c0b164ca..9502e156d 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SphereGrid.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SphereGrid.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/portal/SphereGrid.h" +#include "../../src/shared/portal/SphereGrid.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/SpringDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/SpringDynamics.h index 7edf17d13..a47c9663e 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/SpringDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/SpringDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/SpringDynamics.h" +#include "../../src/shared/dynamics/SpringDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/StateDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/StateDynamics.h index 2887e8bb3..2a1a88c4d 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/StateDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/StateDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/StateDynamics.h" +#include "../../src/shared/dynamics/StateDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/StructureFootprint.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/StructureFootprint.h index 888651d24..84158cc80 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/StructureFootprint.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/StructureFootprint.h @@ -1 +1 @@ -#include "../../../src/shared/lot/StructureFootprint.h" +#include "../../src/shared/lot/StructureFootprint.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/TextAppearance.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/TextAppearance.h index 14251bf18..42148839e 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/TextAppearance.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/TextAppearance.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/TextAppearance.h" +#include "../../src/shared/appearance/TextAppearance.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/TrackingDynamics.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/TrackingDynamics.h index 67e302f77..3b51bbf5f 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/TrackingDynamics.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/TrackingDynamics.h @@ -1 +1 @@ -#include "../../../src/shared/dynamics/TrackingDynamics.h" +#include "../../src/shared/dynamics/TrackingDynamics.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/Tweakable.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/Tweakable.h index a4286f06e..daf338933 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/Tweakable.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/Tweakable.h @@ -1 +1 @@ -#include "../../../src/shared/appearance/Tweakable.h" +#include "../../src/shared/appearance/Tweakable.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainer.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainer.h index 59e967301..59d170693 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainer.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainer.h @@ -1 +1 @@ -#include "../../../src/shared/container/VolumeContainer.h" +#include "../../src/shared/container/VolumeContainer.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainmentProperty.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainmentProperty.h index 5c37ec86b..1e6b650da 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainmentProperty.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/VolumeContainmentProperty.h @@ -1 +1 @@ -#include "../../../src/shared/container/VolumeContainmentProperty.h" +#include "../../src/shared/container/VolumeContainmentProperty.h" diff --git a/src/engine/shared/library/sharedObject/include/public/sharedObject/World.h b/src/engine/shared/library/sharedObject/include/public/sharedObject/World.h index ea1a60dd4..e5964f79a 100644 --- a/src/engine/shared/library/sharedObject/include/public/sharedObject/World.h +++ b/src/engine/shared/library/sharedObject/include/public/sharedObject/World.h @@ -1 +1 @@ -#include "../../../src/shared/world/World.h" +#include "../../src/shared/world/World.h" diff --git a/src/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h b/src/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h index 5384cf34d..13b495302 100644 --- a/src/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h +++ b/src/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h @@ -12,10 +12,10 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedMath/include/public/sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedMath/include/public/sharedMath/Transform.h" +#include "sharedFoundation/LabelHash.h" +#include "sharedFoundation/Tag.h" +#include "sharedMath/Vector.h" +#include "sharedMath/Transform.h" class AppearanceTemplate; class AxialBox; diff --git a/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp b/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp index db566bf28..37ae3c49f 100644 --- a/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp @@ -513,7 +513,7 @@ AppearanceTemplate *AppearanceTemplateListNamespace::create(const char *const fi if (strstr(fileName, ".apt") != 0) { //-- is the filename in the redirector map? - RedirectorMap::iterator iter = ms_redirectorMap.find(&actualFileName); + RedirectorMap::iterator iter = ms_redirectorMap.find((const CrcString*)&actualFileName); if (iter == ms_redirectorMap.end()) { //-- extract the real name from the apt @@ -542,7 +542,7 @@ AppearanceTemplate *AppearanceTemplateListNamespace::create(const char *const fi //-- search for the appearance in the named list { - NamedTemplates::iterator iter = ms_namedTemplates.find(&actualFileName); + NamedTemplates::iterator iter = ms_namedTemplates.find((const CrcString*)&actualFileName); if (iter != ms_namedTemplates.end()) return iter->second; } @@ -552,7 +552,7 @@ AppearanceTemplate *AppearanceTemplateListNamespace::create(const char *const fi //-- search for the appearance in the named timed list if (ms_useTimedTemplates) { - NamedTimedTemplates::iterator iter = ms_namedTimedTemplates.find(&actualFileName); + NamedTimedTemplates::iterator iter = ms_namedTimedTemplates.find((const CrcString*)&actualFileName); if (iter != ms_namedTimedTemplates.end()) { appearanceTemplate = iter->second.second; @@ -630,7 +630,7 @@ void AppearanceTemplateListNamespace::addNamedAppearanceTemplate(AppearanceTempl NOT_NULL(appearanceTemplate); //-- add to named list - std::pair result = ms_namedTemplates.insert(std::make_pair(&appearanceTemplate->getCrcName(), appearanceTemplate)); + std::pair result = ms_namedTemplates.insert(std::make_pair((const CrcString*)&appearanceTemplate->getCrcName(), appearanceTemplate)); //-- make sure it's not already there DEBUG_FATAL(!result.second, ("tried to add existing named appearanceTemplate %s", appearanceTemplate->getName())); @@ -649,7 +649,7 @@ void AppearanceTemplateListNamespace::addNamedTimedAppearanceTemplate(Appearance NOT_NULL(appearanceTemplate); //-- add to named list - std::pair result = ms_namedTimedTemplates.insert(std::make_pair(&appearanceTemplate->getCrcName(), std::make_pair(ms_keepTime + Random::randomReal(ms_keepEpsilon), appearanceTemplate))); + std::pair result = ms_namedTimedTemplates.insert(std::make_pair((const CrcString*)&appearanceTemplate->getCrcName(), std::make_pair(ms_keepTime + Random::randomReal(ms_keepEpsilon), appearanceTemplate))); //-- make sure it's not already there DEBUG_FATAL(!result.second, ("tried to add existing named timed appearanceTemplate %s", appearanceTemplate->getName())); @@ -672,7 +672,7 @@ void AppearanceTemplateListNamespace::removeAppearanceTemplate(AppearanceTemplat if (crcString && *crcString) { //-- remove appearance template from the named list - NamedTemplates::iterator iter = ms_namedTemplates.find(&appearanceTemplate->getCrcName()); + NamedTemplates::iterator iter = ms_namedTemplates.find((const CrcString*)&appearanceTemplate->getCrcName()); if (iter != ms_namedTemplates.end()) ms_namedTemplates.erase(iter); else diff --git a/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.h b/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.h index cfa021a46..78d8df407 100644 --- a/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.h +++ b/src/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class Appearance; class AppearanceTemplate; diff --git a/src/engine/shared/library/sharedObject/src/shared/appearance/Hardpoint.h b/src/engine/shared/library/sharedObject/src/shared/appearance/Hardpoint.h index 97c590de8..8ad1e08fe 100644 --- a/src/engine/shared/library/sharedObject/src/shared/appearance/Hardpoint.h +++ b/src/engine/shared/library/sharedObject/src/shared/appearance/Hardpoint.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" #include "sharedMath/Transform.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.h b/src/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.h index 58221d387..2f44b2b57 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.h +++ b/src/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/CachedNetworkId.h" #include "sharedObject/Property.h" diff --git a/src/engine/shared/library/sharedObject/src/shared/container/Container.cpp b/src/engine/shared/library/sharedObject/src/shared/container/Container.cpp index a67366ab4..b85e8f1fb 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/Container.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/container/Container.cpp @@ -15,6 +15,9 @@ #include "sharedObject/ContainedByProperty.h" #include "sharedObject/Object.h" +#include +#include + // ====================================================================== //Lint suppressions. @@ -65,8 +68,8 @@ using namespace ContainerNamespace; //----------------------------------------------------------------------- ContainerIterator::ContainerIterator() : -m_iterator(0), -m_owner(0) +m_iterator(), +m_owner() { } //----------------------------------------------------------------------- @@ -154,8 +157,8 @@ ContainerIterator& ContainerIterator::operator++() //----------------------------------------------------------------------- ContainerConstIterator::ContainerConstIterator() : -m_iterator(0), -m_owner(0) +m_iterator(), +m_owner() { } //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp b/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp index d81acb41b..b97b1a246 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp @@ -16,6 +16,7 @@ #include "sharedObject/SlottedContainmentProperty.h" #include "sharedObject/Object.h" +#include #include // ---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainmentProperty.h b/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainmentProperty.h index ad2d2b599..fb1c9347e 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainmentProperty.h +++ b/src/engine/shared/library/sharedObject/src/shared/container/SlottedContainmentProperty.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Property.h" #include diff --git a/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp b/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp index 3c6d243b3..024331634 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp @@ -17,6 +17,9 @@ #include "sharedFoundation/CrcLowerString.h" +#include +#include + //----------------------------------------------------------------------- namespace VolumeContainerNamespace diff --git a/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainmentProperty.h b/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainmentProperty.h index c65474137..c26fc14d8 100644 --- a/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainmentProperty.h +++ b/src/engine/shared/library/sharedObject/src/shared/container/VolumeContainmentProperty.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Property.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/controller/Controller.h b/src/engine/shared/library/sharedObject/src/shared/controller/Controller.h index 77801d320..02150ea95 100644 --- a/src/engine/shared/library/sharedObject/src/shared/controller/Controller.h +++ b/src/engine/shared/library/sharedObject/src/shared/controller/Controller.h @@ -14,7 +14,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include class CreatureController; diff --git a/src/engine/shared/library/sharedObject/src/shared/core/FirstSharedObject.h b/src/engine/shared/library/sharedObject/src/shared/core/FirstSharedObject.h index cc27f58a2..2ef4c7351 100644 --- a/src/engine/shared/library/sharedObject/src/shared/core/FirstSharedObject.h +++ b/src/engine/shared/library/sharedObject/src/shared/core/FirstSharedObject.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/BasicRangedIntCustomizationVariable.h b/src/engine/shared/library/sharedObject/src/shared/customization/BasicRangedIntCustomizationVariable.h index 8509fe6a2..df66c3e07 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/BasicRangedIntCustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/BasicRangedIntCustomizationVariable.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/RangedIntCustomizationVariable.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp index d249819b7..e27808f2e 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp @@ -22,6 +22,7 @@ #include "sharedObject/Object.h" #include "UnicodeUtils.h" +#include #include #include #include diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.h b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.h index 7737618e1..5188d7061 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" class CrcLowerString; class CustomizationVariable; diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.h b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.h index d4d2ae591..a8fba11fd 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.h @@ -13,7 +13,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/CustomizationData_Directory.h" #include diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_RemoteDirectory.h b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_RemoteDirectory.h index 17662dc73..e1d89ce74 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_RemoteDirectory.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_RemoteDirectory.h @@ -13,7 +13,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/CustomizationData_Directory.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp index e281f5e34..32208e247 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp @@ -204,7 +204,7 @@ bool CustomizationIdManager::mapStringToId(char const *variableName, int &id) //-- Lookup variable name in map. TemporaryCrcString const crcVariableName(variableName, true); - StringIntMap::iterator const findIt = s_variableNameToId.find(&crcVariableName); + StringIntMap::iterator const findIt = s_variableNameToId.find((const CrcString*)&crcVariableName); if (findIt == s_variableNameToId.end()) { diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationVariable.h b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationVariable.h index 15d72b189..ea6b84cbc 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/CustomizationVariable.h @@ -11,6 +11,7 @@ // ====================================================================== +class CustomizationData; class CustomizationVariable; class ObjectTemplateCustomizationDataWriter; diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/PaletteColorCustomizationVariable.h b/src/engine/shared/library/sharedObject/src/shared/customization/PaletteColorCustomizationVariable.h index d5b804fff..1008620a5 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/PaletteColorCustomizationVariable.h +++ b/src/engine/shared/library/sharedObject/src/shared/customization/PaletteColorCustomizationVariable.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/RangedIntCustomizationVariable.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp b/src/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp index 30a87733a..a9ef42556 100644 --- a/src/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp @@ -10,10 +10,11 @@ #include "sharedObject/RangedIntCustomizationVariable.h" #include "sharedObject/CustomizationData.h" -#include +#include #include #include #include +#include // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/dynamics/StateDynamics.h b/src/engine/shared/library/sharedObject/src/shared/dynamics/StateDynamics.h index 0ed8dc9d4..438ad6068 100644 --- a/src/engine/shared/library/sharedObject/src/shared/dynamics/StateDynamics.h +++ b/src/engine/shared/library/sharedObject/src/shared/dynamics/StateDynamics.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "sharedObject/Dynamics.h" //=================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/dynamics/TrackingDynamics.h b/src/engine/shared/library/sharedObject/src/shared/dynamics/TrackingDynamics.h index 9e18ac4d3..70fa5841a 100644 --- a/src/engine/shared/library/sharedObject/src/shared/dynamics/TrackingDynamics.h +++ b/src/engine/shared/library/sharedObject/src/shared/dynamics/TrackingDynamics.h @@ -12,8 +12,8 @@ // ====================================================================== #include "sharedObject/SimpleDynamics.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 "sharedMath/Vector.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.h b/src/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.h index d1a9be5e4..1c6040d1c 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.h @@ -11,8 +11,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Watcher.h" #include "sharedObject/Object.h" diff --git a/src/engine/shared/library/sharedObject/src/shared/object/MemoryBlockManagedObject.h b/src/engine/shared/library/sharedObject/src/shared/object/MemoryBlockManagedObject.h index 984b52f14..31ba7fbee 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/MemoryBlockManagedObject.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/MemoryBlockManagedObject.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedObject/Object.h" class MemoryBlockManager; diff --git a/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp b/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp index c12cf5012..b2278580d 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp @@ -10,7 +10,7 @@ #include "sharedFoundation/NetworkId.h" #include "sharedObject/Object.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.h b/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.h index 79fa3fa53..13632725c 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.h @@ -5,7 +5,7 @@ #ifndef _INCLUDED_NetworkIdManager_H #define _INCLUDED_NetworkIdManager_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Object; @@ -16,7 +16,7 @@ class NetworkIdManager public: ~NetworkIdManager(); - typedef stdhash_map::fwd NetworkIdObjectHashMap; + typedef stdunordered_map::fwd NetworkIdObjectHashMap; static void addObject (Object & newObject); static Object * getObjectById (const NetworkId & source); diff --git a/src/engine/shared/library/sharedObject/src/shared/object/Object.cpp b/src/engine/shared/library/sharedObject/src/shared/object/Object.cpp index 589f22918..88a483092 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/Object.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/object/Object.cpp @@ -559,7 +559,7 @@ void ObjectNamespace::deleteLocalTransform(Transform *transform) void ObjectNamespace::validatePosition(Object const & object, Vector const & position) { - if (abs(position.x) > 16000.0f || abs(position.y) > 16000.0f || abs(position.z) > 16000.0f) + if (std::abs(position.x) > 16000.0f || std::abs(position.y) > 16000.0f || std::abs(position.z) > 16000.0f) { Object const * parent = object.getAttachedTo(); diff --git a/src/engine/shared/library/sharedObject/src/shared/object/Object.h b/src/engine/shared/library/sharedObject/src/shared/object/Object.h index 8145e209a..7ac8cfe17 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/Object.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/Object.h @@ -42,11 +42,11 @@ namespace DPVS class Object; }; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Tag.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Transform.h" #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.h b/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.h index 296476455..56e3a0bf0 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.h @@ -13,8 +13,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/DataResource.h" +#include "sharedFoundation/Tag.h" class Iff; class Object; diff --git a/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.h b/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.h index 5a9f583fd..b8ce421ab 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" class ConstCharCrcString; class CrcString; diff --git a/src/engine/shared/library/sharedObject/src/shared/object/ScheduleData.h b/src/engine/shared/library/sharedObject/src/shared/object/ScheduleData.h index d91911cab..4942302a1 100644 --- a/src/engine/shared/library/sharedObject/src/shared/object/ScheduleData.h +++ b/src/engine/shared/library/sharedObject/src/shared/object/ScheduleData.h @@ -12,7 +12,7 @@ // ====================================================================== #include "sharedObject/AlterScheduler.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp b/src/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp index 6605cebf7..b36d5547b 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp @@ -24,7 +24,9 @@ #include "sharedObject/PortalPropertyTemplate.h" #include "sharedObject/PortalPropertyTemplateList.h" +#include #include +#include // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp index 5fda59b0f..09d2e9e17 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp +++ b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp @@ -166,7 +166,7 @@ void PortalPropertyTemplateNamespace::validateCoplanar(IndexedTriangleList const for (uint i = 3; i < numberOfVertices; ++i) { float const distance = p.computeDistanceTo(vertexList[i]); - WARNING(abs(distance) > 0.001f, ("[%s]: portal is not planar, vertex %d is %8.6f from the plane", fileName, static_cast(i), distance)); + WARNING(std::abs(distance) > 0.001f, ("[%s]: portal is not planar, vertex %d is %8.6f from the plane", fileName, static_cast(i), distance)); } } #endif diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.h b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.h index a5aadc11d..68a5ab578 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.h +++ b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.h @@ -19,12 +19,14 @@ class BaseClass; class BaseExtent; class Extent; class IndexedTriangleList; +class Portal; +class Iff; #include "sharedMath/Plane.h" #include "sharedMath/VectorArgb.h" #include "sharedMath/Transform.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/PersistentCrcString.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplateList.h b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplateList.h index de679a7cf..52a438814 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplateList.h +++ b/src/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplateList.h @@ -12,6 +12,7 @@ // ====================================================================== class CrcString; +class PortalPropertyTemplate; // ====================================================================== diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/PortallizedSphereTree.h b/src/engine/shared/library/sharedObject/src/shared/portal/PortallizedSphereTree.h index 4e2296f30..7d91f252c 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/PortallizedSphereTree.h +++ b/src/engine/shared/library/sharedObject/src/shared/portal/PortallizedSphereTree.h @@ -41,7 +41,7 @@ // // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Capsule.h" #include "sharedMath/SphereTree.h" @@ -208,7 +208,7 @@ void PortallizedSphereTree::onObjectAddedInternal(ObjectTy else { // object not in the world cell - PobContentsInfoMap::iterator i = m_pobContentsInfoMap.lower_bound(pob); + typename PobContentsInfoMap::iterator i = m_pobContentsInfoMap.lower_bound(pob); if (i == m_pobContentsInfoMap.end() || (*i).first != pob) { // This pob did not have a PobContentsInfo in the map, so create one, @@ -403,7 +403,7 @@ void PortallizedSphereTree::findInRange(Object const *pob, m_worldCellContentsTree.findInRange(center_p, radius, results); else { - PobContentsInfoMap::const_iterator i = m_pobContentsInfoMap.find(pob); + typename PobContentsInfoMap::const_iterator i = m_pobContentsInfoMap.find(pob); if (i != m_pobContentsInfoMap.end()) (*i).second->contents.findInRange(center_p, radius, results); } @@ -418,7 +418,7 @@ void PortallizedSphereTree::findInRange(Object const *pob, m_worldCellContentsTree.findInRange(center_p, radius, filter, results); else { - PobContentsInfoMap::const_iterator i = m_pobContentsInfoMap.find(pob); + typename PobContentsInfoMap::const_iterator i = m_pobContentsInfoMap.find(pob); if (i != m_pobContentsInfoMap.end()) (*i).second->contents.findInRange(center_p, radius, filter, results); } diff --git a/src/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h b/src/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h index 18e4878bb..00a1ea374 100644 --- a/src/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h +++ b/src/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h @@ -1,6 +1,6 @@ // SphereGrid.h // Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. -// Author: Neal Kettler +// Author: Neal Kettler #ifndef _INCLUDED_SphereGrid_H #define _INCLUDED_SphereGrid_H @@ -45,9 +45,9 @@ public: void onObjectMoved( ObjectType object ); // search functions which check multiple pobs - void findInRange( Vector const ¢er_w, float radius, std::set &results); + void findInRange( Vector const ¢er_w, float radius, std::set &results); void findInRange(Vector const ¢er_w, float radius, SpatialSubdivisionFilter const &filter, std::set &results); - void findInRange( Capsule const &queryCapsule_w, std::set &results); + void findInRange( Capsule const &queryCapsule_w, std::set &results); void findInRange(Capsule const &queryCapsule_w, SpatialSubdivisionFilter const &filter, std::set &results); // search functions which check a single pob @@ -83,7 +83,7 @@ private: const float m_fGridSize; const float m_fGridMaxDimension; - const int m_iGridSquareWidth; + const int m_iGridSquareWidth; }; @@ -135,7 +135,7 @@ inline void SphereGrid< ObjectType, Accessor>::onObjectRemoved(ObjectType objec for( square_iter = squares.begin(); square_iter != squares.end(); ++square_iter ) { std::set< ObjectType >& object_set = ( m_contents[ *square_iter ] ) ; - std::set< ObjectType >::iterator iter = object_set.find( object ); + typename std::set< ObjectType >::iterator iter = object_set.find( object ); if ( iter != object_set.end() ) { object_set.erase( iter ); @@ -164,7 +164,7 @@ inline void SphereGrid< ObjectType, Accessor>::onObjectMoved( ObjectType object Sphere end_sphere = Accessor::getExtent(object); Sphere start_sphere( end_sphere ); - Vector& start=m_locations[object]; + Vector& start=m_locations[object]; start_sphere.setCenter( start ); @@ -183,7 +183,7 @@ inline void SphereGrid< ObjectType, Accessor>::onObjectMoved( ObjectType object for ( square_iter = start_squares.begin(); square_iter != start_squares.end(); ++square_iter ) { std::set< ObjectType >& set = ( m_contents[ *square_iter ] ); - std::set< ObjectType >::iterator iter = set.find( object ); + typename std::set< ObjectType >::iterator iter = set.find( object ); if ( iter == set.end() ) { DEBUG_FATAL(true, ("SphereGrid::onObjectMoved, couldn't find object to move! %p",object)); @@ -204,8 +204,8 @@ inline void SphereGrid< ObjectType, Accessor>::onObjectMoved( ObjectType object // -// Get a list of all the squares needed to contain this capsule -// +// Get a list of all the squares needed to contain this capsule +// template inline void SphereGrid::getContainingSquares(const Capsule & range, std::vector & results) const { @@ -245,8 +245,8 @@ inline void SphereGrid::getContainingSquares(const Capsule // -// Get a list of all the squares needed to contain this sphere -// +// Get a list of all the squares needed to contain this sphere +// template inline void SphereGrid::getContainingSquares(const Sphere & bounds, std::vector & results) const { @@ -287,7 +287,7 @@ inline void SphereGrid::getContainingSquares(const Sphere // Common private method called by all findInRange() public methods using a sphere // template -inline void SphereGrid::findInRangeSphere( Object const *pob, Vector const ¢er_w, float radius, +inline void SphereGrid::findInRangeSphere( Object const *pob, Vector const ¢er_w, float radius, SpatialSubdivisionFilter const *filter, std::set &results) { Sphere range(center_w, radius); @@ -296,7 +296,7 @@ inline void SphereGrid::findInRangeSphere( Object co std::vector< int >::iterator citer; for ( citer = squares.begin(); citer != squares.end(); ++citer ) { - std::set< ObjectType >::const_iterator oiter; + typename std::set< ObjectType >::const_iterator oiter; int square_id = *citer; std::set< ObjectType >& objects = m_contents[ square_id ]; // objects in this square @@ -328,10 +328,10 @@ inline void SphereGrid::findInRangeSphere( Object co // -// Common private method called by all findInRange() public methods using a capsule +// Common private method called by all findInRange() public methods using a capsule // template -inline void SphereGrid::findInRangeCapsule( Object const *pob, Capsule const &range, +inline void SphereGrid::findInRangeCapsule( Object const *pob, Capsule const &range, SpatialSubdivisionFilter const *filter, std::set &results) { std::vector< int > squares; @@ -339,7 +339,7 @@ inline void SphereGrid::findInRangeCapsule( Object c std::vector< int >::iterator citer; for ( citer = squares.begin(); citer != squares.end(); ++citer ) { - std::set< ObjectType >::const_iterator oiter; + typename std::set< ObjectType >::const_iterator oiter; int square_id = *citer; std::set< ObjectType >& objects = m_contents[ square_id ]; // objects in this square @@ -371,7 +371,7 @@ inline void SphereGrid::findInRangeCapsule( Object c template -inline void SphereGrid::findInRange( const Capsule & range, std::set & results) +inline void SphereGrid::findInRange( const Capsule & range, std::set & results) { findInRangeCapsule( INVALID_POB, range, NULL, results ); } @@ -434,7 +434,7 @@ public: // search functions which check multiple pobs void findInRange( Vector const ¢er_w, float radius, std::set &results); // const; void findInRange(Vector const ¢er_w, float radius, SpatialSubdivisionFilter const &filter, std::set &results); - void findInRange( Capsule const &queryCapsule_w, std::set &results); + void findInRange( Capsule const &queryCapsule_w, std::set &results); void findInRange(Capsule const &queryCapsule_w, SpatialSubdivisionFilter const &filter, std::set &results); // search functions which check a single pob @@ -503,18 +503,18 @@ inline void DoubleSphereGrid::onObjectMoved( ObjectType ob template -inline void DoubleSphereGrid::findInRange( const Capsule & range, std::set & results) +inline void DoubleSphereGrid::findInRange( const Capsule & range, std::set & results) { - m_largeGrid.findInRange( range, results ); - m_smallGrid.findInRange( range, results ); + m_largeGrid.findInRange( range, results ); + m_smallGrid.findInRange( range, results ); } template -inline void DoubleSphereGrid::findInRange(Vector const ¢er_w, float radius, std::set & results) +inline void DoubleSphereGrid::findInRange(Vector const ¢er_w, float radius, std::set & results) { - m_largeGrid.findInRange( center_w, radius, results); - m_smallGrid.findInRange( center_w, radius, results); + m_largeGrid.findInRange( center_w, radius, results); + m_smallGrid.findInRange( center_w, radius, results); } diff --git a/src/engine/shared/library/sharedObject/src/shared/property/PropertyId.h b/src/engine/shared/library/sharedObject/src/shared/property/PropertyId.h index a12dd61f5..1cb2f4e0d 100644 --- a/src/engine/shared/library/sharedObject/src/shared/property/PropertyId.h +++ b/src/engine/shared/library/sharedObject/src/shared/property/PropertyId.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/LabelHash.h" +#include "sharedFoundation/LabelHash.h" typedef LabelHash::Id PropertyId; // ====================================================================== diff --git a/src/engine/shared/library/sharedPathfinding/src/shared/FirstSharedPathfinding.h b/src/engine/shared/library/sharedPathfinding/src/shared/FirstSharedPathfinding.h index d7536ba9d..a98bcae5b 100644 --- a/src/engine/shared/library/sharedPathfinding/src/shared/FirstSharedPathfinding.h +++ b/src/engine/shared/library/sharedPathfinding/src/shared/FirstSharedPathfinding.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedRandom/src/shared/FirstSharedRandom.h b/src/engine/shared/library/sharedRandom/src/shared/FirstSharedRandom.h index 6d73ad09d..4f4b77302 100644 --- a/src/engine/shared/library/sharedRandom/src/shared/FirstSharedRandom.h +++ b/src/engine/shared/library/sharedRandom/src/shared/FirstSharedRandom.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedRegex/src/shared/FirstSharedRegex.h b/src/engine/shared/library/sharedRegex/src/shared/FirstSharedRegex.h index 23df16f5d..d46a7d5c8 100644 --- a/src/engine/shared/library/sharedRegex/src/shared/FirstSharedRegex.h +++ b/src/engine/shared/library/sharedRegex/src/shared/FirstSharedRegex.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedRegex/src/shared/SetupSharedRegex.cpp b/src/engine/shared/library/sharedRegex/src/shared/SetupSharedRegex.cpp index 7c9a69fd4..83bc60ee9 100644 --- a/src/engine/shared/library/sharedRegex/src/shared/SetupSharedRegex.cpp +++ b/src/engine/shared/library/sharedRegex/src/shared/SetupSharedRegex.cpp @@ -13,7 +13,7 @@ #include "sharedFoundation/ExitChain.h" #include "sharedRegex/ConfigSharedRegex.h" #include "sharedRegex/RegexServices.h" -#include "pcre/pcre.h" +#include "../../../../../../../external/3rd/library/pcre/4.1/win32/include/pcre/pcre.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedRemoteDebugServer/src/shared/FirstSharedRemoteDebugServer.h b/src/engine/shared/library/sharedRemoteDebugServer/src/shared/FirstSharedRemoteDebugServer.h index 9b36e9def..e5f1804bf 100644 --- a/src/engine/shared/library/sharedRemoteDebugServer/src/shared/FirstSharedRemoteDebugServer.h +++ b/src/engine/shared/library/sharedRemoteDebugServer/src/shared/FirstSharedRemoteDebugServer.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedSkillSystem/src/shared/FirstSharedSkillSystem.h b/src/engine/shared/library/sharedSkillSystem/src/shared/FirstSharedSkillSystem.h index a040988e5..ed1e8b80a 100644 --- a/src/engine/shared/library/sharedSkillSystem/src/shared/FirstSharedSkillSystem.h +++ b/src/engine/shared/library/sharedSkillSystem/src/shared/FirstSharedSkillSystem.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedSkillSystem/SkillManager.h" #include "sharedSkillSystem/SkillObject.h" diff --git a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp index 81eaf0c32..c92f73c42 100644 --- a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp +++ b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp @@ -15,7 +15,7 @@ #include "sharedDebug/InstallTimer.h" #include -#include +#include #include SkillManager *SkillManager::ms_instance = NULL; diff --git a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h index 3a38ec42f..61f552741 100644 --- a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h +++ b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h @@ -5,6 +5,8 @@ #ifndef _SkillManager_H #define _SkillManager_H +#include + //--------------------------------------------------------------------- #pragma warning (disable : 4786 ) @@ -16,8 +18,8 @@ class DataTable; class SkillManager { public: - typedef stdhash_map::fwd SkillMap; - typedef stdhash_map::fwd XpLimitMap; + typedef stdunordered_map::fwd SkillMap; + typedef stdunordered_map::fwd XpLimitMap; virtual ~SkillManager (); @@ -52,7 +54,7 @@ private: inline const SkillManager::SkillMap & SkillManager::getSkillMap() const { - return *NON_NULL(m_skillMap); + return *(m_skillMap); } //--------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp index 016703cd4..e4639f46c 100644 --- a/src/engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp +++ b/src/engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp @@ -34,6 +34,7 @@ namespace { int s_recursionCountDepends = 0; const int s_recursionCountDependsMax = 7; + const std::string m_Deprecated = "DEPRECATED_SKILLS"; //---------------------------------------------------------------------- @@ -438,7 +439,8 @@ void SkillObject::connectLinks(DataTable &dataTable, const std::string & parentN } else { - WARNING (true, ("Could not find skill %s in DataTable", nextSkillName.c_str())); + if (m_Deprecated.compare(nextSkillName.c_str()) != 0) + WARNING (true, ("Could not find skill %s in DataTable", nextSkillName.c_str())); } } } @@ -468,7 +470,8 @@ bool SkillObject::load(DataTable & dataTable, const std::string & skillName) if (skillRow == -1) { skillData = SkillData(); - WARNING (true, ("SkillObject::load Could not find skill %s in DataTable", skillName.c_str())); + if (m_Deprecated.compare(skillName.c_str()) != 0) + WARNING (true, ("SkillObject::load Could not find skill %s in DataTable", skillName.c_str())); return false; } diff --git a/src/engine/shared/library/sharedStatusWindow/src/shared/FirstSharedStatusWindow.h b/src/engine/shared/library/sharedStatusWindow/src/shared/FirstSharedStatusWindow.h index 03358c45d..1db9024ea 100644 --- a/src/engine/shared/library/sharedStatusWindow/src/shared/FirstSharedStatusWindow.h +++ b/src/engine/shared/library/sharedStatusWindow/src/shared/FirstSharedStatusWindow.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedSwitcher/src/shared/FirstSharedSwitcher.h b/src/engine/shared/library/sharedSwitcher/src/shared/FirstSharedSwitcher.h index 47d442dec..65ee309b6 100644 --- a/src/engine/shared/library/sharedSwitcher/src/shared/FirstSharedSwitcher.h +++ b/src/engine/shared/library/sharedSwitcher/src/shared/FirstSharedSwitcher.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedSynchronization/src/shared/FirstSharedSynchronization.h b/src/engine/shared/library/sharedSynchronization/src/shared/FirstSharedSynchronization.h index fa4f61aae..52b639090 100644 --- a/src/engine/shared/library/sharedSynchronization/src/shared/FirstSharedSynchronization.h +++ b/src/engine/shared/library/sharedSynchronization/src/shared/FirstSharedSynchronization.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedTemplate/src/shared/core/FirstSharedTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/core/FirstSharedTemplate.h index 37a682e00..18c25883a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/core/FirstSharedTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/core/FirstSharedTemplate.h @@ -1,6 +1,6 @@ #include "sharedFoundationTypes/FoundationTypes.h" #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include #include #include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp index 56b7d9590..d6f5b8548 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include /** diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h index e3f7618f8..cbab71e97 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerArmorTemplate_H #include "sharedTemplateDefinition/TpfTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp index 835f8ad4b..4394895dc 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h index 807da0012..acdcf4f02 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerBattlefieldMarkerObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp index 0e77b72eb..ba0b7c077 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h index 1356bfe29..d98e875b8 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerBuildingObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp index 9d5812866..95175f0f8 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h index 2207dacfc..5c2e89a2e 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerCellObjectTemplate_H #include "ServerObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp index 3628bbac8..b3f18a79a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h index f1bf02af9..804319006 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerCityObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp index 6a0629a86..9a0f88482 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h index ca6494b26..6b027a277 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerConstructionContractObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp index 87814cc06..7159e108c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h index d3cdd657d..d8801d5d8 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerCreatureObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp index a2e783f78..0bc765a55 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h index 206d64139..fa7b0fef3 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerDraftSchematicObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp index da8c9920e..cd7ab9277 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h index 3c900a217..1dd852a4d 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerFactoryObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp index 5c606de38..647b66065 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h index fd8897dc5..6c30d79e2 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerGroupObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp index 7fff41400..446f3c340 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h index 8454d0a28..a49d7f174 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerGuildObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp index 941d6cb82..7bfaaf19c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h index 98f15ac99..d8ce5df63 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerHarvesterInstallationObjectTemplate_H #include "ServerInstallationObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp index 41e392a3b..efc11fee8 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h index 5a6fedde6..579869171 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerInstallationObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp index 1bea711a6..efdbfac9a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h index 6eeabbbbf..2bcddd26d 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerIntangibleObjectTemplate_H #include "ServerObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp index 1ae59020d..34919f615 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h index 48a71d6f1..cd02d8a15 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerJediManagerObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp index 37225a34b..82335f44b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h index 132a2e4a4..190a65b9a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerManufactureInstallationObjectTemplate_H #include "ServerInstallationObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp index 2a303fcf4..54bbda835 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h index 32538c5d6..ea0a7a724 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerManufactureSchematicObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp index 23b22788f..39ab71f1f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h index c03795053..9668ac1fb 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerMissionObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp index 420ecf955..0307ce8c0 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h index e48166740..764f78c74 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerObjectTemplate_H #include "sharedTemplateDefinition/TpfTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp index ed647704f..91f523452 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h index 006a019a7..76e98a09b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerPlanetObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp index 68ca27f94..2824f83aa 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h index c8c5d6372..eb1e54f0b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerPlayerObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp index 4946db210..0c05dd791 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h index 399f31321..4429e77e0 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerPlayerQuestObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp index dfa0c7fd9..2df53960e 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h index 0a1b3dd19..07dd972b4 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerResourceClassObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp index 72c08faf3..c5e367cce 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h index 8ccf2a821..473d8e0b4 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerResourceContainerObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp index 87e8bab4f..6aa324d6f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h index cbc243190..dcf02b4bb 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerResourcePoolObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp index eb9604fdc..dd44c902c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h index d757ca508..2f353d95f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerResourceTypeObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp index fb50e3324..247bda11a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h index fe10427fc..66d0a46f7 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerShipObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp index 220a3dd7c..fb078b58f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h index aef88fffc..24ead518e 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerStaticObjectTemplate_H #include "ServerObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp index 1e57fea7b..5604b102c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h index a78707d3f..04aeb3c03 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerTangibleObjectTemplate_H #include "ServerObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp index 5335abd95..b63a3f63a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h index 3250f3400..bb44afdfc 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerTokenObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp index 12a2714a1..20c3f1f86 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h index 3b95af888..cf60bb99a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerUberObjectTemplate_H #include "sharedTemplateDefinition/TpfTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp index 094862946..359ddce6c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h index 4a078f8c7..829a1be9c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerUniverseObjectTemplate_H #include "ServerObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp index 2ebceacd4..663fdb2ad 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h index aba3305e6..1c2b1f441 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerVehicleObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp index 27bb6577f..0cd323eab 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h index d6a5c2d28..3a600dfdf 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerWaypointObjectTemplate_H #include "ServerIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp index 2294bb1c4..54aa2726e 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h index 0bc2510e7..d8d05d378 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerWeaponObjectTemplate_H #include "ServerTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp index 9600ecab9..b5969702a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h index e0551fcd3..7096bbc63 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerXpManagerObjectTemplate_H #include "ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp index b1a5b978e..21c891e3f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h index f229dc120..4c44f9526 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedBattlefieldMarkerObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp index fa249b264..3af16bfb2 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h index 7d00d1642..e7e7ff4fa 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedBuildingObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp index 8e8ce0ab4..7e96a9505 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h index 27893f2f7..eed44fb45 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedCellObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp index 96fd66fdf..7426b7c1b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h index 305a4e4f6..911ac1e90 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedConstructionContractObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp index 8287999ef..913472e01 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h index 02138d7f0..21d3cbfc1 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedCreatureObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp index 49c95adbf..3f651ac89 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h index dd8eb1fd8..ecf99a85c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedDraftSchematicObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp index 42f71a69c..e917394d2 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h index 6e257f1dc..7c561f916 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedFactoryObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp index 5ae906177..a5bb8830b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h index 6e4b9f6d2..8e3549d98 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedGroupObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp index 3c0f2ecbb..26ba6d9aa 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h index 05e5ec2ae..668ba3c09 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedGuildObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp index ac5af8bb1..70ae2f01b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h index 5e9a993fd..be3c1b5e0 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedInstallationObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp index 3be2ef524..67245c198 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h index 64495f4ad..86542ae21 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedIntangibleObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp index 0b8eb5481..0cce8f752 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h index 90495ba04..97ef82dae 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedJediManagerObjectTemplate_H #include "SharedUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp index ca6c31331..3b860316a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h index 4d5edbc4b..02881875f 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedManufactureSchematicObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp index dc0dcae63..f52ed7289 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h index b6291a147..41cb1fdbf 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedMissionObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp index c21c34a51..ea1fa1495 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h index a15ab32af..752dfa7f0 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedObjectTemplate_H #include "sharedTemplateDefinition/TpfTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp index d5dd759d4..b926fbb45 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h index 35b99954e..7be8313b0 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedPlayerObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp index 22cd668af..b9ed644ef 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h index 712eee944..aeebfd332 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedPlayerQuestObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp index 2e992371a..e77a29d69 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h index 7029e6b55..5bc20b095 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedResourceContainerObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp index cfdc0394d..25f8f3757 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h index 228f41f95..11f8fdb4b 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedShipObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp index 72c0404e5..630e82397 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h index 712c1a0d8..4b2f0b39c 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedStaticObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp index c4355c5e1..3157fb248 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h index de030ad9c..0155701ec 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedTangibleObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp index ecc1d96a5..2eb61bd92 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h index c36281d52..85ba6537e 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedTerrainSurfaceObjectTemplate_H #include "sharedTemplateDefinition/TpfTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp index 71a2784f4..cf352144a 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h index 5be541ec5..c13a37377 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedTokenObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp index 253ba1305..62685a525 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h index 1ff3469b8..75796f944 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedUniverseObjectTemplate_H #include "SharedObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp index da3d67264..ffa28bfbf 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h index 226cdc555..e5d23208d 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedVehicleObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp index f29102f79..b845d5767 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h index e46ca577d..6e0190556 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedWaypointObjectTemplate_H #include "SharedIntangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp index 0c436eaeb..b6bf3e51d 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h index 498d2e0ad..ff7cf8179 100644 --- a/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_SharedWeaponObjectTemplate_H #include "SharedTangibleObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedTemplateDefinition/TpfTemplate.h" diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp index a74f665b9..d3b0322d6 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp @@ -184,5 +184,9 @@ int File::print(const char *format, ...) va_list argptr; va_start(argptr, format); - return vfprintf(m_fp, format, argptr); + int ret = vfprintf(m_fp, format, argptr); + + va_end(argptr); + + return ret; } // File::print diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp index bd83f4895..365fe32d1 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp @@ -17,6 +17,8 @@ #include #endif +#include + const char WIN32_PATH_SEPARATOR = '\\'; const char LINUX_PATH_SEPARATOR = '/'; @@ -324,18 +326,18 @@ void Filename::verifyAndCreatePath(void) const splitPath(destPath, splitDestPath, static_cast(WIN32_PATH_SEPARATOR)); - Unicode::String prefix = L"\\\\?\\"; + Unicode::String prefix = L"\\\\?\\"; destPath = prefix + splitDestPath[0]; for (size_t i = 1; i < splitDestPath.size(); ++i) { destPath += WIN32_PATH_SEPARATOR; destPath += splitDestPath[i]; - if (SetCurrentDirectoryW(destPath.c_str()) == 0) + if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) { - if (CreateDirectoryW(destPath.c_str(), NULL) == 0) + if (CreateDirectoryW((LPCWSTR)destPath.c_str(), NULL) == 0) return; - if (SetCurrentDirectoryW(destPath.c_str()) == 0) + if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) return; } } diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/FirstSharedTemplateDefinition.h b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/FirstSharedTemplateDefinition.h index 37a682e00..18c25883a 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/FirstSharedTemplateDefinition.h +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/FirstSharedTemplateDefinition.h @@ -1,6 +1,6 @@ #include "sharedFoundationTypes/FoundationTypes.h" #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include #include #include diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.h b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.h index 81347545e..a03cf94f6 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.h +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.h @@ -17,9 +17,9 @@ class ObjectTemplate; #include "sharedFile/Iff.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResource.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h" +#include "sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/DataResource.h" +#include "sharedFoundation/DataResourceList.h" diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp index e8111045c..fe33dbb5b 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp @@ -762,7 +762,7 @@ int TemplateData::getEnumValue(const std::string & enumType, * * @return the enum list definition, or NULL if not found */ -const TemplateData::EnumList * TemplateData::getEnumList(const std::string & name, +const TemplateData::EnumList * TemplateData::getEnumList(const std::string & name, bool define) const { EnumMap::const_iterator iter = m_enumMap.find(name); @@ -879,7 +879,7 @@ const TemplateDefinitionFile * TemplateData::getTdfForParameter(const char *para * * @return the integer that the string was parsed to */ -int TemplateData::parseIntValue(const File &fp, const char * line, const char ** endLine, +int TemplateData::parseIntValue(const File &fp, const char * line, const char ** endLine, char * intbuf) const { NOT_NULL(endLine); @@ -1025,14 +1025,14 @@ const char * TemplateData::parseEnum(const File &fp, const char *buffer, enumData.name = tokenbuf; if (line != NULL && *line == '=') { - + line = getNextToken(line, tokenbuf); if (*tokenbuf == '\0') { fp.printError("expected value for enumeration after ="); return CHAR_ERROR; } - + int value = parseIntValue(fp, line, &line, tokenbuf); if (line == CHAR_ERROR) return CHAR_ERROR; @@ -1307,7 +1307,7 @@ void TemplateData::writeRegisterTemplate(File &fp, const char * leadInChars) con * @param param the parameter being accessed * @param headerParams flag that we are writing params for a header file */ -void TemplateData::writeMethodParams(File &fp, const Parameter ¶m, +void TemplateData::writeMethodParams(File &fp, const Parameter ¶m, bool headerParams) const { std::vector paramStrings; @@ -1748,7 +1748,7 @@ ParameterList::const_iterator iter; NOT_NULL(namePrefix); - char *extraTab = ""; + std::string extraTab = ""; if (namePrefix[0] == '\0') extraTab = "\t"; @@ -1788,18 +1788,18 @@ ParameterList::const_iterator iter; switch (param.list_type) { case LIST_NONE: - fp.print("\t%s%s %s%s;", extraTab, + fp.print("\t%s%s %s%s;", extraTab.c_str(), variableNames[param.type], namePrefix, param.name.c_str()); break; case LIST_LIST: - fp.print("\t%sstdvector<%s *>::fwd %s%s;", extraTab, + fp.print("\t%sstdvector<%s *>::fwd %s%s;", extraTab.c_str(), variableNames[param.type], namePrefix, param.name.c_str()); break; case LIST_INT_ARRAY: case LIST_ENUM_ARRAY: - fp.print("\t%s%s %s%s[%d];", extraTab, + fp.print("\t%s%s %s%s[%d];", extraTab.c_str(), variableNames[param.type], namePrefix, param.name.c_str(), param.list_size); break; @@ -1836,9 +1836,9 @@ ParameterList::const_iterator iter; case TYPE_TRIGGER_VOLUME: if (param.list_type == LIST_LIST) { - fp.print("\t%sbool m_%sLoaded;\n", extraTab, + fp.print("\t%sbool m_%sLoaded;\n", extraTab.c_str(), param.name.c_str()); - fp.print("\t%sbool m_%sAppend;\n", extraTab, + fp.print("\t%sbool m_%sAppend;\n", extraTab.c_str(), param.name.c_str()); } break; @@ -2214,7 +2214,7 @@ ParameterList::const_iterator iter; fp.print("\t\tif (%s[static_cast<%s>(i)] != NULL)\n", pname, param.enum_list_name.c_str()); fp.print("\t\t{\n"); - fp.print("\t\t\t%s[static_cast<%s>(i)]->releaseReference();\n", + fp.print("\t\t\t%s[static_cast<%s>(i)]->releaseReference();\n", pname, param.enum_list_name.c_str()); fp.print("\t\t\t%s[static_cast<%s>(i)] = NULL;\n", pname, param.enum_list_name.c_str()); @@ -2381,7 +2381,7 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, "versionOk"); fp.print("\t\t{\n"); fp.print("\t\t\tDEBUG_WARNING(true, (\"Returning default value for " - "missing parameter %s in template %%s\", DataResource::getName()));\n", + "missing parameter %s in template %%s\", DataResource::getName()));\n", param.name.c_str()); if (param.type == TYPE_ENUM) { @@ -2394,7 +2394,7 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, fp.print("\t\telse\n"); fp.print("\t\t{\n"); fp.print("\t\t\tDEBUG_FATAL(base == NULL, (\"Template parameter %s has " - "not been defined in template %%s!\", DataResource::getName()));\n", + "not been defined in template %%s!\", DataResource::getName()));\n", param.name.c_str()); if (DefaultDataReturnValue[param.type][0] != '\0') { @@ -2533,7 +2533,7 @@ int result; } // TemplateData::writeSourceGetData /** - * Writes code used by datalint to test template values. + * Writes code used by datalint to test template values. * * @param fp the file to write to */ @@ -2642,14 +2642,14 @@ void TemplateData::writeSourceGetGeneric(File &fp, const Parameter ¶m) const if (param.list_type == LIST_NONE) { - // get the test base value + // get the test base value fp.print("#ifdef _DEBUG\n"); fp.print("\t\tif (testData && base != NULL)\n"); - fp.print("\t\t\ttestDataValue = base->get%s%s(true);\n", upperName.c_str(), + fp.print("\t\t\ttestDataValue = base->get%s%s(true);\n", upperName.c_str(), MinMaxNames[i]); fp.print("#endif\n"); } - + fp.print("\t}\n\n"); const char *arrayIndex = ""; @@ -2886,18 +2886,18 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons { writeSourceReturnBaseValue(fp, param, ""); - fp.print("\tconst %s%s * returnValue = NULL;\n", + fp.print("\tconst %s%s * returnValue = NULL;\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); fp.print("\tconst std::string & templateName = m_%s.getValue();\n", pname); fp.print("\tif (!templateName.empty())\n"); fp.print("\t{\n"); fp.print("\t\treturnValue = dynamic_cast(" - "ObjectTemplateList::fetch(templateName));\n", + "ObjectTemplateList::fetch(templateName));\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); fp.print("\t\tif (returnValue == NULL)\n"); - fp.print("\t\t\tWARNING_STRICT_FATAL(true, (\"Error loading template %%s\"," + fp.print("\t\t\tWARNING_STRICT_FATAL(true, (\"Error loading template %%s\"," "templateName.c_str()));\n"); fp.print("\t}\n"); fp.print("\treturn returnValue;\n"); @@ -2920,15 +2920,15 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons writeSourceReturnBaseValue(fp, param, ""); } - fp.print("\tconst %s%s * returnValue = NULL;\n", + fp.print("\tconst %s%s * returnValue = NULL;\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); - fp.print("\tconst std::string & templateName = m_%s[index]%sgetValue();\n", + fp.print("\tconst std::string & templateName = m_%s[index]%sgetValue();\n", pname, access); fp.print("\tif (!templateName.empty())\n"); fp.print("\t{\n"); fp.print("\t\treturnValue = dynamic_cast(" - "ObjectTemplateList::fetch(templateName));\n", + "ObjectTemplateList::fetch(templateName));\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); fp.print("\t\tif (returnValue == NULL)\n"); @@ -2984,7 +2984,7 @@ void TemplateData::writeSourceGetEnum(File &fp, const Parameter ¶m) const if (param.list_type == LIST_NONE) { - // get the test base value + // get the test base value fp.print("#ifdef _DEBUG\n"); fp.print("\t\tif (testData && base != NULL)\n"); fp.print("\t\t\ttestDataValue = base->get%s(true);\n", upperName.c_str()); @@ -3380,7 +3380,7 @@ void TemplateData::writeSourceReadIff(File &fp) const fp.print("\t\t\tint listCount = file.read_int32();\n"); fp.print("\t\t\tDEBUG_WARNING(listCount != %d, (\"Template %%s: " "read array size of %%d for array \\\"%s\\\" of size %d, reading " - "values anyway\", file.getFileName(), listCount));\n", + "values anyway\", file.getFileName(), listCount));\n", param.list_size, param.name.c_str(), param.list_size); fp.print("\t\t\tint j;\n"); fp.print("\t\t\tfor (j = 0; j < %d && j < listCount; ++j)\n", param.list_size); diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h index 7bf240b65..181ccce7a 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h @@ -9,9 +9,11 @@ #ifndef _INCLUDED_TemplateData_H #define _INCLUDED_TemplateData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "TemplateGlobals.h" +#include + class File; class TemplateDefinitionFile; class TpfTemplate; diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h index 823565826..22fab9a43 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h @@ -9,8 +9,8 @@ #ifndef _INCLUDED_TemplateDefinitionFile_H #define _INCLUDED_TemplateDefinitionFile_H -#include "pcre/pcre.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "../../../../../../external/3rd/library/pcre/4.1/win32/include/pcre/pcre.h" +#include "sharedFoundation/Tag.h" #include "TemplateData.h" class File; @@ -24,7 +24,7 @@ public: void setTemplateFilename(const std::string &name); void setBaseFilename(const std::string &name); - + bool isWriteForCompiler(void) const; void setWriteForCompiler(bool flag); @@ -76,14 +76,14 @@ private: inline void TemplateDefinitionFile::setTemplateFilename(const std::string &name) { m_templateFilename = name; - m_templateName = EnumLocationTypes[m_templateLocation] + + m_templateName = EnumLocationTypes[m_templateLocation] + filenameLowerToUpper(name); } inline void TemplateDefinitionFile::setBaseFilename(const std::string &name) { m_baseFilename = name; - m_baseName = EnumLocationTypes[m_templateLocation] + + m_baseName = EnumLocationTypes[m_templateLocation] + filenameLowerToUpper(name); } diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.h b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.h index 1df155659..ed059d5f6 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.h +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.h @@ -10,7 +10,7 @@ #define _INCLUDED_TemplateGlobals_H #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" //======================================================================== diff --git a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp index a762863f9..2ff90c7f2 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp +++ b/src/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp @@ -1563,10 +1563,11 @@ const char * TpfFile::parseFilenameParameter(StringParam & param, const char *li { if (!islower(lowername[i]) && !isdigit(lowername[i]) && + lowername[i] != '-' && lowername[i] != '_') { m_fp.printError("Illegal character in filename, only lowercase, " - "numbers, and \"_\" allowed"); + "numbers, \"-\" and \"_\" allowed"); return CHAR_ERROR; } } diff --git a/src/engine/shared/library/sharedTerrain/include/public/sharedTerrain/AffectorRibbon.h b/src/engine/shared/library/sharedTerrain/include/public/sharedTerrain/AffectorRibbon.h index afb66ceea..ccc5ef12c 100644 --- a/src/engine/shared/library/sharedTerrain/include/public/sharedTerrain/AffectorRibbon.h +++ b/src/engine/shared/library/sharedTerrain/include/public/sharedTerrain/AffectorRibbon.h @@ -1 +1 @@ -#include "../../src/shared/generator/AffectorRibbon.h" \ No newline at end of file +#include "../../src/shared/generator/AffectorRibbon.h" diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp index e116cba9a..c939bd53e 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp @@ -33,6 +33,7 @@ #include "sharedRandom/RandomGenerator.h" #include "sharedRandom/FastRandomGenerator.h" +#include #include #include diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp index 4ff99e0f6..626f7c187 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp @@ -23,6 +23,7 @@ #include "sharedUtility/PackedFixedPointMap.h" #include "sharedUtility/BakedTerrain.h" +#include #include #include diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.h b/src/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.h index 74550a945..984e894c2 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedTerrain/ProceduralTerrainAppearance.h" class Plane; diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.h b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.h index 4f0caeb95..1c6ea9a49 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedMath/SphereTree.h" #include "sharedTerrain/ProceduralTerrainAppearance.h" diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/SpaceTerrainAppearanceTemplate.h b/src/engine/shared/library/sharedTerrain/src/shared/appearance/SpaceTerrainAppearanceTemplate.h index 9d5ac3289..2b7c75967 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/SpaceTerrainAppearanceTemplate.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/SpaceTerrainAppearanceTemplate.h @@ -12,8 +12,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/Tag.h" #include "sharedObject/AppearanceTemplate.h" #include "sharedMath/PackedArgb.h" #include "sharedMath/PackedRgb.h" @@ -95,9 +95,9 @@ private: float m_haloScale; bool m_infiniteDistance; - private: + //private: - DistantAppearanceData operator=(DistantAppearanceData const & rhs); + // DistantAppearanceData operator=(DistantAppearanceData const & rhs); }; struct CelestialData @@ -108,9 +108,9 @@ private: float m_frontSize; Vector m_direction_w; - private: + //private: - CelestialData operator=(CelestialData const & rhs); + // CelestialData operator=(CelestialData const & rhs); }; private: diff --git a/src/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h b/src/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h index f224b2880..cb92dce07 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedCollision/BoxExtent.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include "sharedTerrain/ProceduralTerrainAppearance.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedTerrain/src/shared/core/FirstSharedTerrain.h b/src/engine/shared/library/sharedTerrain/src/shared/core/FirstSharedTerrain.h index b55884f91..891c6e89f 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/core/FirstSharedTerrain.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/core/FirstSharedTerrain.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedTerrain/src/shared/generator/EnvironmentGroup.h b/src/engine/shared/library/sharedTerrain/src/shared/generator/EnvironmentGroup.h index 66482ed02..31f708ffb 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/generator/EnvironmentGroup.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/generator/EnvironmentGroup.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h" +#include "sharedFoundation/ArrayList.h" #include "sharedMath/PackedRgb.h" class ColorRamp256; diff --git a/src/engine/shared/library/sharedTerrain/src/shared/generator/FloraGroup.h b/src/engine/shared/library/sharedTerrain/src/shared/generator/FloraGroup.h index db495c694..3cb000f8d 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/generator/FloraGroup.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/generator/FloraGroup.h @@ -22,7 +22,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h" +#include "sharedFoundation/ArrayList.h" #include "sharedMath/PackedRgb.h" class Iff; diff --git a/src/engine/shared/library/sharedTerrain/src/shared/generator/RadialGroup.h b/src/engine/shared/library/sharedTerrain/src/shared/generator/RadialGroup.h index 7e3eb1cfa..8597181c7 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/generator/RadialGroup.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/generator/RadialGroup.h @@ -12,7 +12,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h" +#include "sharedFoundation/ArrayList.h" #include "sharedMath/PackedRgb.h" class Iff; diff --git a/src/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.h b/src/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.h index 094a53204..38359cda7 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.h @@ -22,7 +22,7 @@ //=================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ArrayList.h" +#include "sharedFoundation/ArrayList.h" #include "sharedMath/PackedRgb.h" class Iff; diff --git a/src/engine/shared/library/sharedTerrain/src/shared/generator/TerrainGenerator.h b/src/engine/shared/library/sharedTerrain/src/shared/generator/TerrainGenerator.h index 4bc930fce..6ba55e0d4 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/generator/TerrainGenerator.h +++ b/src/engine/shared/library/sharedTerrain/src/shared/generator/TerrainGenerator.h @@ -18,8 +18,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" #include "sharedMath/Rectangle2d.h" #include "sharedMath/Vector.h" #include "sharedRandom/RandomGenerator.h" diff --git a/src/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp b/src/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp index 30f747275..f48a7b5db 100644 --- a/src/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp +++ b/src/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp @@ -740,11 +740,11 @@ bool TerrainObject::isWithinTerrainBoundaries (Vector const &position_w) const { //-- check x and z float const maxCoordinate = getMapWidthInMeters () * 0.5f; - if ((abs (position_w.x) > maxCoordinate) || (abs (position_w.z) > maxCoordinate)) + if ((std::abs (position_w.x) > maxCoordinate) || (std::abs (position_w.z) > maxCoordinate)) return false; //-- check y - if (abs (position_w.y) > getMaximumValidHeightInMeters ()) + if (std::abs (position_w.y) > getMaximumValidHeightInMeters ()) return false; return true; diff --git a/src/engine/shared/library/sharedThread/src/shared/FirstSharedThread.h b/src/engine/shared/library/sharedThread/src/shared/FirstSharedThread.h index 066a64248..21612208e 100644 --- a/src/engine/shared/library/sharedThread/src/shared/FirstSharedThread.h +++ b/src/engine/shared/library/sharedThread/src/shared/FirstSharedThread.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrain.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrain.h index 1b98b1ba7..b8564bedf 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrain.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrain.h @@ -1 +1 @@ -#include "../../../src/shared/BakedTerrain.h" +#include "../../src/shared/BakedTerrain.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrainReader.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrainReader.h index 6015e8cfd..506371ac8 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrainReader.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/BakedTerrainReader.h @@ -1 +1 @@ -#include "../../../src/shared/BakedTerrainReader.h" +#include "../../src/shared/BakedTerrainReader.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CachedFileManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CachedFileManager.h index 62f788e0f..5fdd67446 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CachedFileManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CachedFileManager.h @@ -1 +1 @@ -#include "../../../src/shared/CachedFileManager.h" +#include "../../src/shared/CachedFileManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Callback.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Callback.h index 181958add..22c86c224 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Callback.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Callback.h @@ -1 +1 @@ -#include "../../../src/shared/Callback.h" +#include "../../src/shared/Callback.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CallbackReceiver.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CallbackReceiver.h index fa5e041c9..9ca36d7d8 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CallbackReceiver.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CallbackReceiver.h @@ -1 +1 @@ -#include "../../../src/shared/CallbackReceiver.h" +#include "../../src/shared/CallbackReceiver.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ConfigSharedUtility.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ConfigSharedUtility.h index c2404ab05..99632b0b7 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ConfigSharedUtility.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ConfigSharedUtility.h @@ -1 +1 @@ -#include "../../../src/shared/ConfigSharedUtility.h" +#include "../../src/shared/ConfigSharedUtility.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CurrentUserOptionManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CurrentUserOptionManager.h index 867e7d88d..0e3f69d45 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CurrentUserOptionManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/CurrentUserOptionManager.h @@ -1 +1 @@ -#include "../../../src/shared/CurrentUserOptionManager.h" +#include "../../src/shared/CurrentUserOptionManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTable.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTable.h index 4e699fea6..bc4e46e47 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTable.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTable.h @@ -1 +1 @@ -#include "../../../src/shared/DataTable.h" +#include "../../src/shared/DataTable.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableCell.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableCell.h index 7e6b0c80a..cf7307c45 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableCell.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableCell.h @@ -1 +1 @@ -#include "../../../src/shared/DataTableCell.h" +#include "../../src/shared/DataTableCell.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableColumnType.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableColumnType.h index b4b15d00a..d55019c64 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableColumnType.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableColumnType.h @@ -1 +1 @@ -#include "../../../src/shared/DataTableColumnType.h" +#include "../../src/shared/DataTableColumnType.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableManager.h index 3d8a1fb0e..2e9abed03 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableManager.h @@ -1 +1 @@ -#include "../../../src/shared/DataTableManager.h" +#include "../../src/shared/DataTableManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableWriter.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableWriter.h index ea1079e90..204ab465a 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableWriter.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/DataTableWriter.h @@ -1 +1 @@ -#include "../../../src/shared/DataTableWriter.h" +#include "../../src/shared/DataTableWriter.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FileName.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FileName.h index d108bc900..971de30f0 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FileName.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FileName.h @@ -1 +1 @@ -#include "../../../src/shared/FileName.h" +#include "../../src/shared/FileName.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FirstSharedUtility.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FirstSharedUtility.h index a4eb23d46..2e47658e2 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FirstSharedUtility.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/FirstSharedUtility.h @@ -1 +1 @@ -#include "../../../src/shared/FirstSharedUtility.h" +#include "../../src/shared/FirstSharedUtility.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/HttpGetEncoder.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/HttpGetEncoder.h index fce568fab..7fe74fbd3 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/HttpGetEncoder.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/HttpGetEncoder.h @@ -1 +1 @@ -#include "../../../src/shared/HttpGetEncoder.h" +#include "../../src/shared/HttpGetEncoder.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/IndexedCache.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/IndexedCache.h index 8c7a3a58a..1cab4bd1a 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/IndexedCache.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/IndexedCache.h @@ -1 +1 @@ -#include "../../../src/shared/IndexedCache.h" +#include "../../src/shared/IndexedCache.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceData.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceData.h index 8c0eb3fb6..97cbdf035 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceData.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceData.h @@ -1 +1 @@ -#include "../../../src/shared/InstallationResourceData.h" +#include "../../src/shared/InstallationResourceData.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceDataArchive.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceDataArchive.h index ce1e0dc5b..fb7839d27 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceDataArchive.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InstallationResourceDataArchive.h @@ -1 +1 @@ -#include "../../../src/shared/InstallationResourceDataArchive.h" +#include "../../src/shared/InstallationResourceDataArchive.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InteriorLayoutReaderWriter.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InteriorLayoutReaderWriter.h index 704a1186e..13167af3b 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InteriorLayoutReaderWriter.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/InteriorLayoutReaderWriter.h @@ -1 +1 @@ -#include "../../../src/shared/InteriorLayoutReaderWriter.h" +#include "../../src/shared/InteriorLayoutReaderWriter.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocalMachineOptionManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocalMachineOptionManager.h index 4970a506a..0827d9739 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocalMachineOptionManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocalMachineOptionManager.h @@ -1 +1 @@ -#include "../../../src/shared/LocalMachineOptionManager.h" +#include "../../src/shared/LocalMachineOptionManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Location.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Location.h index 34bedfdb2..64b8215d1 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Location.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/Location.h @@ -1 +1 @@ -#include "../../../src/shared/Location.h" +#include "../../src/shared/Location.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationArchive.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationArchive.h index 999e71b03..1113b031d 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationArchive.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationArchive.h @@ -1 +1 @@ -#include "../../../src/shared/LocationArchive.h" +#include "../../src/shared/LocationArchive.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationManager.h index 1fd51b2a4..4bb83e904 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/LocationManager.h @@ -1 +1 @@ -#include "../../../src/shared/LocationManager.h" +#include "../../src/shared/LocationManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NameGenerator.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NameGenerator.h index 8592e7ba1..5980b743c 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NameGenerator.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NameGenerator.h @@ -1 +1 @@ -#include "../../../src/shared/NameGenerator.h" +#include "../../src/shared/NameGenerator.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NetworkIdAutoDeltaPackedMap.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NetworkIdAutoDeltaPackedMap.h index 216404803..780a0fde1 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NetworkIdAutoDeltaPackedMap.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/NetworkIdAutoDeltaPackedMap.h @@ -1 +1 @@ -#include "../../../src/shared/NetworkIdAutoDeltaPackedMap.h" +#include "../../src/shared/NetworkIdAutoDeltaPackedMap.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/OptionManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/OptionManager.h index dcd555c5c..7829e3604 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/OptionManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/OptionManager.h @@ -1 +1 @@ -#include "../../../src/shared/OptionManager.h" +#include "../../src/shared/OptionManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedFixedPointMap.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedFixedPointMap.h index c1c856ca5..0cfcc7be9 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedFixedPointMap.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedFixedPointMap.h @@ -1 +1 @@ -#include "../../../src/shared/PackedFixedPointMap.h" +#include "../../src/shared/PackedFixedPointMap.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedIntegerMap.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedIntegerMap.h index a913bb163..2fb9efacc 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedIntegerMap.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedIntegerMap.h @@ -1 +1 @@ -#include "../../../src/shared/PackedIntegerMap.h" +#include "../../src/shared/PackedIntegerMap.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedPosition.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedPosition.h index ad0ad5fcc..b18820aa3 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedPosition.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedPosition.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedPosition.h" +#include "../../src/shared/PackedPosition.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedQuaternion.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedQuaternion.h index c815027e8..b326886bb 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedQuaternion.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedQuaternion.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedQuaternion.h" +#include "../../src/shared/PackedQuaternion.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedRotationRate.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedRotationRate.h index 8d48532d3..0c8157cd6 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedRotationRate.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedRotationRate.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedRotationRate.h" +#include "../../src/shared/PackedRotationRate.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedTransform.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedTransform.h index 021369e85..67419fabf 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedTransform.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedTransform.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedTransform.h" +#include "../../src/shared/PackedTransform.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedUnitVector.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedUnitVector.h index 1866ae713..6d212521e 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedUnitVector.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedUnitVector.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedUnitVector.h" +#include "../../src/shared/PackedUnitVector.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedVelocity.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedVelocity.h index 0967a1d45..b250f93e3 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedVelocity.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PackedVelocity.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PackedVelocity.h" +#include "../../src/shared/PackedVelocity.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PooledString.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PooledString.h index 7c37c4cbb..998356a9f 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PooledString.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/PooledString.h @@ -1,2 +1,2 @@ -#include "../../../src/shared/PooledString.h" +#include "../../src/shared/PooledString.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/RotaryCache.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/RotaryCache.h index ba00995f6..af4a0c99b 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/RotaryCache.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/RotaryCache.h @@ -1 +1 @@ -#include "../../../src/shared/RotaryCache.h" +#include "../../src/shared/RotaryCache.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SetupSharedUtility.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SetupSharedUtility.h index c639f94e6..8fbae3c2e 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SetupSharedUtility.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SetupSharedUtility.h @@ -1 +1 @@ -#include "../../../src/shared/SetupSharedUtility.h" +#include "../../src/shared/SetupSharedUtility.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationData.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationData.h index f1f983d55..f7c20580a 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationData.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationData.h @@ -1 +1 @@ -#include "../../../src/shared/StartingLocationData.h" +#include "../../src/shared/StartingLocationData.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationDataArchive.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationDataArchive.h index 72527b839..ecfd63f57 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationDataArchive.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationDataArchive.h @@ -1 +1 @@ -#include "../../../src/shared/StartingLocationDataArchive.h" +#include "../../src/shared/StartingLocationDataArchive.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationManager.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationManager.h index 9b0bf1da6..0550f783e 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationManager.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/StartingLocationManager.h @@ -1 +1 @@ -#include "../../../src/shared/StartingLocationManager.h" +#include "../../src/shared/StartingLocationManager.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SynchronizedWeatherGenerator.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SynchronizedWeatherGenerator.h index 98b899fec..68c0acf39 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SynchronizedWeatherGenerator.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/SynchronizedWeatherGenerator.h @@ -1 +1 @@ -#include "../../../src/shared/SynchronizedWeatherGenerator.h" +#include "../../src/shared/SynchronizedWeatherGenerator.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/TemplateParameter.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/TemplateParameter.h index 91fc54d0c..3851d9298 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/TemplateParameter.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/TemplateParameter.h @@ -1 +1 @@ -#include "../../../src/shared/TemplateParameter.h" +#include "../../src/shared/TemplateParameter.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/UniqueNameList.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/UniqueNameList.h index a8c87b8f1..1bc599e74 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/UniqueNameList.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/UniqueNameList.h @@ -1 +1 @@ -#include "../../../src/shared/UniqueNameList.h" +#include "../../src/shared/UniqueNameList.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionary.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionary.h index 31632ae81..ea2638d85 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionary.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionary.h @@ -1 +1 @@ -#include "../../../src/shared/ValueDictionary.h" +#include "../../src/shared/ValueDictionary.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionaryArchive.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionaryArchive.h index 7f3602445..dd2744f8a 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionaryArchive.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueDictionaryArchive.h @@ -1 +1 @@ -#include "../../../src/shared/ValueDictionaryArchive.h" +#include "../../src/shared/ValueDictionaryArchive.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBase.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBase.h index 970449313..c0a560c67 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBase.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBase.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeBase.h" +#include "../../src/shared/ValueTypeBase.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBool.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBool.h index 5aaf2e31d..4dab0b159 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBool.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeBool.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeBool.h" +#include "../../src/shared/ValueTypeBool.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeFloat.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeFloat.h index 8515ec645..a59890ed8 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeFloat.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeFloat.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeFloat.h" +#include "../../src/shared/ValueTypeFloat.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeObjId.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeObjId.h index 1d3f4de73..611cfcb0e 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeObjId.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeObjId.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeObjId.h" +#include "../../src/shared/ValueTypeObjId.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeSignedInt.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeSignedInt.h index 80556d010..5667e5a3e 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeSignedInt.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeSignedInt.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeSignedInt.h" +#include "../../src/shared/ValueTypeSignedInt.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeString.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeString.h index df1da1a73..d939dfe39 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeString.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/ValueTypeString.h @@ -1 +1 @@ -#include "../../../src/shared/ValueTypeString.h" +#include "../../src/shared/ValueTypeString.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WeatherData.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WeatherData.h index ec01bab24..57f1a4737 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WeatherData.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WeatherData.h @@ -1 +1 @@ -#include "../../../src/shared/WeatherData.h" +#include "../../src/shared/WeatherData.h" diff --git a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WorldSnapshotReaderWriter.h b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WorldSnapshotReaderWriter.h index 90edc1435..036323ba2 100644 --- a/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WorldSnapshotReaderWriter.h +++ b/src/engine/shared/library/sharedUtility/include/public/sharedUtility/WorldSnapshotReaderWriter.h @@ -1 +1 @@ -#include "../../../src/shared/WorldSnapshotReaderWriter.h" +#include "../../src/shared/WorldSnapshotReaderWriter.h" diff --git a/src/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp b/src/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp index 255bef4b7..30bf94865 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp @@ -205,7 +205,7 @@ void CachedFileManager::preloadSomeAssets () if (possibleExtension) { ConstCharCrcString const extension (possibleExtension + 1); - ExtensionMap::iterator iter = ms_extensionMap.find (&extension); + ExtensionMap::iterator iter = ms_extensionMap.find ((const CrcString*)&extension); if (iter == ms_extensionMap.end ()) { CachedFileInfo * const info = new CachedFileInfo (extension.getString ()); diff --git a/src/engine/shared/library/sharedUtility/src/shared/Callback.h b/src/engine/shared/library/sharedUtility/src/shared/Callback.h index 113a6673b..1fc75b586 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/Callback.h +++ b/src/engine/shared/library/sharedUtility/src/shared/Callback.h @@ -14,7 +14,7 @@ class CallbackReceiver; class MemoryBlockManager; #include -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedUtility/src/shared/DataTable.cpp b/src/engine/shared/library/sharedUtility/src/shared/DataTable.cpp index c0bf3ef07..262dfcf71 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/DataTable.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/DataTable.cpp @@ -13,7 +13,7 @@ #include "sharedUtility/DataTableCell.h" #include -#include +#include //---------------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedUtility/src/shared/DataTable.h b/src/engine/shared/library/sharedUtility/src/shared/DataTable.h index 4525097b7..ef9c3fe3b 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/DataTable.h +++ b/src/engine/shared/library/sharedUtility/src/shared/DataTable.h @@ -9,12 +9,13 @@ #ifndef INCLUDED_DataTable_H #define INCLUDED_DataTable_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "DataTableCell.h" #include "DataTableColumnType.h" #include #include +#include class Iff; @@ -83,7 +84,7 @@ private: void buildColumnIndexMap(); typedef std::vector DataTableColumnTypeVector; - typedef stdhash_map::fwd ColumnIndexMap; + typedef std::unordered_map ColumnIndexMap; int m_numRows; int m_numCols; diff --git a/src/engine/shared/library/sharedUtility/src/shared/FirstSharedUtility.h b/src/engine/shared/library/sharedUtility/src/shared/FirstSharedUtility.h index f3c509cd8..eaac791b7 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/FirstSharedUtility.h +++ b/src/engine/shared/library/sharedUtility/src/shared/FirstSharedUtility.h @@ -11,7 +11,7 @@ // ====================================================================== #include "sharedDebug/FirstSharedDebug.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedUtility/src/shared/HttpGetEncoder.h b/src/engine/shared/library/sharedUtility/src/shared/HttpGetEncoder.h index 5472fee44..908fc7b05 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/HttpGetEncoder.h +++ b/src/engine/shared/library/sharedUtility/src/shared/HttpGetEncoder.h @@ -22,4 +22,4 @@ private: HttpGetEncoder(); }; -#endif // INCLUDED_HttpGetEncoder_H \ No newline at end of file +#endif // INCLUDED_HttpGetEncoder_H diff --git a/src/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp b/src/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp index 03a4141cf..8dd3f4eeb 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp @@ -12,6 +12,8 @@ #include "Archive/ByteStream.h" #include "fileInterface/StdioFile.h" +#include + IndexedCache::IndexedCache(const std::string &i_filename, int i_length, int i_version) : filename(i_filename), length(i_length), version(i_version) diff --git a/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceData.h b/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceData.h index 04a21269f..f00597363 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceData.h +++ b/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceData.h @@ -11,7 +11,7 @@ //====================================================================== #include "Unicode.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceDataArchive.h b/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceDataArchive.h index 098ae624d..b6b09010a 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceDataArchive.h +++ b/src/engine/shared/library/sharedUtility/src/shared/InstallationResourceDataArchive.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedUtility/InstallationResourceData.h" #include "unicodeArchive/UnicodeArchive.h" diff --git a/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.cpp b/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.cpp index 7aa78f098..e192e0953 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.cpp @@ -281,7 +281,7 @@ void InteriorLayoutReaderWriter::addObject(char const * const cellName, char con { Node * node = 0; TemporaryCrcString const cellNameCrcString(cellName, true); - NodeMap::iterator iter = m_nodeMap->find(&cellNameCrcString); + NodeMap::iterator iter = m_nodeMap->find((const CrcString*)&cellNameCrcString); if (iter != m_nodeMap->end()) node = iter->second; else diff --git a/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.h b/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.h index f59158d16..cd3747c10 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.h +++ b/src/engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" class LessPointerComparator; class Transform; diff --git a/src/engine/shared/library/sharedUtility/src/shared/Location.h b/src/engine/shared/library/sharedUtility/src/shared/Location.h index 6176027e8..d7958af55 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/Location.h +++ b/src/engine/shared/library/sharedUtility/src/shared/Location.h @@ -8,7 +8,7 @@ //----------------------------------------------------------------------- #include "sharedMath/Vector.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedUtility/LocationArchive.h" //----------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp b/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp index 88eafbdfc..d1ba7a662 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp @@ -14,7 +14,7 @@ namespace Archive { - + template<> void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { char temp[200]; @@ -46,6 +46,7 @@ namespace Archive // ====================================================================== + template<> void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { char temp[200]; diff --git a/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.h b/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.h index a90af810a..85de579d3 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.h +++ b/src/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.h @@ -11,7 +11,7 @@ // ====================================================================== #include "Archive/AutoDeltaPackedMap.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedUtility/src/shared/RotaryCache.h b/src/engine/shared/library/sharedUtility/src/shared/RotaryCache.h index 34ed04a0f..a04c80b0e 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/RotaryCache.h +++ b/src/engine/shared/library/sharedUtility/src/shared/RotaryCache.h @@ -43,7 +43,7 @@ protected: public: protected: - typedef struct CacheListEntry + struct CacheListEntry { CrcLowerString key; void* value; @@ -51,7 +51,7 @@ protected: typedef stdlist::fwd RotaryList; - typedef struct CacheMapEntry + struct CacheMapEntry { RotaryList::iterator iter; }; @@ -67,4 +67,4 @@ protected: }; -#endif // INCLUDED_RotaryCache_H \ No newline at end of file +#endif // INCLUDED_RotaryCache_H diff --git a/src/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h b/src/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h index 171521d88..e3db22101 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h +++ b/src/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h @@ -10,9 +10,9 @@ #define _INCLUDED_TemplateParameter_H #include "sharedFile/Iff.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DataResourceList.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/DataResourceList.h" +#include "sharedFoundation/DynamicVariableList.h" +#include "sharedFoundation/Tag.h" #include "sharedRandom/Random.h" #include "StringId.h" @@ -1012,12 +1012,12 @@ inline void StructParam::loadFromIff(Iff &file) // we need to enter a fake chunk because whoever called this // function assumes we are still in a chunk file.enterChunk(); - setValue(structTemplate); + this->setValue(structTemplate); this->m_loaded = true; } break; case TemplateBase::WEIGHTED_LIST: - setValue(new typename TemplateBase::WeightedList); + this->setValue(new typename TemplateBase::WeightedList); this->loadWeightedListFromIff(file); break; case TemplateBase::NONE: diff --git a/src/engine/shared/library/sharedUtility/src/shared/ValueTypeObjId.h b/src/engine/shared/library/sharedUtility/src/shared/ValueTypeObjId.h index 613d8f152..02ce3c834 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/ValueTypeObjId.h +++ b/src/engine/shared/library/sharedUtility/src/shared/ValueTypeObjId.h @@ -11,7 +11,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedUtility/ValueTypeBase.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp b/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp index 136bf5f2b..68f1057c9 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp +++ b/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include //=================================================================== @@ -710,7 +710,7 @@ WorldSnapshotReaderWriter::Node const *WorldSnapshotReaderWriter::addObject ( //-- find objectTemplateNameIndex uint objectTemplateNameIndex = 0; - std::hash_map::const_iterator i = m_objectTemplateCrcMap->find(objectTemplateName.getCrc()); + ObjectTemplateCrcMap::const_iterator i = m_objectTemplateCrcMap->find(objectTemplateName.getCrc()); if (i != m_objectTemplateCrcMap->end()) objectTemplateNameIndex = (*i).second; else diff --git a/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.h b/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.h index bf1e3a1d5..091fdc866 100644 --- a/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.h +++ b/src/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.h @@ -14,7 +14,7 @@ #include "sharedMath/Sphere.h" #include "sharedMath/Transform.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MemoryBlockManagerMacros.h" +#include "sharedFoundation/MemoryBlockManagerMacros.h" #include class CrcString; @@ -175,7 +175,7 @@ private: typedef stdvector::fwd ObjectTemplateNameList; ObjectTemplateNameList* const m_objectTemplateNameList; - typedef stdhash_map::fwd ObjectTemplateCrcMap; + typedef stdunordered_map::fwd ObjectTemplateCrcMap; ObjectTemplateCrcMap* const m_objectTemplateCrcMap; // map from crc to index in name list typedef stdmap::fwd NetworkIdNodeMap; diff --git a/src/engine/shared/library/sharedXml/src/shared/core/FirstSharedXml.h b/src/engine/shared/library/sharedXml/src/shared/core/FirstSharedXml.h index 91be12af0..0bc310890 100644 --- a/src/engine/shared/library/sharedXml/src/shared/core/FirstSharedXml.h +++ b/src/engine/shared/library/sharedXml/src/shared/core/FirstSharedXml.h @@ -6,6 +6,6 @@ // // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/engine/shared/library/sharedXml/src/shared/core/SetupSharedXml.cpp b/src/engine/shared/library/sharedXml/src/shared/core/SetupSharedXml.cpp index 102dc4440..750e4a468 100644 --- a/src/engine/shared/library/sharedXml/src/shared/core/SetupSharedXml.cpp +++ b/src/engine/shared/library/sharedXml/src/shared/core/SetupSharedXml.cpp @@ -23,7 +23,7 @@ namespace SetupSharedXmlNamespace void remove(); void *xmlAllocate(size_t byteCount); - void xmlFree(void *memory); + void xmlFree2(void *memory); char *xmlDuplicateString(char const *source); void *xmlReAllocate(void *memory, size_t byteCount); @@ -55,7 +55,7 @@ void *SetupSharedXmlNamespace::xmlAllocate(size_t byteCount) // ---------------------------------------------------------------------- -void SetupSharedXmlNamespace::xmlFree(void *memory) +void SetupSharedXmlNamespace::xmlFree2(void *memory) { delete [] reinterpret_cast(memory); } @@ -85,7 +85,7 @@ void SetupSharedXml::install() FATAL(s_installed, ("SetupSharedXml already installed.")); //-- Tell libxml to use our memory management functions via these stubs. - int const result = xmlMemSetup(SetupSharedXmlNamespace::xmlFree, SetupSharedXmlNamespace::xmlAllocate, SetupSharedXmlNamespace::xmlReAllocate, SetupSharedXmlNamespace::xmlDuplicateString); + int const result = xmlMemSetup(SetupSharedXmlNamespace::xmlFree2, SetupSharedXmlNamespace::xmlAllocate, SetupSharedXmlNamespace::xmlReAllocate, SetupSharedXmlNamespace::xmlDuplicateString); FATAL(result != 0, ("sharedXml failed to install memory handlers with error code [%d].", result)); XmlTreeDocumentList::install(); diff --git a/src/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.h b/src/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.h index 440811d93..a32853667 100644 --- a/src/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.h +++ b/src/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.h @@ -16,7 +16,7 @@ class XmlTreeNode; struct _xmlDoc; typedef struct _xmlDoc xmlDoc; -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/PersistentCrcString.h" +#include "sharedFoundation/PersistentCrcString.h" #include // ====================================================================== diff --git a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj index 7ba99b6e7..a993eb494 100644 --- a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj +++ b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj @@ -324,16 +324,6 @@ - - - {b97963ef-49e4-477e-85ff-e7fee7c626d7} - false - - - {d4accb0c-7b66-433d-b715-8ef7f43b8e2d} - false - - diff --git a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj.filters b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj.filters index 8dfe1292d..690fbd8d2 100644 --- a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj.filters +++ b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj.filters @@ -2,15 +2,15 @@ - {119e42bf-8961-4940-848d-d75926332002} + {9c28f62a-2b33-41be-add6-a244d285be50} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {fc886e93-0902-45eb-a0e8-c921fff9448c} + {1b2b0121-cf8e-4f76-b43d-41e27673f7e7} h;hpp;hxx;hm;inl - {e147f38a-f09b-4b39-af41-d77c5c7a524e} + {ff35a309-21ad-414e-88d3-1bae88c1d6d9} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj index b78c0d603..a511dd930 100644 --- a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj +++ b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj @@ -197,20 +197,6 @@ - - - {2338795c-ce02-4902-bef4-53645a0c3267} - false - - - {b97963ef-49e4-477e-85ff-e7fee7c626d7} - false - - - {d4accb0c-7b66-433d-b715-8ef7f43b8e2d} - false - - diff --git a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj.filters b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj.filters index c0411f3db..60e135356 100644 --- a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj.filters +++ b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj.filters @@ -2,15 +2,15 @@ - {b756c606-46d8-476f-9d24-0b5702903750} + {84f515ba-dfb1-492a-b6ed-1223cf190756} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e7589722-daef-4282-8042-9fe2f5a0b2d8} + {d9127c87-0ae5-4240-a84c-1849c66cf461} h;hpp;hxx;hm;inl - {18203c6f-6659-4cab-8326-5ce6c316aac9} + {a3462976-ebc4-48ba-8287-fe46797d458d} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/src/external/3rd/library/atlmfc/include/afx.h b/src/external/3rd/library/atlmfc/include/afx.h index 64e9cb9e9..55401593c 100644 --- a/src/external/3rd/library/atlmfc/include/afx.h +++ b/src/external/3rd/library/atlmfc/include/afx.h @@ -57,7 +57,7 @@ #include #endif -#include // Target version control +#include "afxver_.h" // Target version control #ifdef _WIN64 #ifndef _AFX_NO_DAO_SUPPORT @@ -896,7 +896,7 @@ protected: #endif }; -#include +#include "afxstr.h" // ATL Classes diff --git a/src/external/3rd/library/atlmfc/include/afxver_.h b/src/external/3rd/library/atlmfc/include/afxver_.h index 22d1eabc3..5d9f81e2d 100644 --- a/src/external/3rd/library/atlmfc/include/afxver_.h +++ b/src/external/3rd/library/atlmfc/include/afxver_.h @@ -96,11 +96,11 @@ #define AFX_INLINE inline /*__forceinline*/ #endif -#include +#include "afxv_w32.h" // Include any non-Intel platform specific items #ifndef _X86_ - #include + #include "afxv_cpu.h" #endif #ifdef _X86_ diff --git a/src/external/3rd/library/atlmfc/include/afxwin.h b/src/external/3rd/library/atlmfc/include/afxwin.h index 9a774f73a..9cb003e09 100644 --- a/src/external/3rd/library/atlmfc/include/afxwin.h +++ b/src/external/3rd/library/atlmfc/include/afxwin.h @@ -16,7 +16,7 @@ // Make sure 'afx.h' is included first #ifndef __AFX_H__ - #include + #include "afx.h" #endif // Note: WINDOWS.H already included from AFXV_W32.H @@ -26,11 +26,11 @@ #endif #ifndef __AFXRES_H__ - #include // standard resource IDs + #include "afxres.h" // standard resource IDs #endif #ifndef __AFXCOLL_H__ - #include // standard collections + #include "afxcoll.h" // standard collections #endif #ifndef _OBJBASE_H_ @@ -58,7 +58,8 @@ AFX_INLINE short APIENTRY GetFileTitle(LPCTSTR lpszFile, LPTSTR lpszTitle, WORD #if (_WIN32_WINNT >= 0x501) #include -#include +#include +#include #endif // (_WIN32_WINNT >= 0x501) #ifdef _AFX_MINREBUILD diff --git a/src/external/3rd/library/atlmfc/include/atlbase.h b/src/external/3rd/library/atlmfc/include/atlbase.h index 88975b8cb..fb9025ded 100644 --- a/src/external/3rd/library/atlmfc/include/atlbase.h +++ b/src/external/3rd/library/atlmfc/include/atlbase.h @@ -66,15 +66,15 @@ #define ATL_NO_LEAN_AND_MEAN #endif -#include +#include "atldef.h" #ifndef _WINSOCKAPI_ #include #endif -#include +#include "atlcore.h" #include -#include +#include "atlcomcli.h" #include #include @@ -83,7 +83,7 @@ #include #include -#include +#include "atliface.h" #if !defined(_ATL_MIN_CRT) & defined(_MT) #include @@ -93,11 +93,11 @@ #include #include -#include -#include -#include -#include -#include +#include "atlconv.h" +#include "shlwapi.h" +#include "atlsimpcoll.h" +#include "atltrace.h" +#include "atlexcept.h" #define _ATL_TYPELIB_INDEX_LENGTH 10 #define _ATL_QUOTES_SPACE 2 @@ -111,7 +111,7 @@ #if !defined(_ATL_NOFORCE_MANIFEST) && !defined(_VC_NODEFAULTLIB) -#include +#include "atlassem.h" #endif // !defined(_ATL_NOFORCE_MANIFEST) && !defined(_VC_NODEFAULTLIB) diff --git a/src/external/3rd/library/atlmfc/include/atldef.h b/src/external/3rd/library/atlmfc/include/atldef.h index 202212239..79fd8044d 100644 --- a/src/external/3rd/library/atlmfc/include/atldef.h +++ b/src/external/3rd/library/atlmfc/include/atldef.h @@ -20,9 +20,9 @@ #pragma warning(disable : 4619) // there is no warning number -#include -#include -#include +#include "atlrc.h" +//#include +//#include #ifndef RC_INVOKED diff --git a/src/external/3rd/library/atlmfc/include/atlisapi.h b/src/external/3rd/library/atlmfc/include/atlisapi.h index 197025591..cc91a9c92 100644 --- a/src/external/3rd/library/atlmfc/include/atlisapi.h +++ b/src/external/3rd/library/atlmfc/include/atlisapi.h @@ -9,7 +9,7 @@ // Active Template Library product. #ifndef __ATLSTENCIL_H__ -#include +#include "atlstencil.h" #endif #ifndef __ATLISAPI_H__ @@ -21,20 +21,20 @@ // //#pragma once -#include +#include "atlbase.h" #include // needed for cookie support -#include // needed for ECB and IIS support -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +//#include "httpext.h" // needed for ECB and IIS support +#include "atlspriv.h" +#include "atlserr.h" +#include "atlfile.h" +#include "atlstr.h" +#include "atldbcli.h" +#include "atlutil.h" +#include "atlcache.h" +#include "atlsrvres.h" +#include "atlsiface.h" +##include "objbase.h" +#include "atlsecurity.h" #include #ifndef ATL_NO_SOAP #include @@ -54,7 +54,7 @@ #endif #endif // !_ATL_NO_DEFAULT_LIBS #endif -#include +#include "atlpath.h" #pragma warning(push) #pragma warning(disable: 4291) // allow placement new diff --git a/src/external/3rd/library/atlmfc/include/atlstencil.h b/src/external/3rd/library/atlmfc/include/atlstencil.h index 8049b2c47..e34f2d5b4 100644 --- a/src/external/3rd/library/atlmfc/include/atlstencil.h +++ b/src/external/3rd/library/atlmfc/include/atlstencil.h @@ -21,9 +21,9 @@ #error "_ATL_MIN_CRT cannot be used with atlstencil.h" #endif -#include -#include -#include +#include "atlisapi.h" +#include "atlfile.h" +#include "atlutil.h" #include #ifdef ATL_DEBUG_STENCILS diff --git a/src/external/3rd/library/boost/boost/config.hpp b/src/external/3rd/library/boost/boost/config.hpp index eb7866d53..d49bb27cd 100644 --- a/src/external/3rd/library/boost/boost/config.hpp +++ b/src/external/3rd/library/boost/boost/config.hpp @@ -1,657 +1,67 @@ // Boost config.hpp configuration header file ------------------------------// -// (C) Copyright Boost.org 1999. Permission to copy, use, modify, sell and -// distribute this software is granted provided this copyright notice appears -// in all copies. This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. +// (C) Copyright John Maddock 2002. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// See http://www.boost.org for most recent version. +// See http://www.boost.org/libs/config for most recent version. // Boost config.hpp policy and rationale documentation has been moved to // http://www.boost.org/libs/config - -// Revision History (excluding minor changes for specific compilers) -// 29 Mar 01 BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS (Daryle Walker) -// 16 Mar 01 Added BOOST_VERSION (Jens Maurer) -// 06 Mar 01 Refactored EDG checks for Intel C++ (Dave Abrahams) -// 04 Mar 01 Factored EDG checks, added BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -// for Intel C++ 5.0 (Dave Abrahams) -// 17 Feb 01 BOOST_NO_CV_SPECIALIZATIONS -// BOOST_NO_CV_VOID_SPECIALIZATIONS (John Maddock) -// 11 Feb 01 Added BOOST_STATIC_CONSTANT (Dave Abrahams) -// 20 Jan 01 BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS moved here from -// cast.hpp. Added missing BOOST_NO_STRINGSTREAM which some -// boost code seemed to depend on. (Dave Abrahams) -// 13 Jan 01 SGI MIPSpro and Compaq Tru64 Unix compiler support added -// (Jens Maurer) -// 13 Jan 01 BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP (Jens Maurer) -// 17 Nov 00 BOOST_NO_AUTO_PTR (John Maddock) -// 4 Oct 00 BOOST_NO_STD_MIN_MAX (Jeremy Siek) -// 29 Sep 00 BOOST_NO_INTEGRAL_INT64_T (Jens Maurer) -// 25 Sep 00 BOOST_NO_STD_ALLOCATOR (Jeremy Siek) -// 18 SEP 00 BOOST_NO_SLIST, BOOST_NO_HASH, -// BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS -// BOOST_NO_LIMITS (Jeremy Siek) -// 1 Sep 00 BOOST_NO_PRIVATE_IN_AGGREGATE added. (Mark Rodgers) -// 23 Jul 00 Fixed spelling of BOOST_NO_INCLASS_MEMBER_INITIALIZATION in -// comment (Dave Abrahams). -// 10 Jul 00 BOOST_NO_POINTER_TO_MEMBER_CONST added (Mark Rodgers) -// 26 Jun 00 BOOST_NO_STD_ITERATOR, BOOST_MSVC_STD_ITERATOR, -// BOOST_NO_STD_ITERATOR_TRAITS, BOOST_NO_USING_TEMPLATE, -// added (Jeremy Siek) -// 20 Jun 00 BOOST_MSVC added (Aleksey Gurtovoy) -// 14 Jun 00 BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS (Jens M.) -// 22 Mar 00 BOOST_MSVC6_MEMBER_TEMPLATES added (Dave Abrahams) -// 18 Feb 00 BOOST_NO_INCLASS_MEMBER_INITIALIZATION added (Jens Maurer) -// 26 Jan 00 Borland compiler support added (John Maddock) -// 26 Jan 00 Sun compiler support added (Jörg Schaible) -// 30 Dec 99 BOOST_NMEMBER_TEMPLATES compatibility moved here from -// smart_ptr.hpp. (Dave Abrahams) -// 15 Nov 99 BOOST_NO_OPERATORS_IN_NAMESPACE, -// BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION added (Beman Dawes) -// 11 Oct 99 BOOST_NO_STDC_NAMESPACE refined; supplied -// 29 Sep 99 BOOST_NO_STDC_NAMESPACE added (Ed Brey) -// 24 Sep 99 BOOST_DECL added (Ed Brey) -// 10 Aug 99 Endedness flags added, GNU CC support added -// 22 Jul 99 Initial version - +// +// CAUTION: This file is intended to be completely stable - +// DO NOT MODIFY THIS FILE! +// #ifndef BOOST_CONFIG_HPP #define BOOST_CONFIG_HPP -#define BOOST_VERSION 102300 - -// BOOST_VERSION % 100 is the sub-minor version -// BOOST_VERSION / 100 % 1000 is the minor version -// BOOST_VERSION / 100000 is the major version - - -// Conformance Flag Macros -------------------------------------------------// -// -// Conformance flag macros should identify the absence of C++ Standard -// conformance rather than its presence. This ensures that standard conforming -// compilers do not require a lot of configuration flag macros. It places the -// burden where it should be, on non-conforming compilers. In the future, -// hopefully, less rather than more conformance flags will have to be defined. - -// BOOST_NO_CV_SPECIALIZATIONS: if template specialisations for cv-qualified types -// conflict with a specialistaion for unqualififed type. - -// BOOST_NO_CV_VOID_SPECIALIZATIONS: if template specialisations for cv-void types -// conflict with a specialistaion for void. - -// BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP: Compiler does not implement -// argument-dependent lookup (also named Koenig lookup); see std::3.4.2 -// [basic.koenig.lookup] - -// BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS: Template value -// parameters cannot have a dependent type, for example -// "template class X { ... };" - -// BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS: Can only use deduced -// template arguments when calling function template instantiations. - -// BOOST_NO_INCLASS_MEMBER_INITIALIZATION: Compiler violates std::9.4.2/4. - -// BOOST_NO_INT64_T: does not support 64-bit integer -// types. (Set by rather than ). - -// BOOST_NO_INTEGRAL_INT64_T: int64_t as defined by is -// not an integral type. - -// BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS: constants such as -// numeric_limits::is_signed are not available for use at compile-time. - -// BOOST_NO_MEMBER_TEMPLATES: Member template functions not fully supported. -// Also see BOOST_MSVC6_MEMBER_TEMPLATES in the Compiler Control section below. - -// BOOST_NO_MEMBER_TEMPLATE_FRIENDS: Member template friend syntax -// ("template friend class frd;") described in the C++ Standard, -// 14.5.3, not supported. - -// BOOST_NO_OPERATORS_IN_NAMESPACE: Compiler requires inherited operator -// friend functions to be defined at namespace scope, then using'ed to boost. -// Probably GCC specific. See boost/operators.hpp for example. - -// BOOST_NO_POINTER_TO_MEMBER_CONST: The compiler does not correctly handle -// pointers to const member functions, preventing use of these in overloaded -// function templates. See boost/functional.hpp for example. - -// BOOST_NO_PRIVATE_IN_AGGREGATE: The compiler misreads 8.5.1, treating classes -// as non-aggregate if they contain private or protected member functions. - -// BOOST_NO_STD_ITERATOR: The C++ implementation fails to provide the -// std::iterator class. - -// BOOST_NO_STD_ITERATOR_TRAITS: The compiler does not provide a standard -// compliant implementation of std::iterator_traits. Note that -// the compiler may still have a non-standard implementation. - -// BOOST_NO_STDC_NAMESPACE: The contents of C++ standard headers for C library -// functions (the headers) have not been placed in namespace std. -// Because the use of std::size_t is so common, a specific workaround for -// (and thus std::size_t) is provided in this header (see below). -// For other headers, a workaround must be provided in the boost header: -// -// #include // for abs -// #ifdef BOOST_NO_STDC_NAMESPACE -// namespace std { using ::abs; } -// #endif - -// BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION. Class template partial -// specialization (14.5.4 [temp.class.spec]) not supported. - -// BOOST_NO_USING_TEMPLATE: The compiler will not accept a using declaration -// that imports a template from the global namespace into a named namespace. -// Probably Borland specific. - -// BOOST_NO_AUTO_PTR: If the compiler / library supplies non-standard or broken -// std::auto_ptr. - -// BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING: The compiler does not perform -// function template ordering or its function template ordering is incorrect. -// -// template void f(T); // #1 -// template void f(T (*)(U)); // #2 -// void bar(int); -// f(&bar); // should choose #2. - -// BOOST_NO_DEPENDENT_NESTED_DERIVATIONS: The compiler fails to compile -// a nested class that has a dependent base class: -// template -// struct foo : public T { -// template -// struct bar : public T, public U {}; -// }; - -// -// Compiler Control or Information Macros ----------------------------------// -// -// Compilers often supply features outside of the C++ Standard which need to be -// controlled or detected. As usual, reasonable default behavior should occur -// if any of these macros are not defined. - -// BOOST_DECL: Certain compilers for Microsoft operating systems require -// non-standard class and function decoration if dynamic load library linking -// is desired. BOOST_DECL supplies that decoration. Boost does not require -// use of BOOST_DECL - it is non-standard and to be avoided if practical to do -// so. Even compilers requiring it for DLL's only require it in certain cases. -// -// BOOST_DECL_EXPORTS: User defined, usually via command line or IDE, -// it causes BOOST_DECL to be defined as __declspec(dllexport). -// -// BOOST_DECL_IMPORTS: User defined, usually via command line or IDE, -// it causes BOOST_DECL to be defined as __declspec(dllimport). -// -// If neither BOOST_DECL_EXPORTS nor BOOST_DECL_IMPORTS is defined, or if -// the compiler does not require __declspec() decoration, BOOST_DECL is -// defined as a null string. - -// BOOST_MSVC6_MEMBER_TEMPLATES: Microsoft Visual C++ 6.0 has enough member -// template idiosyncrasies (being polite) that BOOST_NO_MEMBER_TEMPLATES is -// defined for this compiler. BOOST_MSVC6_MEMBER_TEMPLATES is defined to allow -// compiler specific workarounds. - -// BOOST_MSVC: defined as _MSC_VER for the Microsoft compiler only. In general, -// boost headers should test for a specific conformance flag macro (for -// example, BOOST_NO_MEMBER_TEMPLATE_FRIENDS) rather than a specific compiler. -// VC++ is a special case, however, since many libraries try to support it yet -// it has so many conformance issues that sometimes it is just easier to test -// for it directly. On the other hand, the obvious way to do this doesn't work, -// as many non-Microsoft compilers define _MSC_VER. Thus BOOST_MSVC. - -// BOOST_MSVC_STD_ITERATOR: Microsoft's broken version of std::iterator -// is being used. - -// BOOST_SYSTEM_HAS_STDINT_H: There are no 1998 C++ Standard headers -// or , although the 1999 C Standard does include . -// If is present, can make good use of it, -// so a flag is supplied (signalling presence; thus the default is not -// present, conforming to the current C++ standard). - -// BOOST_NO_SLIST: The C++ implementation does not provide the slist class. - -// BOOST_NO_STRINGSTREAM: The C++ implementation does not provide the header. - -// BOOST_NO_HASH: The C++ implementation does not provide the hash_set -// or hash_map classes. - -// BOOST_STD_EXTENSION_NAMESPACE: The name of the namespace in which the slist, -// hash_set and/or hash_map templates are defined in this implementation (if any). - -// BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS: The standard library does not provide -// templated iterator constructors for its containers. - -// BOOST_NO_LIMITS: The C++ implementation does not provide the header. - -// BOOST_NO_INTRINSIC_WCHAR_T: The C++ implementation does not provide wchar_t, -// or it is really a synonym for another integral type. Use this symbol to -// decide whether it is appropriate to explicitly specialize a template on -// wchar_t if there is already a specialization for other integer types. - -// BOOST_NO_STD_ALLOCATOR: The C++ standard library does not provide -// a standards conforming std::allocator. - -// BOOST_NO_STD_MIN_MAX: The C++ standard library does not provide -// the min() and max() template functions that should be in . - -// Common compiler front-ends precede all compiler checks ------------------// - -// Edison Design Group front-ends -# if defined(__EDG_VERSION__) -# if __EDG_VERSION__ <= 241 -# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -# endif - -# endif - -// Compiler-specific checks -------------------------------------------------// -// Compilers are listed in alphabetic order by vendor name -// (except VC++ must be last - see below) - -// Borland ------------------------------------------------------------------// - -#if defined __BORLANDC__ -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -// pull in standard library version: -# include -# if __BORLANDC__ <= 0x0551 -# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS -# define BOOST_NO_INTEGRAL_INT64_T -# define BOOST_NO_PRIVATE_IN_AGGREGATE -# endif -# if __BORLANDC__ <= 0x0550 -// Borland C++ Builder 4 and 5: -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# define BOOST_NO_USING_TEMPLATE -# if __BORLANDC__ == 0x0550 -// Borland C++ Builder 5, command-line compiler 5.5: -# define BOOST_NO_OPERATORS_IN_NAMESPACE -# endif -# endif -# if defined BOOST_DECL_EXPORTS -# if defined BOOST_DECL_IMPORTS -# error Not valid to define both BOOST_DECL_EXPORTS and BOOST_DECL_IMPORTS -# endif -# define BOOST_DECL __declspec(dllexport) -# elif defined BOOST_DECL_IMPORTS -# define BOOST_DECL __declspec(dllimport) -# else -# define BOOST_DECL -# endif -#if (__BORLANDC__ == 0x550) || (__BORLANDC__ == 0x551) -// is partly broken, some macos define symbols that are really in -// namespace std, so you end up having to use illegal constructs like -// std::DBL_MAX, as a fix we'll just include float.h and have done with: -#include +// if we don't have a user config, then use the default location: +#if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG) +# define BOOST_USER_CONFIG +#if 0 +// For dependency trackers: +# include #endif -# define BOOST_NO_CV_SPECIALIZATIONS -# define BOOST_NO_CV_VOID_SPECIALIZATIONS - -// Comeau C++ ----------------------------------------------------------------// - -# elif defined __COMO__ -# if __COMO_VERSION__ <= 4245 -# define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS -# endif - -// Compaq Tru64 Unix cxx --------------------------------------------------- - -# elif defined __DECCXX -# define BOOST_NO_SLIST -# define BOOST_NO_HASH - -// GNU CC (also known as GCC and G++) --------------------------------------// - -# elif defined __GNUC__ -# if __GNUC__ == 2 && __GNUC_MINOR__ == 91 - // egcs 1.1 won't parse smart_ptr.hpp without this: -# define BOOST_NO_AUTO_PTR -# endif -# if __GNUC__ == 2 && __GNUC_MINOR__ <= 97 -# include // not sure this is the right way to do this -JGS -# if defined(__BASTRING__) && !defined(__GLIBCPP__) && !defined(_CXXRT_STD) && !defined(__SGI_STL) // need to ask Dietmar about this -JGS - // this should only detect the stdlibc++ that ships with gcc, and - // not any replacements that may be installed... -# define BOOST_NO_STD_ITERATOR -# define BOOST_NO_LIMITS -# endif -# if !defined(_CXXRT_STD) && !defined(__SGI_STL_OWN_IOSTREAMS) -# define BOOST_NO_STRINGSTREAM -# endif -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# define BOOST_NO_OPERATORS_IN_NAMESPACE -# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING -# endif -# if __GNUC__ == 2 && __GNUC_MINOR__ <= 8 -# define BOOST_NO_MEMBER_TEMPLATES -# endif -# if __GNUC__ >= 3 -# include -# if defined(__GLIBCPP__) - // The new GNU C++ library has slist, hash_map, hash_set headers - // in , but client code assumes they're in <*> --- Jens M. -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -# endif -# endif - -// Greenhills C++ -----------------------------------------------------------// - -#elif defined __ghs -# define BOOST_NO_SLIST -# define BOOST_NO_HASH - -// HP aCC ------------------------------------------------------------------- - -# elif defined __HP_aCC -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS -# define BOOST_NO_OPERATORS_IN_NAMESPACE - // (support for HP aCC is not complete, see the regression test results) - -// Intel on Linux -----------------------------------------------------------// - -#elif defined __ICC -# include -# ifdef _CPPLIB_VER - // shipped with Dinkumware 3.10, which has a different hash_map -# define BOOST_NO_HASH -# endif - -// Intel on Windows --------------------------------------------------------// - -# elif defined __ICL -# if __ICL <= 500 - // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup - // in the frontend even in "strict" mode. (reported by Kirk Klobe) -# ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -# endif -# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING -# define BOOST_NO_INTRINSIC_WCHAR_T // tentative addition - required for VC6 compatibility? (added by JM 19 Feb 2001) -# endif -# include // not sure this is the right way to do this -JGS -# if __SGI_STL_PORT >= 0x400 || __SGI_STL_PORT >= 0x321 && defined(__STL_USE_NAMESPACES) - // a perfectly good implementation of std::iterator is supplied -# elif defined(__SGI_STL_ITERATOR) -# define BOOST_NO_STD_ITERATOR // No std::iterator in this case -# elif defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) -# // full dinkumware 3.06 and above -# define BOOST_NO_HASH -# define BOOST_NO_STD_ITERATOR_TRAITS -# if !_GLOBAL_USING // can be defined in yvals.h -# define BOOST_NO_STDC_NAMESPACE -# endif -# else // assume using dinkumware's STL that comes with VC++ 6.0 -# define BOOST_MSVC_STD_ITERATOR -# define BOOST_NO_STD_ITERATOR_TRAITS -# define BOOST_NO_STDC_NAMESPACE -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS -# define BOOST_NO_STD_ALLOCATOR -# define BOOST_NO_STD_MIN_MAX -# endif - -// Kai C++ ---------------------------------------------------------------- - -#elif defined __KCC -# define BOOST_NO_SLIST -# define BOOST_NO_HASH - -# if __KCC_VERSION <= 4001 - // at least on Sun, the contents of is not in namespace std -# define BOOST_NO_STDC_NAMESPACE -# endif - -// Metrowerks CodeWarrior -------------------------------------------------// - -# elif defined __MWERKS__ -# if __MWERKS__ <= 0x2401 // 6.2 -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING -# endif -# if __MWERKS__ <= 0x2301 // 5.3 -# define BOOST_NO_POINTER_TO_MEMBER_CONST -# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS -# define BOOST_NO_HASH -# endif -# if __MWERKS__ >= 0x2400 -# define BOOST_STD_EXTENSION_NAMESPACE Metrowerks -# endif -# if __MWERKS__ >= 0x2300 -# define BOOST_SYSTEM_HAS_STDINT_H -# endif -# if defined BOOST_DECL_EXPORTS -# if defined BOOST_DECL_IMPORTS -# error Not valid to define both BOOST_DECL_EXPORTS and BOOST_DECL_IMPORTS -# endif -# define BOOST_DECL __declspec(dllexport) -# elif defined BOOST_DECL_IMPORTS -# define BOOST_DECL __declspec(dllimport) -# else -# define BOOST_DECL -# endif - -// SGI MIPSpro C++ ---------------------------------------------------------// - -# elif defined __sgi - // This is a generic STLport condition and could be moved elsewhere. -# include -# if defined(__SGI_STL_PORT) && !defined(__STL_MEMBER_TEMPLATE_CLASSES) && !defined(_STLP_MEMBER_TEMPLATE_CLASSES) -# define BOOST_NO_STD_ALLOCATOR -# endif - -// Sun Workshop Compiler C++ -----------------------------------------------// - -# elif defined __SUNPRO_CC -# if __SUNPRO_CC <= 0x520 -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -# define BOOST_NO_STD_ITERATOR_TRAITS -# define BOOST_NO_STD_ALLOCATOR - - // although sunpro 5.1 supports the syntax for - // inline initialization it often gets the value - // wrong, especially where the value is computed - // from other constants (J Maddock 6th May 2001) -# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION - - // although sunpro 5.1 supports the syntax for - // partial specialization, it often seems to - // bind to the wrong specialization. Better - // to disable it until suppport becomes more stable - // (J Maddock 6th May 2001). -# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# endif -# if __SUNPRO_CC <= 0x500 -# define BOOST_NO_MEMBER_TEMPLATES -# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# endif - -// Microsoft Visual C++ (excluding Intel/EDG front end) -------------------- -// -// Must remain the last #elif since some other vendors (Metrowerks, for -// example) also #define _MSC_VER - -# elif defined _MSC_VER -# define BOOST_MSVC _MSC_VER - - // turn off the warnings before we #include anything -# pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info -# pragma warning( disable : 4503 ) // warning: decorated name length exceeded - -# if _MSC_VER <= 1300 // 1200 == VC++ 6.0, 1300 == VC++ .NET -# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION -# define BOOST_NO_PRIVATE_IN_AGGREGATE -# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS - -# define BOOST_NO_INTEGRAL_INT64_T -# define BOOST_NO_INTRINSIC_WCHAR_T - -// VC++ 6.0 has member templates but they have numerous problems including -// cases of silent failure, so for safety we define: -# define BOOST_NO_MEMBER_TEMPLATES -// For VC++ experts wishing to attempt workarounds, we define: -# define BOOST_MSVC6_MEMBER_TEMPLATES - -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS -# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING -# include // not sure this is the right way to do this -JGS -# if __SGI_STL_PORT >= 0x400 || __SGI_STL_PORT >= 0x321 && defined(__STL_USE_NAMESPACES) - // a perfectly good implementation of std::iterator is supplied - // A conforming allocator is supplied, but the compiler cannot cope - // when using "rebind". (Douglas Gregor) -# define BOOST_NO_STD_ALLOCATOR -# elif defined(__SGI_STL_ITERATOR) -# define BOOST_NO_STD_ITERATOR // No std::iterator in this case -# elif defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) - // full dinkumware 3.06 and above -# define BOOST_NO_HASH -# define BOOST_NO_STD_ITERATOR_TRAITS -# ifndef _GLOBAL_USING // can be defined in yvals.h -# define BOOST_NO_STDC_NAMESPACE -# endif -# define BOOST_MSVC_STD_ITERATOR -# else -# define BOOST_MSVC_STD_ITERATOR -# define BOOST_NO_SLIST -# define BOOST_NO_HASH -# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS -# define BOOST_NO_STD_ALLOCATOR -# ifndef _CPPLIB_VER - // Updated Dinkum library defines this, and provides - // its own min and max definitions. -# define BOOST_NO_STD_MIN_MAX -# undef min -# undef max -# endif -# ifndef NOMINMAX - // avoid spurious NOMINMAX redefinition warning -# define NOMINMAX -# endif -# endif -# define BOOST_NO_STD_ITERATOR_TRAITS -# define BOOST_NO_CV_VOID_SPECIALIZATIONS - - -// Make sure at least one standard library header is included so that library -// implementation detection will work, even if no standard headers have been -// included in front of a boost header. (Ed Brey 5 Jun 00) -# include - -// Determine if the standard library implementation is already pulling names -// into std. STLport defines the following if so. (Ed Brey 5 Jun 00) -# if !defined( __STL_IMPORT_VENDOR_CSTD ) || defined( __STL_NO_CSTD_FUNCTION_IMPORTS ) -# define BOOST_NO_STDC_NAMESPACE -# endif - -# endif - -# if defined BOOST_DECL_EXPORTS -# if defined BOOST_DECL_IMPORTS -# error Not valid to define both BOOST_DECL_EXPORTS and BOOST_DECL_IMPORTS -# endif -# define BOOST_DECL __declspec(dllexport) -# elif defined BOOST_DECL_IMPORTS -# define BOOST_DECL __declspec(dllimport) -# else -# define BOOST_DECL -# endif - -# endif // Microsoft (excluding Intel/EDG frontend) - -# ifndef BOOST_DECL -# define BOOST_DECL // default for compilers not needing this decoration. -# endif - -// end of compiler specific portion ----------------------------------------// - -#if defined(BOOST_NO_LIMITS) || (defined(_RWSTD_VER) && defined(__BORLANDC__) && _RWSTD_VER < 0x020300) || (defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x410 && defined(__STL_STATIC_CONST_INIT_BUG)) -// STLPort 4.0 doesn't define the static constants in numeric_limits<> so that they -// can be used at compile time if the compiler bug indicated by -// __STL_STATIC_CONST_INIT_BUG is present. - -// Rogue wave STL (C++ Builder) also has broken numeric_limits -// with default template defining members out of line. -// However, Compaq C++ also uses RogueWave (version 0x0203) and it's ok. -# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS +#endif +// include it first: +#ifdef BOOST_USER_CONFIG +# include BOOST_USER_CONFIG #endif -#if defined(__hpux) -// HP-UX has a nice stdint.h in a different location, see boost/cstdint.hpp -# define BOOST_SYSTEM_HAS_STDINT_H +// if we don't have a compiler config set, try and find one: +#if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG) && !defined(BOOST_NO_CONFIG) +# include +#endif +// if we have a compiler config, include it now: +#ifdef BOOST_COMPILER_CONFIG +# include BOOST_COMPILER_CONFIG #endif -#ifndef BOOST_STD_EXTENSION_NAMESPACE -# define BOOST_STD_EXTENSION_NAMESPACE std +// if we don't have a std library config set, try and find one: +#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) && defined(__cplusplus) +# include +#endif +// if we have a std library config, include it now: +#ifdef BOOST_STDLIB_CONFIG +# include BOOST_STDLIB_CONFIG #endif -// Check for old name "BOOST_NMEMBER_TEMPLATES" for compatibility -----------// -// Don't use BOOST_NMEMBER_TEMPLATES. It is deprecated and will be removed soon. -#if defined( BOOST_NMEMBER_TEMPLATES ) && !defined( BOOST_NO_MEMBER_TEMPLATES ) - #define BOOST_NO_MEMBER_TEMPLATES +// if we don't have a platform config set, try and find one: +#if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG) && !defined(BOOST_NO_CONFIG) +# include +#endif +// if we have a platform config, include it now: +#ifdef BOOST_PLATFORM_CONFIG +# include BOOST_PLATFORM_CONFIG #endif -// BOOST_NO_STDC_NAMESPACE workaround --------------------------------------// -// -// Because std::size_t usage is so common, even in boost headers which do not -// otherwise use the C library, the workaround is included here so -// that ugly workaround code need not appear in many other boost headers. -// NOTE WELL: This is a workaround for non-conforming compilers; -// must still be #included in the usual places so that inclusion -// works as expected with standard conforming compilers. The resulting -// double inclusion of is harmless. +// get config suffix code: +#include -# ifdef BOOST_NO_STDC_NAMESPACE -# include - namespace std { using ::ptrdiff_t; using ::size_t; } - // using ::wchar_t; removed since wchar_t is a C++ built-in type (Ed Brey) -# endif - -#ifdef BOOST_NO_STD_MIN_MAX -namespace std { - template - inline const _Tp& min(const _Tp& __a, const _Tp& __b) { - return __b < __a ? __b : __a; - } - template - inline const _Tp& max(const _Tp& __a, const _Tp& __b) { - return __a < __b ? __b : __a; - } -#ifdef BOOST_MSVC - inline long min(long __a, long __b) { - return __b < __a ? __b : __a; - } - inline long max(long __a, long __b) { - return __a < __b ? __b : __a; - } -#endif -} -#endif - -// BOOST_STATIC_CONSTANT workaround --------------------------------------- // -// On compilers which don't allow in-class initialization of static integral -// constant members, we must use enums as a workaround if we want the constants -// to be available at compile-time. This macro gives us a convenient way to -// declare such constants. -#ifdef BOOST_NO_INCLASS_MEMBER_INITIALIZATION -# define BOOST_STATIC_CONSTANT(type, assignment) enum { assignment } -#else -# define BOOST_STATIC_CONSTANT(type, assignment) static const type assignment +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once #endif #endif // BOOST_CONFIG_HPP - - - - - - - diff --git a/src/external/3rd/library/boost/boost/smart_ptr.hpp b/src/external/3rd/library/boost/boost/smart_ptr.hpp index d9c0aa502..b5e569d8d 100644 --- a/src/external/3rd/library/boost/boost/smart_ptr.hpp +++ b/src/external/3rd/library/boost/boost/smart_ptr.hpp @@ -1,402 +1,31 @@ -// Boost smart_ptr.hpp header file -----------------------------------------// +#ifndef BOOST_SMART_PTR_HPP_INCLUDED +#define BOOST_SMART_PTR_HPP_INCLUDED -// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. Permission to copy, -// use, modify, sell and distribute this software is granted provided this -// copyright notice appears in all copies. This software is provided "as is" -// without express or implied warranty, and with no claim as to its -// suitability for any purpose. +// +// smart_ptr.hpp +// +// For convenience, this header includes the rest of the smart +// pointer library headers. +// +// Copyright (c) 2003 Peter Dimov Distributed under the Boost +// Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// +// http://www.boost.org/libs/smart_ptr/smart_ptr.htm +// -// See http://www.boost.org for most recent version including documentation. +#include -// Revision History -// 6 Jul 01 Reorder shared_ptr code so VC++ 6 member templates work, allowing -// polymorphic pointers to now work with that compiler (Gary Powell) -// 21 May 01 Require complete type where incomplete type is unsafe. -// (suggested by Vladimir Prus) -// 21 May 01 operator= fails if operand transitively owned by *this, as in a -// linked list (report by Ken Johnson, fix by Beman Dawes) -// 21 Jan 01 Suppress some useless warnings with MSVC (David Abrahams) -// 19 Oct 00 Make shared_ptr ctor from auto_ptr explicit. (Robert Vugts) -// 24 Jul 00 Change throw() to // never throws. See lib guidelines -// Exception-specification rationale. (Beman Dawes) -// 22 Jun 00 Remove #if continuations to fix GCC 2.95.2 problem (Beman Dawes) -// 1 Feb 00 Additional shared_ptr BOOST_NO_MEMBER_TEMPLATES workarounds -// (Dave Abrahams) -// 31 Dec 99 Condition tightened for no member template friend workaround -// (Dave Abrahams) -// 30 Dec 99 Moved BOOST_NMEMBER_TEMPLATES compatibility code to config.hpp -// (Dave Abrahams) -// 30 Nov 99 added operator ==, operator !=, and std::swap and std::less -// specializations for shared types (Darin Adler) -// 11 Oct 99 replaced op[](int) with op[](std::size_t) (Ed Brey, Valentin -// Bonnard), added shared_ptr workaround for no member template -// friends (Matthew Langston) -// 25 Sep 99 added shared_ptr::swap and shared_array::swap (Luis Coelho). -// 20 Jul 99 changed name to smart_ptr.hpp, #include , -// #include and use boost::noncopyable -// 17 May 99 remove scoped_array and shared_array operator*() as -// unnecessary (Beman Dawes) -// 14 May 99 reorder code so no effects when bad_alloc thrown (Abrahams/Dawes) -// 13 May 99 remove certain throw() specifiers to avoid generated try/catch -// code cost (Beman Dawes) -// 11 May 99 get() added, conversion to T* placed in macro guard (Valentin -// Bonnard, Dave Abrahams, and others argued for elimination -// of the automatic conversion) -// 28 Apr 99 #include fix (Valentin Bonnard) -// 28 Apr 99 rename transfer() to share() for clarity (Dave Abrahams) -// 28 Apr 99 remove unsafe shared_array template conversions(Valentin Bonnard) -// 28 Apr 99 p(r) changed to p(r.px) for clarity (Dave Abrahams) -// 21 Apr 99 reset() self assignment fix (Valentin Bonnard) -// 21 Apr 99 dispose() provided to improve clarity (Valentin Bonnard) -// 27 Apr 99 leak when new throws fixes (Dave Abrahams) -// 21 Oct 98 initial Version (Greg Colvin/Beman Dawes) +#include +#include +#include +#include -#ifndef BOOST_SMART_PTR_HPP -#define BOOST_SMART_PTR_HPP - -#include // for broken compiler workarounds -#include // for std::size_t -#include // for std::auto_ptr -#include // for std::swap -#include // for boost::noncopyable, checked_delete, checked_array_delete -#include // for std::less -#include // for BOOST_STATIC_ASSERT - -#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash -# pragma warning(push) -# pragma warning(disable:4284) // return type for 'identifier::operator->' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation -#endif - -namespace boost { - -// scoped_ptr --------------------------------------------------------------// - -// scoped_ptr mimics a built-in pointer except that it guarantees deletion -// of the object pointed to, either on destruction of the scoped_ptr or via -// an explicit reset(). scoped_ptr is a simple solution for simple needs; -// see shared_ptr (below) or std::auto_ptr if your needs are more complex. - -template class scoped_ptr : noncopyable { - - T* ptr; - - public: - typedef T element_type; - - explicit scoped_ptr( T* p=0 ) : ptr(p) {} // never throws - ~scoped_ptr() { checked_delete(ptr); } - void reset( T* p=0 ) { if ( ptr != p ) { checked_delete(ptr); ptr = p; } } - T& operator*() const { return *ptr; } // never throws - T* operator->() const { return ptr; } // never throws - T* get() const { return ptr; } // never throws -#ifdef BOOST_SMART_PTR_CONVERSION - // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! - operator T*() const { return ptr; } // never throws -#endif - }; // scoped_ptr - -// scoped_array ------------------------------------------------------------// - -// scoped_array extends scoped_ptr to arrays. Deletion of the array pointed to -// is guaranteed, either on destruction of the scoped_array or via an explicit -// reset(). See shared_array or std::vector if your needs are more complex. - -template class scoped_array : noncopyable { - - T* ptr; - - public: - typedef T element_type; - - explicit scoped_array( T* p=0 ) : ptr(p) {} // never throws - ~scoped_array() { checked_array_delete(ptr); } - - void reset( T* p=0 ) { if ( ptr != p ) - {checked_array_delete(ptr); ptr=p;} } - - T* get() const { return ptr; } // never throws -#ifdef BOOST_SMART_PTR_CONVERSION - // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! - operator T*() const { return ptr; } // never throws -#else - T& operator[](std::size_t i) const { return ptr[i]; } // never throws -#endif - }; // scoped_array - -// shared_ptr --------------------------------------------------------------// - -// An enhanced relative of scoped_ptr with reference counted copy semantics. -// The object pointed to is deleted when the last shared_ptr pointing to it -// is destroyed or reset. - -template class shared_ptr { - public: - typedef T element_type; - - explicit shared_ptr(T* p =0) : px(p) { - try { pn = new long(1); } // fix: prevent leak if new throws - catch (...) { checked_delete(p); throw; } - } - - ~shared_ptr() { dispose(); } - -#if !defined( BOOST_NO_MEMBER_TEMPLATES ) || defined (BOOST_MSVC6_MEMBER_TEMPLATES) - template - shared_ptr(const shared_ptr& r) : px(r.px) { // never throws - ++*(pn = r.pn); - } -#ifndef BOOST_NO_AUTO_PTR - template - explicit shared_ptr(std::auto_ptr& r) { - pn = new long(1); // may throw - px = r.release(); // fix: moved here to stop leak if new throws - } -#endif - - template - shared_ptr& operator=(const shared_ptr& r) { - share(r.px,r.pn); - return *this; - } - -#ifndef BOOST_NO_AUTO_PTR - template - shared_ptr& operator=(std::auto_ptr& r) { - // code choice driven by guarantee of "no effect if new throws" - if (*pn == 1) { checked_delete(px); } - else { // allocate new reference counter - long * tmp = new long(1); // may throw - --*pn; // only decrement once danger of new throwing is past - pn = tmp; - } // allocate new reference counter - px = r.release(); // fix: moved here so doesn't leak if new throws - return *this; - } -#endif -#else -#ifndef BOOST_NO_AUTO_PTR - explicit shared_ptr(std::auto_ptr& r) { - pn = new long(1); // may throw - px = r.release(); // fix: moved here to stop leak if new throws - } - - shared_ptr& operator=(std::auto_ptr& r) { - // code choice driven by guarantee of "no effect if new throws" - if (*pn == 1) { checked_delete(px); } - else { // allocate new reference counter - long * tmp = new long(1); // may throw - --*pn; // only decrement once danger of new throwing is past - pn = tmp; - } // allocate new reference counter - px = r.release(); // fix: moved here so doesn't leak if new throws - return *this; - } -#endif +#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES) +# include +# include +# include +# include #endif - // The assignment operator and the copy constructor must come after - // the templated versions for MSVC6 to work. (Gary Powell) - shared_ptr(const shared_ptr& r) : px(r.px) { ++*(pn = r.pn); } // never throws - - shared_ptr& operator=(const shared_ptr& r) { - share(r.px,r.pn); - return *this; - } - - void reset(T* p=0) { - if ( px == p ) return; // fix: self-assignment safe - if (--*pn == 0) { checked_delete(px); } - else { // allocate new reference counter - try { pn = new long; } // fix: prevent leak if new throws - catch (...) { - ++*pn; // undo effect of --*pn above to meet effects guarantee - checked_delete(p); - throw; - } // catch - } // allocate new reference counter - *pn = 1; - px = p; - } // reset - - T& operator*() const { return *px; } // never throws - T* operator->() const { return px; } // never throws - T* get() const { return px; } // never throws - #ifdef BOOST_SMART_PTR_CONVERSION - // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! - operator T*() const { return px; } // never throws - #endif - - long use_count() const { return *pn; } // never throws - bool unique() const { return *pn == 1; } // never throws - - void swap(shared_ptr& other) // never throws - { std::swap(px,other.px); std::swap(pn,other.pn); } - -// Tasteless as this may seem, making all members public allows member templates -// to work in the absence of member template friends. (Matthew Langston) -// Don't split this line into two; that causes problems for some GCC 2.95.2 builds -#if ( defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) ) || !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS ) - private: -#endif - - T* px; // contained pointer - long* pn; // ptr to reference counter - -// Don't split this line into two; that causes problems for some GCC 2.95.2 builds -#if !defined( BOOST_NO_MEMBER_TEMPLATES ) && !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS ) - template friend class shared_ptr; -#endif - - void dispose() { if (--*pn == 0) { checked_delete(px); delete pn; } } - - void share(T* rpx, long* rpn) { - if (pn != rpn) { // Q: why not px != rpx? A: fails when both == 0 - ++*rpn; // done before dispose() in case rpn transitively - // dependent on *this (bug reported by Ken Johnson) - dispose(); - px = rpx; - pn = rpn; - } - } // share -}; // shared_ptr - -template - inline bool operator==(const shared_ptr& a, const shared_ptr& b) - { return a.get() == b.get(); } - -template - inline bool operator!=(const shared_ptr& a, const shared_ptr& b) - { return a.get() != b.get(); } - -// shared_array ------------------------------------------------------------// - -// shared_array extends shared_ptr to arrays. -// The array pointed to is deleted when the last shared_array pointing to it -// is destroyed or reset. - -template class shared_array { - public: - typedef T element_type; - - explicit shared_array(T* p =0) : px(p) { - try { pn = new long(1); } // fix: prevent leak if new throws - catch (...) { checked_array_delete(p); throw; } - } - - shared_array(const shared_array& r) : px(r.px) // never throws - { ++*(pn = r.pn); } - - ~shared_array() { dispose(); } - - shared_array& operator=(const shared_array& r) { - if (pn != r.pn) { // Q: why not px != r.px? A: fails when both px == 0 - ++*r.pn; // done before dispose() in case r.pn transitively - // dependent on *this (bug reported by Ken Johnson) - dispose(); - px = r.px; - pn = r.pn; - } - return *this; - } // operator= - - void reset(T* p=0) { - if ( px == p ) return; // fix: self-assignment safe - if (--*pn == 0) { checked_array_delete(px); } - else { // allocate new reference counter - try { pn = new long; } // fix: prevent leak if new throws - catch (...) { - ++*pn; // undo effect of --*pn above to meet effects guarantee - checked_array_delete(p); - throw; - } // catch - } // allocate new reference counter - *pn = 1; - px = p; - } // reset - - T* get() const { return px; } // never throws - #ifdef BOOST_SMART_PTR_CONVERSION - // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! - operator T*() const { return px; } // never throws - #else - T& operator[](std::size_t i) const { return px[i]; } // never throws - #endif - - long use_count() const { return *pn; } // never throws - bool unique() const { return *pn == 1; } // never throws - - void swap(shared_array& other) // never throws - { std::swap(px,other.px); std::swap(pn,other.pn); } - - private: - - T* px; // contained pointer - long* pn; // ptr to reference counter - - void dispose() { if (--*pn == 0) { checked_array_delete(px); delete pn; } } - -}; // shared_array - -template - inline bool operator==(const shared_array& a, const shared_array& b) - { return a.get() == b.get(); } - -template - inline bool operator!=(const shared_array& a, const shared_array& b) - { return a.get() != b.get(); } - -} // namespace boost - -// specializations for things in namespace std -----------------------------// - -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - -namespace std { - -// Specialize std::swap to use the fast, non-throwing swap that's provided -// as a member function instead of using the default algorithm which creates -// a temporary and uses assignment. - -template - inline void swap(boost::shared_ptr& a, boost::shared_ptr& b) - { a.swap(b); } - -template - inline void swap(boost::shared_array& a, boost::shared_array& b) - { a.swap(b); } - -// Specialize std::less so we can use shared pointers and arrays as keys in -// associative collections. - -// It's still a controversial question whether this is better than supplying -// a full range of comparison operators (<, >, <=, >=). - -template - struct less< boost::shared_ptr > - : binary_function, boost::shared_ptr, bool> - { - bool operator()(const boost::shared_ptr& a, - const boost::shared_ptr& b) const - { return less()(a.get(),b.get()); } - }; - -template - struct less< boost::shared_array > - : binary_function, boost::shared_array, bool> - { - bool operator()(const boost::shared_array& a, - const boost::shared_array& b) const - { return less()(a.get(),b.get()); } - }; - -} // namespace std - -#endif // ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif - -#endif // BOOST_SMART_PTR_HPP - - +#endif // #ifndef BOOST_SMART_PTR_HPP_INCLUDED diff --git a/src/external/3rd/library/boost/boost/static_assert.hpp b/src/external/3rd/library/boost/boost/static_assert.hpp index 4d38b9d71..d083a9c37 100644 --- a/src/external/3rd/library/boost/boost/static_assert.hpp +++ b/src/external/3rd/library/boost/boost/static_assert.hpp @@ -1,21 +1,40 @@ // (C) Copyright John Maddock 2000. -// Permission to copy, use, modify, sell and -// distribute this software is granted provided this copyright notice appears -// in all copies. This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// See http://www.boost.org for most recent version including documentation. +// See http://www.boost.org/libs/static_assert for documentation. /* Revision history: - 02 August 2000 - Initial version. + 02 August 2000 + Initial version. */ #ifndef BOOST_STATIC_ASSERT_HPP #define BOOST_STATIC_ASSERT_HPP #include +#include + +#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) +// +// This is horrible, but it seems to be the only we can shut up the +// "anonymous variadic macros were introduced in C99 [-Wvariadic-macros]" +// warning that get spewed out otherwise in non-C++11 mode. +// +#pragma GCC system_header +#endif + +#ifndef BOOST_NO_CXX11_STATIC_ASSERT +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__) +# else +# define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B ) +# endif +#else +# define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B ) +#endif #ifdef __BORLANDC__ // @@ -23,12 +42,51 @@ #define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS #endif +#if defined(__GNUC__) && (__GNUC__ == 3) && ((__GNUC_MINOR__ == 3) || (__GNUC_MINOR__ == 4)) +// gcc 3.3 and 3.4 don't produce good error messages with the default version: +# define BOOST_SA_GCC_WORKAROUND +#endif + +// +// If the compiler issues warnings about old C style casts, +// then enable this: +// +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))) +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) ((__VA_ARGS__) == 0 ? false : true) +# else +# define BOOST_STATIC_ASSERT_BOOL_CAST( x ) ((x) == 0 ? false : true) +# endif +#else +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) (bool)(__VA_ARGS__) +# else +# define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x) +# endif +#endif +// +// If the compiler warns about unused typedefs then enable this: +// +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) +# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused)) +#else +# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE +#endif + +#ifndef BOOST_NO_CXX11_STATIC_ASSERT +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__) +# else +# define BOOST_STATIC_ASSERT( B ) static_assert(B, #B) +# endif +#else + namespace boost{ // HP aCC cannot deal with missing names for template value parameters template struct STATIC_ASSERTION_FAILURE; -template <> struct STATIC_ASSERTION_FAILURE{}; +template <> struct STATIC_ASSERTION_FAILURE { enum { value = 1 }; }; // HP aCC cannot deal with missing names for template value parameters template struct static_assert_test{}; @@ -57,39 +115,81 @@ template struct static_assert_test{}; // style casts: too many compilers currently have problems with static_cast // when used inside integral constant expressions. // -#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__) -#ifndef BOOST_MSVC -#define BOOST_STATIC_ASSERT( B ) \ - typedef ::boost::static_assert_test<\ - sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\ - BOOST_ASSERT_JOIN(boost_static_assert_typedef_, __LINE__) -#else +#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) + +#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) // __LINE__ macro broken when -ZI is used see Q199057 // fortunately MSVC ignores duplicate typedef's. #define BOOST_STATIC_ASSERT( B ) \ typedef ::boost::static_assert_test<\ sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)\ > boost_static_assert_typedef_ -#endif -#else -// alternative enum based implementation: +#elif defined(BOOST_MSVC) && defined(BOOST_NO_CXX11_VARIADIC_MACROS) #define BOOST_STATIC_ASSERT( B ) \ - enum { BOOST_ASSERT_JOIN(boost_static_assert_enum_, __LINE__) \ - = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) } + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST ( B ) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __COUNTER__) +#elif defined(BOOST_MSVC) +#define BOOST_STATIC_ASSERT(...) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST (__VA_ARGS__) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __COUNTER__) +#elif (defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND)) && defined(BOOST_NO_CXX11_VARIADIC_MACROS) +// agurt 15/sep/02: a special care is needed to force Intel C++ issue an error +// instead of warning in case of failure +# define BOOST_STATIC_ASSERT( B ) \ + typedef char BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \ + [ ::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >::value ] +#elif (defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND)) && !defined(BOOST_NO_CXX11_VARIADIC_MACROS) +// agurt 15/sep/02: a special care is needed to force Intel C++ issue an error +// instead of warning in case of failure +# define BOOST_STATIC_ASSERT(...) \ + typedef char BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \ + [ ::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( __VA_ARGS__ ) >::value ] +#elif defined(__sgi) +// special version for SGI MIPSpro compiler +#define BOOST_STATIC_ASSERT( B ) \ + BOOST_STATIC_CONSTANT(bool, \ + BOOST_JOIN(boost_static_assert_test_, __LINE__) = ( B )); \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< \ + BOOST_JOIN(boost_static_assert_test_, __LINE__) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __LINE__) +#elif BOOST_WORKAROUND(__MWERKS__, <= 0x3003) +// special version for CodeWarrior <= 8.x +#define BOOST_STATIC_ASSERT( B ) \ + BOOST_STATIC_CONSTANT(int, \ + BOOST_JOIN(boost_static_assert_test_, __LINE__) = \ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >) ) +#else +// generic version +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT( ... ) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( __VA_ARGS__ ) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE +# else +# define BOOST_STATIC_ASSERT( B ) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE +# endif #endif -// -// The following piece of macro magic joins the two -// arguments together, even when one of the arguments is -// itself a macro (see 16.3.1 in C++ standard). The key -// is that macro expansion of macro arguments does not -// occur in BOOST_DO_ASSERT_JOIN but does in BOOST_ASSERT_JOIN -// provided it is called from within another macro. -#define BOOST_ASSERT_JOIN( X, Y ) BOOST_DO_ASSERT_JOIN( X, Y ) -#define BOOST_DO_ASSERT_JOIN( X, Y ) X##Y +#else +// alternative enum based implementation: +# ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_STATIC_ASSERT( ... ) \ + enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \ + = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( __VA_ARGS__ ) >) } +# else +# define BOOST_STATIC_ASSERT(B) \ + enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \ + = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) } +# endif +#endif +#endif // defined(BOOST_NO_CXX11_STATIC_ASSERT) #endif // BOOST_STATIC_ASSERT_HPP - - diff --git a/src/external/3rd/library/boost/boost/utility.hpp b/src/external/3rd/library/boost/boost/utility.hpp index f1a638913..82177c8b4 100644 --- a/src/external/3rd/library/boost/boost/utility.hpp +++ b/src/external/3rd/library/boost/boost/utility.hpp @@ -1,119 +1,21 @@ -// boost utility.hpp header file -------------------------------------------// +// Boost utility.hpp header file -------------------------------------------// -// (C) Copyright boost.org 1999. Permission to copy, use, modify, sell -// and distribute this software is granted provided this copyright -// notice appears in all copies. This software is provided "as is" without -// express or implied warranty, and with no claim as to its suitability for -// any purpose. +// Copyright 1999-2003 Aleksey Gurtovoy. Use, modification, and distribution are +// subject to the Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or a copy at .) -// See http://www.boost.org for most recent version including documentation. - -// Classes appear in alphabetical order - -// Revision History -// 21 May 01 checked_delete() and checked_array_delete() added (Beman Dawes, -// suggested by Dave Abrahams, generalizing idea from Vladimir Prus) -// 21 May 01 made next() and prior() inline (Beman Dawes) -// 26 Jan 00 protected noncopyable destructor added (Miki Jovanovic) -// 10 Dec 99 next() and prior() templates added (Dave Abrahams) -// 30 Aug 99 moved cast templates to cast.hpp (Beman Dawes) -// 3 Aug 99 cast templates added -// 20 Jul 99 name changed to utility.hpp -// 9 Jun 99 protected noncopyable default ctor -// 2 Jun 99 Initial Version. Class noncopyable only contents (Dave Abrahams) +// See for the library's home page. #ifndef BOOST_UTILITY_HPP #define BOOST_UTILITY_HPP -#include // broken compiler workarounds -#include -#include // for size_t -#include // for std::pair - -namespace boost -{ -// checked_delete() and checked_array_delete() -----------------------------// - - // verify that types are complete for increased safety - - template< typename T > - inline void checked_delete(T * x) - { - BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point - // of instantiation - delete x; - } - - template< typename T > - inline void checked_array_delete(T * x) - { - BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point - // of instantiation - delete [] x; - } - -// next() and prior() template functions -----------------------------------// - - // Helper functions for classes like bidirectional iterators not supporting - // operator+ and operator-. - // - // Usage: - // const std::list::iterator p = get_some_iterator(); - // const std::list::iterator prev = boost::prior(p); - - // Contributed by Dave Abrahams - - template - inline T next(T x) { return ++x; } - - template - inline T prior(T x) { return --x; } - - -// class noncopyable -------------------------------------------------------// - - // Private copy constructor and copy assignment ensure classes derived from - // class noncopyable cannot be copied. - - // Contributed by Dave Abrahams - - class noncopyable - { - protected: - noncopyable(){} - ~noncopyable(){} - private: // emphasize the following members are private - noncopyable( const noncopyable& ); - const noncopyable& operator=( const noncopyable& ); - }; // noncopyable - -// class tied -------------------------------------------------------// - - // A helper for conveniently assigning the two values from a pair - // into separate variables. The idea for this comes from Jaakko J„rvi's - // Binder/Lambda Library. - - // Constributed by Jeremy Siek - - template - class tied { - public: - inline tied(A& a, B& b) : _a(a), _b(b) { } - template - inline tied& operator=(const std::pair& p) { - _a = p.first; - _b = p.second; - return *this; - } - protected: - A& _a; - B& _b; - }; - - template - inline tied tie(A& a, B& b) { return tied(a, b); } - -} // namespace boost +#include +#include +#include +#include +#include +#include +#include +#include #endif // BOOST_UTILITY_HPP - diff --git a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj.filters b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj.filters index b8d333d50..83bf57e86 100644 --- a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj.filters +++ b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj.filters @@ -2,37 +2,37 @@ - {d9a8ca40-3713-40e6-98e6-a60593493a1e} + {5e9ec0d8-ccfc-453c-9d24-d34bc38f44e2} - {ee0b7a60-fd0a-4f76-8a1f-23f87064180e} + {ddd04f3b-702b-4f5f-8e6a-642ee4ee8124} - {81590469-196d-4813-a63a-5a7ad82b0363} + {97e81e68-11b4-4b28-8d4a-3f842f61a146} - {ba55801e-2994-429f-8eb1-c0cf6105c3a4} + {2da37be5-f9ab-4def-a578-903742f4f3a7} - {bdeebed1-e284-47c5-9fbb-e91ce1bf013f} + {37754677-6be7-4aa3-b73a-842ffd013072} - {8f5368a0-b595-4650-a595-b1ca078be6c7} + {3512499e-9fd0-4c17-a8ab-370372751ecf} - {cb5522bb-d33c-4f3b-9f6b-44d0ae9c7f06} + {09ac7731-a408-4fe6-bf40-0ce0f85bcfd5} - {a46451a0-c7e6-4764-b685-5a2d4d34590b} + {3a2b882e-0a15-435e-9c07-b6e78e2b52bf} - {d322edb0-b6ce-40d5-b9ab-99ef74c420f1} + {44872fae-7447-473f-8866-0bd8a62cbb26} - {36576726-5ef8-4029-9d00-1cf2daebfde4} + {a433621c-ef83-475b-b428-db4d785e69f0} - {c4343274-64c7-4587-bd9e-578cce5a0283} + {0a6c67e7-d503-4b56-8dbc-64864fb2aa02} diff --git a/src/external/3rd/library/platform/MonAPI2/MonitorData.h b/src/external/3rd/library/platform/MonAPI2/MonitorData.h index 08cbce998..1146d83e4 100644 --- a/src/external/3rd/library/platform/MonAPI2/MonitorData.h +++ b/src/external/3rd/library/platform/MonAPI2/MonitorData.h @@ -7,7 +7,7 @@ // ********************************************************************************************** // ********************************************************************************************** //#include -#include "../../udplibrary/UdpLibrary.hpp" +#include #define CURRENT_API_VERSION 3 #define CURRENT_API_1 1 diff --git a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj.filters b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj.filters index 54a49b317..baae8d914 100644 --- a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj.filters +++ b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj.filters @@ -2,11 +2,11 @@ - {dd915c47-7a58-4aed-8ccc-c53db6384d62} + {16b11bcc-0470-465f-a293-50acf91157b4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {853d9aeb-7c8c-4ceb-9bf7-3012bf5b2057} + {2796b303-574c-494b-82ec-5b33e6f58b8f} h;hpp;hxx;hm;inl diff --git a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp index 9282cf20e..4856d6e21 100644 --- a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp +++ b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp @@ -189,7 +189,7 @@ CConnectionManager::CConnectionManager(apiCore & parent, std::vector - {acaae4d1-8db5-4caf-912a-001a65a9f78a} + {2e8b09ce-9da8-4855-93ee-43c84142ce8c} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {b9363855-ceba-4116-8841-1ef72029d14c} + {d246c862-2330-4bc7-8afb-aa991fd83bab} h;hpp;hxx;hm;inl diff --git a/src/external/3rd/library/platform/projects/Session/LoginAPI/Messages.cpp b/src/external/3rd/library/platform/projects/Session/LoginAPI/Messages.cpp index ca246ef19..2f3b0f4c0 100644 --- a/src/external/3rd/library/platform/projects/Session/LoginAPI/Messages.cpp +++ b/src/external/3rd/library/platform/projects/Session/LoginAPI/Messages.cpp @@ -24,7 +24,7 @@ namespace Base void put(ByteStream & target, const LoginAPI::UsageLimit & source) { - unsigned next = source.GetNextAllowance(); + unsigned next = static_cast(source.GetNextAllowance()); put(target, source.GetType()); put(target, source.GetAllowance()); put(target, next); diff --git a/src/external/3rd/library/platform/utils/Base/Archive.h b/src/external/3rd/library/platform/utils/Base/Archive.h index 0a0a162df..c461f4d74 100644 --- a/src/external/3rd/library/platform/utils/Base/Archive.h +++ b/src/external/3rd/library/platform/utils/Base/Archive.h @@ -569,7 +569,7 @@ const unsigned MAX_ARRAY_SIZE = 1024; template void AutoVariable::pack(ByteStream & target) const { - Base::put(target, value); + put(target, value); } template @@ -581,7 +581,8 @@ const unsigned MAX_ARRAY_SIZE = 1024; template void AutoVariable::unpack(ByteStream::ReadIterator & source) { - Base::get(source, value); + using Base::get; + get(source, value); } @@ -644,7 +645,7 @@ const unsigned MAX_ARRAY_SIZE = 1024; for(i = array.begin(); i != array.end(); ++i) { ValueType v = (*i); - Base::put(target, v); + put(target, v); } } @@ -658,9 +659,10 @@ const unsigned MAX_ARRAY_SIZE = 1024; if (arraySize > MAX_ARRAY_SIZE) arraySize = 0; + using Base::get; for(unsigned int i = 0; i < arraySize; ++i) { - Base::get(source, v); + get(source, v); array.push_back(v); } } diff --git a/src/external/3rd/library/platform/utils/Base/AutoLog.cpp b/src/external/3rd/library/platform/utils/Base/AutoLog.cpp index a1002f623..833a709a4 100644 --- a/src/external/3rd/library/platform/utils/Base/AutoLog.cpp +++ b/src/external/3rd/library/platform/utils/Base/AutoLog.cpp @@ -6,14 +6,6 @@ #include #include -#ifdef EXTERNAL_DISTRO -namespace NAMESPACE -{ - -#endif -namespace Base -{ - #ifdef WIN32 #include // for NT directory commands #define SLASHCHAR "\\" @@ -23,6 +15,14 @@ namespace Base #define WRONGSLASH '\\' #endif +#ifdef EXTERNAL_DISTRO +namespace NAMESPACE +{ + +#endif +namespace Base +{ + // set default values for global masks CAutoLog::eLogLevel CAutoLog::nLogMask = eLOG_NORMAL; // what is logged in log files CAutoLog::eLogLevel CAutoLog::nPrintMask = eLOG_ERROR; // what is printed on the screen @@ -41,7 +41,11 @@ bool CAutoLog::Open(const char * filename) if (pFilename) return false; +#ifdef WIN32 + pFilename = _strdup(filename); +#else pFilename = strdup(filename); +#endif // Sanitize slashes char *ptr; @@ -288,7 +292,7 @@ void CAutoLog::Archive(void) else sprintf(strCurrent,"."); - sprintf(strPath,"%s"SLASHCHAR"%s", strCurrent, strTime); // logs/041698 + sprintf(strPath,"%s" SLASHCHAR "%s", strCurrent, strTime); // logs/041698 #ifdef WIN32 // remember current directory @@ -331,7 +335,7 @@ void CAutoLog::Archive(void) else pCurrent++; - sprintf(strCurrent,"%s"SLASHCHAR"%s",strPath,pCurrent); + sprintf(strCurrent,"%s" SLASHCHAR "%s",strPath,pCurrent); fflush(pFile); fclose(pFile); diff --git a/src/external/3rd/library/platform/utils/Base/MD5.h b/src/external/3rd/library/platform/utils/Base/MD5.h index b78a8db63..374a2da8b 100644 --- a/src/external/3rd/library/platform/utils/Base/MD5.h +++ b/src/external/3rd/library/platform/utils/Base/MD5.h @@ -30,7 +30,7 @@ namespace Base }; public: - MD5::MD5(); + MD5(); MD5(const std::string &input); void Init(); diff --git a/src/external/3rd/library/platform/utils/Base/linux/Types.h b/src/external/3rd/library/platform/utils/Base/linux/Types.h index bc869bac6..6ee504505 100644 --- a/src/external/3rd/library/platform/utils/Base/linux/Types.h +++ b/src/external/3rd/library/platform/utils/Base/linux/Types.h @@ -21,9 +21,9 @@ namespace NAMESPACE namespace Base { -#define INT32_MAX 0x7FFFFFFF -#define INT32_MIN 0x80000000 -#define UINT32_MAX 0xFFFFFFFF +//#define INT32_MAX 0x7FFFFFFF +//#define INT32_MIN 0x80000000 +//#define UINT32_MAX 0xFFFFFFFF typedef signed char int8; typedef unsigned char uint8; diff --git a/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj.filters b/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj.filters index 34867ce0b..21edf66ae 100644 --- a/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj.filters +++ b/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj.filters @@ -2,19 +2,19 @@ - {661b6d16-3526-45cc-b209-2c7a96cb8bb3} + {cc54545d-17cd-4690-9c6f-8ca2b3673820} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {86ad7e99-9f32-4427-a8a3-e0218bc39095} + {645d5db1-1489-4689-8dc9-5a692793e279} cpp - {99ae1de9-294a-4986-8a79-c44c4213548a} + {4da7cc5d-4f2c-4b0a-af1b-20f2dadf6651} h;hpp;hxx;hm;inl - {facb1cf4-c0da-432f-a603-19619c78d925} + {c52967d4-4fcb-4727-9f98-c96819e3a9c9} h diff --git a/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp b/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp index 48805b40a..c9d48ca34 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp +++ b/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp @@ -457,10 +457,7 @@ int main(int argc, char **argv) #ifdef AUTO_RUN ResetGlobals(); - serverhost = "sdplatdev2.station.sony.com"; - //serverhost = "64.37.152.161"; - //serverport = 3018; - //serverhost = "64.37.153.15"; + serverhost = "localhost"; serverport = 3009; if (argc > 1) gamep = argv[1]; diff --git a/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h b/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h index 2bda381c3..0f642423e 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h +++ b/src/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h @@ -52,7 +52,7 @@ struct timeout { inline timeout() { time = 0; - track = 0; + track = 0; } inline timeout(unsigned tr, int ti) { @@ -157,7 +157,7 @@ private: void SubmitImmediateError(Response *res); Response *getPending(CSAssistGameAPITrack track); Response *getResponse(CSAssistGameAPITrack track); - Response *CSAssistGameAPIcore::createServerResponse(short msgtype); + Response *createServerResponse(short msgtype); void SubmitRequestInt(Request *req, Response *res); Response *getPendingInt(CSAssistGameAPITrack track); Response *getResponseInt(CSAssistGameAPITrack track); diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp index 9302547da..1afab8220 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp @@ -68,25 +68,25 @@ namespace Base } #endif - ByteStream::ReadIterator::ReadIterator() : + ReadIterator::ReadIterator() : readPtr(0), stream(0) { } - ByteStream::ReadIterator::ReadIterator(const ReadIterator & source) : + ReadIterator::ReadIterator(const ReadIterator & source) : readPtr(source.readPtr), stream(source.stream) { } - ByteStream::ReadIterator::ReadIterator(const ByteStream & source) : + ReadIterator::ReadIterator(const ByteStream & source) : readPtr(0), stream(&source) { } - ByteStream::ReadIterator::~ReadIterator() + ReadIterator::~ReadIterator() { stream = 0; } diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp index d216c1314..8a33008a5 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp @@ -288,7 +288,7 @@ void CAutoLog::Archive(void) else sprintf(strCurrent,"."); - sprintf(strPath,"%s"SLASHCHAR"%s", strCurrent, strTime); // logs/041698 + sprintf(strPath,"%s" SLASHCHAR "%s", strCurrent, strTime); // logs/041698 #ifdef WIN32 // remember current directory @@ -331,7 +331,7 @@ void CAutoLog::Archive(void) else pCurrent++; - sprintf(strCurrent,"%s"SLASHCHAR"%s",strPath,pCurrent); + sprintf(strCurrent,"%s" SLASHCHAR "%s",strPath,pCurrent); fflush(pFile); fclose(pFile); diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h index 56ad96af2..864506f32 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h @@ -26,9 +26,9 @@ # while (string = config.GetString(NULL)) # YourHandleString(string); [HOSTS] - "206.19.151.173:5999" - "206.19.151.173:5998" - "206.19.151.173:2000" + "127.0.0.1:5999" + "127.0.0.1:5998" + "127.0.0.1:2000" */ diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h index b78a8db63..935a7ae38 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h @@ -10,17 +10,17 @@ #ifdef EXTERNAL_DISTRO -namespace NAMESPACE +namespace NAMESPACE { #endif -namespace Base +namespace Base { - class MD5 + class MD5 { - struct State + struct State { State(); @@ -30,7 +30,7 @@ namespace Base }; public: - MD5::MD5(); + MD5(); MD5(const std::string &input); void Init(); diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeBlocks.cpp b/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeBlocks.cpp index 0b8194b11..e0ed5f8e3 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeBlocks.cpp +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeBlocks.cpp @@ -10,6 +10,8 @@ #include "FirstUnicode.h" #include "UnicodeBlocks.h" +#include + // ====================================================================== #ifdef EXTERNAL_DISTRO namespace NAMESPACE diff --git a/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.cpp b/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.cpp index 71e2c0c89..84c2381cb 100644 --- a/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.cpp +++ b/src/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.cpp @@ -13,6 +13,7 @@ #include "UnicodeBlocks.h" #include "UnicodeCharacterData.h" +#include #include #include #include diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h index c8c44e24d..856dcd95e 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h @@ -19,10 +19,10 @@ #include "Platform.h" -#if defined _MT || defined _REENTRANT -# define USE_ARCHIVE_MUTEX -# include "Mutex.h" -#endif +//#if defined _MT || defined _REENTRANT +//# define USE_ARCHIVE_MUTEX +//# include "Mutex.h" +//#endif #ifdef WIN32 # include "win32/Archive.h" @@ -321,6 +321,171 @@ const unsigned MAX_ARRAY_SIZE = 1024; } +//////////////////////////////////////////////////////////////////////////////// + + + inline void get(ByteStream::ReadIterator & source, ByteStream & target) + { + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); + } + + inline void get(ByteStream::ReadIterator & source, double & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, float & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint64 & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int64 & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint32 & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int32 & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint16 & target) + { + source.get(&target, 2); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int16 & target) + { + source.get(&target, 2); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint8 & target) + { + source.get(&target, 1); + } + + inline void get(ByteStream::ReadIterator & source, int8 & target) + { + source.get(&target, 1); + } + + inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) + { + source.get(target, targetSize); + } + + inline void get(ByteStream::ReadIterator & source, bool & target) + { + source.get(&target, 1); + } + + +//////////////////////////////////////////////////////////////////////////////// + + + inline void put(ByteStream & target, ByteStream::ReadIterator & source) + { + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); + } + + inline void put(ByteStream & target, const double value) + { + double temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const float value) + { + float temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const uint64 value) + { + uint64 temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const int64 value) + { + int64 temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const uint32 value) + { + uint32 temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const int32 value) + { + int32 temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const uint16 value) + { + uint16 temp = byteSwap(value); + target.put(&temp, 2); + } + + inline void put(ByteStream & target, const int16 value) + { + int16 temp = byteSwap(value); + target.put(&temp, 2); + } + + inline void put(ByteStream & target, const uint8 value) + { + target.put(&value, 1); + } + + inline void put(ByteStream & target, const int8 value) + { + target.put(&value, 1); + } + + inline void put(ByteStream & target, const bool & source) + { + target.put(&source, 1); + } + + + inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) + { + target.put(source, sourceSize); + } + + inline void put(ByteStream & target, const ByteStream & source) + { + target.put(source.begin().getBuffer(), source.begin().getSize()); + } + + void get(ByteStream::ReadIterator & source, std::string & target); + void put(ByteStream & target, const std::string & source); + + //////////////////////////////////////////////////////////////////////////////// @@ -499,171 +664,6 @@ const unsigned MAX_ARRAY_SIZE = 1024; } -//////////////////////////////////////////////////////////////////////////////// - - - inline void get(ByteStream::ReadIterator & source, ByteStream & target) - { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); - } - - inline void get(ByteStream::ReadIterator & source, double & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) - { - source.get(target, targetSize); - } - - inline void get(ByteStream::ReadIterator & source, bool & target) - { - source.get(&target, 1); - } - - -//////////////////////////////////////////////////////////////////////////////// - - - inline void put(ByteStream & target, ByteStream::ReadIterator & source) - { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); - } - - inline void put(ByteStream & target, const double value) - { - double temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) - { - target.put(source, sourceSize); - } - - inline void put(ByteStream & target, const ByteStream & source) - { - target.put(source.begin().getBuffer(), source.begin().getSize()); - } - - void get(ByteStream::ReadIterator & source, std::string & target); - void put(ByteStream & target, const std::string & source); - - //////////////////////////////////////////////////////////////////////////////// diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.h b/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.h index 92d41799f..af66fc9b1 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.h +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.h @@ -50,7 +50,7 @@ class GenericAPICore public: friend class GenericConnection; - GenericAPICore::GenericAPICore(const char *host, + GenericAPICore(const char *host, short port, unsigned reqTimeout, unsigned reconnectTimeout, diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp b/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp index 055c06aff..57f9b4092 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp @@ -7,8 +7,8 @@ #include "Response.h" const unsigned short EMPTY_STRING[1] = { 0 }; -const char * DEFAULT_GAMECODE = "ZZZ"; -const char * DEFAULT_HOST = "ctservice.station.sony.com"; +const char * DEFAULT_GAMECODE = "SWG"; +const char * DEFAULT_HOST = "localhost"; const unsigned short DEFAULT_PORT = 2000; namespace CTService diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeBlocks.cpp b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeBlocks.cpp index 0b8194b11..e0ed5f8e3 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeBlocks.cpp +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeBlocks.cpp @@ -10,6 +10,8 @@ #include "FirstUnicode.h" #include "UnicodeBlocks.h" +#include + // ====================================================================== #ifdef EXTERNAL_DISTRO namespace NAMESPACE diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.cpp b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.cpp index 71e2c0c89..84c2381cb 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.cpp +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.cpp @@ -13,6 +13,7 @@ #include "UnicodeBlocks.h" #include "UnicodeCharacterData.h" +#include #include #include #include diff --git a/src/external/3rd/library/soePlatform/CTServiceGameAPI/test/test.dsp b/src/external/3rd/library/soePlatform/CTServiceGameAPI/test/test.dsp index 8eff14676..f1a5a8d11 100644 --- a/src/external/3rd/library/soePlatform/CTServiceGameAPI/test/test.dsp +++ b/src/external/3rd/library/soePlatform/CTServiceGameAPI/test/test.dsp @@ -1,101 +1,101 @@ -# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "test - Win32 Release" -# Name "test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=test - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "test.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "test - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "test - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "test - Win32 Release" +# Name "test - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\main.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Archive.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Archive.h index d616b8bae..95c02da8d 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Archive.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Archive.h @@ -333,6 +333,240 @@ const unsigned MAX_ARRAY_SIZE = 1024; //////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + + + inline void get(ByteStream::ReadIterator & source, ByteStream & target) + { + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); + } + + inline void get(ByteStream::ReadIterator & source, double & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, float & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint64 & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int64 & target) + { + source.get(&target, 8); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint32 & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int32 & target) + { + source.get(&target, 4); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint16 & target) + { + source.get(&target, 2); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, int16 & target) + { + source.get(&target, 2); + target = byteSwap(target); + } + + inline void get(ByteStream::ReadIterator & source, uint8 & target) + { + source.get(&target, 1); + } + + inline void get(ByteStream::ReadIterator & source, int8 & target) + { + source.get(&target, 1); + } + + inline unsigned get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) + { + return source.get(target, targetSize); + } + + inline void get(ByteStream::ReadIterator & source, bool & target) + { + source.get(&target, 1); + } + + +//////////////////////////////////////////////////////////////////////////////// + + + inline void put(ByteStream & target, ByteStream::ReadIterator & source) + { + target.put(source.getBuffer(), source.getSize()); + source.advance(source.getSize()); + } + + inline void put(ByteStream & target, const double value) + { + double temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const float value) + { + float temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const uint64 value) + { + uint64 temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const int64 value) + { + int64 temp = byteSwap(value); + target.put(&temp, 8); + } + + inline void put(ByteStream & target, const uint32 value) + { + uint32 temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const int32 value) + { + int32 temp = byteSwap(value); + target.put(&temp, 4); + } + + inline void put(ByteStream & target, const uint16 value) + { + uint16 temp = byteSwap(value); + target.put(&temp, 2); + } + + inline void put(ByteStream & target, const int16 value) + { + int16 temp = byteSwap(value); + target.put(&temp, 2); + } + + inline void put(ByteStream & target, const uint8 value) + { + target.put(&value, 1); + } + + inline void put(ByteStream & target, const int8 value) + { + target.put(&value, 1); + } + + inline void put(ByteStream & target, const bool & source) + { + target.put(&source, 1); + } + + + inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) + { + target.put(source, sourceSize); + } + + inline void put(ByteStream & target, const ByteStream & source) + { + target.put(source.begin().getBuffer(), source.begin().getSize()); + } + + unsigned get(ByteStream::ReadIterator & source, std::string & target); + void put(ByteStream & target, const std::string & source); + + + inline bool overwriteEnd(ByteStream & target, const double value) + { + double temp = byteSwap(value); + return target.overwriteEnd(&temp, 8); + } + + inline bool overwriteEnd(ByteStream & target, const float value) + { + float temp = byteSwap(value); + return target.overwriteEnd(&temp, 4); + } + + inline bool overwriteEnd(ByteStream & target, const uint64 value) + { + uint64 temp = byteSwap(value); + return target.overwriteEnd(&temp, 8); + } + + inline bool overwriteEnd(ByteStream & target, const int64 value) + { + int64 temp = byteSwap(value); + return target.overwriteEnd(&temp, 8); + } + + inline bool overwriteEnd(ByteStream & target, const uint32 value) + { + uint32 temp = byteSwap(value); + return target.overwriteEnd(&temp, 4); + } + + inline bool overwriteEnd(ByteStream & target, const int32 value) + { + int32 temp = byteSwap(value); + return target.overwriteEnd(&temp, 4); + } + + inline bool overwriteEnd(ByteStream & target, const uint16 value) + { + uint16 temp = byteSwap(value); + return target.overwriteEnd(&temp, 2); + } + + inline bool overwriteEnd(ByteStream & target, const int16 value) + { + int16 temp = byteSwap(value); + return target.overwriteEnd(&temp, 2); + } + + inline bool overwriteEnd(ByteStream & target, const uint8 value) + { + return target.overwriteEnd(&value, 1); + } + + inline bool overwriteEnd(ByteStream & target, const int8 value) + { + return target.overwriteEnd(&value, 1); + } + + inline bool overwriteEnd(ByteStream & target, const bool & source) + { + return target.overwriteEnd(&source, 1); + } + + inline bool overwriteEnd(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) + { + return target.overwriteEnd(source, sourceSize); + } + +//////////////////////////////////////////////////////////////////////////////// class AutoVariableBase { @@ -509,243 +743,7 @@ const unsigned MAX_ARRAY_SIZE = 1024; } -//////////////////////////////////////////////////////////////////////////////// - - inline void get(ByteStream::ReadIterator & source, ByteStream & target) - { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); - } - - inline void get(ByteStream::ReadIterator & source, double & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - - inline unsigned get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) - { - return source.get(target, targetSize); - } - - inline void get(ByteStream::ReadIterator & source, bool & target) - { - source.get(&target, 1); - } - - -//////////////////////////////////////////////////////////////////////////////// - - - inline void put(ByteStream & target, ByteStream::ReadIterator & source) - { - target.put(source.getBuffer(), source.getSize()); - source.advance(source.getSize()); - } - - inline void put(ByteStream & target, const double value) - { - double temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) - { - target.put(source, sourceSize); - } - - inline void put(ByteStream & target, const ByteStream & source) - { - target.put(source.begin().getBuffer(), source.begin().getSize()); - } - - unsigned get(ByteStream::ReadIterator & source, std::string & target); - void put(ByteStream & target, const std::string & source); - - -//////////////////////////////////////////////////////////////////////////////// - - - inline bool overwriteEnd(ByteStream & target, const double value) - { - double temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const float value) - { - float temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const uint8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const int8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const bool & source) - { - return target.overwriteEnd(&source, 1); - } - - inline bool overwriteEnd(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) - { - return target.overwriteEnd(source, sourceSize); - } - -//////////////////////////////////////////////////////////////////////////////// }; diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Base64.cpp b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Base64.cpp index fa769c715..e392ccaa5 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Base64.cpp +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Base64.cpp @@ -1,5 +1,9 @@ +#include +#include +#include + #include "Base64.h" -#include + #ifdef EXTERNAL_DISTRO namespace NAMESPACE diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/CmdLine.cpp b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/CmdLine.cpp index a9ffed0ad..7ec7da439 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/CmdLine.cpp +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/CmdLine.cpp @@ -35,6 +35,11 @@ #include "CmdLine.h" //#include "crtdbg.h" + +#include +#include +#include + #include #ifdef EXTERNAL_DISTRO diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/MD5.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/MD5.h index b78a8db63..374a2da8b 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/MD5.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/MD5.h @@ -30,7 +30,7 @@ namespace Base }; public: - MD5::MD5(); + MD5(); MD5(const std::string &input); void Init(); diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Mutex.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Mutex.h index 39ef2b318..79b78513a 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Mutex.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Mutex.h @@ -1,8 +1,6 @@ #ifndef BASE_MUTEX_H #define BASE_MUTEX_H -#include "win32/Mutex.h" - #ifdef WIN32 #include "win32/Mutex.h" diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/GenericAPI/GenericApiCore.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/GenericAPI/GenericApiCore.h index 6313a999c..df5704b75 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/GenericAPI/GenericApiCore.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/GenericAPI/GenericApiCore.h @@ -29,7 +29,7 @@ public: friend class GenericConnection; friend class GenericAPI; - GenericAPICore::GenericAPICore(const char *host, + GenericAPICore(const char *host, short port, unsigned reqTimeout, unsigned reconnectTimeout, diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/Unicode.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/Unicode.h index 3c31835cc..01218f11b 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/Unicode.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/Unicode.h @@ -17,6 +17,8 @@ #pragma warning (disable:4514) #endif +#include +#include #include //----------------------------------------------------------------- diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.cpp b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.cpp index 71e2c0c89..afbd2d699 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.cpp +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.cpp @@ -13,8 +13,9 @@ #include "UnicodeBlocks.h" #include "UnicodeCharacterData.h" +#include #include -#include +#include #include // ====================================================================== diff --git a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeUtils.h b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeUtils.h index 25bd89e88..1cd0ac8be 100644 --- a/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeUtils.h +++ b/src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Unicode/UnicodeUtils.h @@ -18,7 +18,7 @@ #endif #include "Unicode.h" -#include +#include "../Base/Archive.h" #include //----------------------------------------------------------------- @@ -69,7 +69,33 @@ namespace Plat_Unicode * Compare substrings of str2 and str1, each starting with pos and containing n characters */ +// ====================================================================== + //----------------------------------------------------------------- + /** + * Hacky code to correctly handle Cyrillic. + */ + + inline unicode_char_t trueUpper(unicode_char_t letter) + { + if ((cyrillic_lower_first <= letter) && (letter <= cyrillic_lower_last)) { + return letter + (cyrillic_upper_first - cyrillic_lower_first); + } else { + return static_cast(toupper(letter)); + } + } + + inline unicode_char_t trueLower(unicode_char_t letter) + { + if ((cyrillic_upper_first <= letter) && (letter <= cyrillic_upper_last)) { + return letter - (cyrillic_upper_first - cyrillic_lower_first); + } else { + return static_cast(tolower(letter)); + } + } + +// ====================================================================== + /** * Compares str1 and str2, where str1 is a String and str2 is templated, * thus could be a std::string as well. Set reverseCompare to true if you @@ -335,32 +361,7 @@ namespace Plat_Unicode { return appendStringField (dst, narrowToWide (src), width, fa, pad, truncate); } -// ====================================================================== - //----------------------------------------------------------------- - /** - * Hacky code to correctly handle Cyrillic. - */ - - inline unicode_char_t trueUpper(unicode_char_t letter) - { - if ((cyrillic_lower_first <= letter) && (letter <= cyrillic_lower_last)) { - return letter + (cyrillic_upper_first - cyrillic_lower_first); - } else { - return static_cast(toupper(letter)); - } - } - - inline unicode_char_t trueLower(unicode_char_t letter) - { - if ((cyrillic_upper_first <= letter) && (letter <= cyrillic_upper_last)) { - return letter - (cyrillic_upper_first - cyrillic_lower_first); - } else { - return static_cast(tolower(letter)); - } - } - -// ====================================================================== }; // ====================================================================== diff --git a/src/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/VChatAPITypes.h b/src/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/VChatAPITypes.h index a7b0cbb94..5fe2adb21 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/VChatAPITypes.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/VChatAPITypes.h @@ -40,7 +40,7 @@ namespace VChatSystem typedef unsigned ResultCode; - typedef enum ResultCode_t + enum ResultCode_t { RESULT_SUCCESS = 0, RESULT_TIMEOUT, @@ -109,7 +109,7 @@ namespace VChatSystem RESULT_END }; - typedef enum CommandType_t + enum CommandType_t { COMMAND_MUTE = 0, COMMAND_UNMUTE, @@ -130,13 +130,13 @@ namespace VChatSystem COMMAND_END }; - typedef enum ConnectionType + enum ConnectionType { CONNECTION_TYPE_UNKNOWN = 0, CONNECTION_TYPE_VHCAT_SYSTEM }; - typedef enum ChannelType + enum ChannelType { CHAN_TYPE_UNKNOWN = 0, CHAN_TYPE_DIR, @@ -144,7 +144,7 @@ namespace VChatSystem CHAN_TYPE_PROXIMITY }; - typedef enum BanStatus + enum BanStatus { BAN = 0, UNBAN diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h index abe24836b..ef733afb6 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h @@ -5,7 +5,7 @@ #ifndef API_NAMESPACE #pragma message ("apiMessages.h: API_NAMESPACE undefined") -//#else +//#else //#pragma message ("apiMessages.h: API_NAMESPACE:") //#pragma message API_NAMESPACE #endif @@ -13,6 +13,7 @@ #include #include #include "Base/serializeClasses.h" +//#include "Base/serialize.h" #include "apiMacros.h" #include "apiTypeNameValuePair.h" @@ -38,7 +39,7 @@ namespace API_NAMESPACE MESSAGE_GET_CONFIGURATION = 0x0ff5, MESSAGE_SHUTDOWN_NOTIFY = 0x0f00, - + // Server Messages MESSAGE_CONNECT_REPLY = 0x7ff3, MESSAGE_GET_STATUS_REPLY = 0x7ff4, @@ -147,6 +148,90 @@ namespace API_NAMESPACE } #endif +namespace soe +{ + inline unsigned Write(unsigned char * stream, unsigned size, const API_NAMESPACE::Message::Base & data, unsigned version = 0) + { + unsigned written = 0; + unsigned writtenSize = Write(stream, size, written, version); + + if (writtenSize <= 0) { return 0; } + written = data.Write(stream + writtenSize, size - writtenSize, version); + if (written <= 0) { return 0; } + writtenSize = Write(stream, size, written, version); + + return (writtenSize + written); + } + + inline unsigned Read(const unsigned char * stream, unsigned size, API_NAMESPACE::Message::Base & data, unsigned, unsigned version = 0) + { + unsigned messageSize = 0; + unsigned readSize = Read(stream, size, messageSize, version); + unsigned readIn = 0; + + size -= readSize; + stream += readSize; + if (messageSize > size) { return 0; } + readIn = data.Read(stream, messageSize, version); + if (readIn <= 0) { return 0; } + + return (readSize + messageSize); + } + + inline unsigned Write(unsigned char * stream, unsigned size, const API_NAMESPACE::Message::Base::DeepPointer & data, unsigned version = 0) + { + API_NAMESPACE::Message::Base *msg = (API_NAMESPACE::Message::Base *)data; + + if (msg) { + return Write(stream, size, *msg, version); + } else { + return 0; + } + } + + inline unsigned Read(const unsigned char * stream, unsigned size, API_NAMESPACE::Message::Base::DeepPointer & data, unsigned, unsigned version = 0) + { + unsigned msgSize = 0; + unsigned msgId = 0; + unsigned sizeSize = Read(stream, size, msgSize, version); + unsigned idSize = (sizeSize > 0) ? Read(stream + sizeSize, size - sizeSize, msgId, version) : 0; + + if (idSize <= 0) { + return 0; + } + + data.SetMessageType(msgId); + + API_NAMESPACE::Message::Base *msg = data; + + if (msg) { + return Read(stream, size, *msg, 0, version); + } else { + return 0; + } + } + +#ifdef PRINTABLE_MESSAGES + inline int Print(char * stream, unsigned size, const API_NAMESPACE::Message::Base & data, unsigned maxDepth=INT_MAX) + { + return data.Print(stream, size, maxDepth); + + } + + inline int Print(char * stream, unsigned size, const API_NAMESPACE::Message::Base::DeepPointer & data, unsigned maxDepth=INT_MAX) + { + API_NAMESPACE::Message::Base *msg = (API_NAMESPACE::Message::Base *)data; + + if (msg) { + return Print(stream, size, *msg, maxDepth); + } else { + return 0; + } + } +#endif + +} + #include "Base/serializeTemplates.h" @@ -297,7 +382,7 @@ namespace API_NAMESPACE DefineMessageBegin(Connect, Basic, MESSAGE_CONNECT) DefineMessageMember(Version, std::string) DefineMessageMember(Description, std::string) - + DefineMessageEnd @@ -362,93 +447,30 @@ namespace API_NAMESPACE DECLSPEC void Read(soe::NameValuePair &dest, const Message::NameValuePair &src); DECLSPEC void Write(const soe::NameValuePair &src, Message::NameValuePair &dest); + #ifdef API_NAMESPACE } #endif -namespace soe -{ - inline unsigned Write(unsigned char * stream, unsigned size, const API_NAMESPACE::Message::Base & data, unsigned version = 0) - { - unsigned written = 0; - unsigned writtenSize = Write(stream, size, written, version); +namespace soe { - if (writtenSize <= 0) { return 0; } - written = data.Write(stream + writtenSize, size - writtenSize, version); - if (written <= 0) { return 0; } - writtenSize = Write(stream, size, written, version); + inline unsigned Read(const unsigned char * stream, unsigned size, API_NAMESPACE::Message::NameValuePair & data, unsigned maxLen, unsigned version = 0) + { + NameValuePair dest; + unsigned returnval = Read(stream, size, dest, maxLen, version); + API_NAMESPACE::Write(dest, data); - return (writtenSize + written); - } + return returnval; + } - inline unsigned Read(const unsigned char * stream, unsigned size, API_NAMESPACE::Message::Base & data, unsigned, unsigned version = 0) - { - unsigned messageSize = 0; - unsigned readSize = Read(stream, size, messageSize, version); - unsigned readIn = 0; + inline unsigned Write(unsigned char * stream, unsigned size, const API_NAMESPACE::Message::NameValuePair & data, unsigned version = 0) + { + NameValuePair dest; + API_NAMESPACE::Read(dest, data); - size -= readSize; - stream += readSize; - if (messageSize > size) { return 0; } - readIn = data.Read(stream, messageSize, version); - if (readIn <= 0) { return 0; } - - return (readSize + messageSize); - } - - inline unsigned Write(unsigned char * stream, unsigned size, const API_NAMESPACE::Message::Base::DeepPointer & data, unsigned version = 0) - { - API_NAMESPACE::Message::Base *msg = (API_NAMESPACE::Message::Base *)data; - - if (msg) { - return Write(stream, size, *msg, version); - } else { - return 0; - } - } - - inline unsigned Read(const unsigned char * stream, unsigned size, API_NAMESPACE::Message::Base::DeepPointer & data, unsigned, unsigned version = 0) - { - unsigned msgSize = 0; - unsigned msgId = 0; - unsigned sizeSize = Read(stream, size, msgSize, version); - unsigned idSize = (sizeSize > 0) ? Read(stream + sizeSize, size - sizeSize, msgId, version) : 0; - - if (idSize <= 0) { - return 0; - } - - data.SetMessageType(msgId); - - API_NAMESPACE::Message::Base *msg = data; - - if (msg) { - return Read(stream, size, *msg, 0, version); - } else { - return 0; - } - } - -#ifdef PRINTABLE_MESSAGES - inline int Print(char * stream, unsigned size, const API_NAMESPACE::Message::Base & data, unsigned maxDepth=INT_MAX) - { - return data.Print(stream, size, maxDepth); - - } - - inline int Print(char * stream, unsigned size, const API_NAMESPACE::Message::Base::DeepPointer & data, unsigned maxDepth=INT_MAX) - { - API_NAMESPACE::Message::Base *msg = (API_NAMESPACE::Message::Base *)data; - - if (msg) { - return Print(stream, size, *msg, maxDepth); - } else { - return 0; - } - } -#endif + return Write(stream, size, dest, version); + } } - //#endif //_API_MESSAGES_H diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiTypeNameValuePair.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiTypeNameValuePair.h index 221051606..0e5a2a0e4 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiTypeNameValuePair.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiTypeNameValuePair.h @@ -1,6 +1,7 @@ #ifndef API_TYPE_NAME_VALUE_PAIR #define API_TYPE_NAME_VALUE_PAIR +#include #include #include #include "Base/serializeClasses.h" diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/Base64.cpp b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/Base64.cpp index a2f504a5a..3aba1fb2d 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/Base64.cpp +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/Base64.cpp @@ -1,5 +1,6 @@ #include "Base64.h" -#include +#include +#include #ifdef WIN32 #define snprintf _snprintf diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/MD5.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/MD5.h index d741ba1ba..0252f72e2 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/MD5.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/MD5.h @@ -9,13 +9,13 @@ #include -namespace soe +namespace soe { - class MD5 + class MD5 { - struct State + struct State { State(); @@ -25,7 +25,7 @@ namespace soe }; public: - MD5::MD5(); + MD5(); MD5(const std::string &input); void Init(); diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp index 7fe3361c4..ae7532348 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp @@ -2,7 +2,8 @@ #pragma warning( disable: 4786 ) #endif -#include +#include +#include #include "basicConfig.h" #include "profile.h" diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp index a90d602c6..6d0aa26af 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp @@ -35,7 +35,8 @@ #include "cmdLine.h" //#include "crtdbg.h" -#include +#include +#include #ifdef NAMESPACE namespace NAMESPACE diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/pid.cpp b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/pid.cpp index 213f182bc..6097fd7b3 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/pid.cpp +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/pid.cpp @@ -7,6 +7,9 @@ extern int errno; #endif +#include +#include + #define NAME_SIZE 256 #ifdef WIN32 diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeClasses.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeClasses.h index b094efde1..29257caef 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeClasses.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeClasses.h @@ -2,7 +2,8 @@ #define SOE__SERIALIZE_CLASSES_H -#include +#include +#include #include #include #include diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h index 52422e3b2..f27f37ad9 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h @@ -22,7 +22,7 @@ namespace soe // // This class is designed to handle the serialization of a vector of strings. This was necessary // because the default serialization routines did not handle the length of the string properly, and - // there was more risk involved in modifying all the serialization routines to handle the + // there was more risk involved in modifying all the serialization routines to handle the // extra length property for the string as well as the vector. // // this is intenede to be used with the serialization macros @@ -50,7 +50,7 @@ namespace soe : mMaxStringLength(maxStringLength), mMaxListLength(maxListLength) { } - SerializeStringList::SerializeStringList(stringList_t vStrings) + SerializeStringList(stringList_t vStrings) : mMaxStringLength(DEFAULT_MAX_LENGTH_STRING), mMaxListLength(DEFAULT_MAX_NUMBER_ELEMENTS) { for(stringList_t::iterator i = vStrings.begin(); i != vStrings.end(); i++) @@ -60,7 +60,7 @@ namespace soe } /////////////////////////////////////////////////////////////////////////////////////////// - unsigned SerializeStringList::Read(const unsigned char * stream, unsigned size) + unsigned Read(const unsigned char * stream, unsigned size) { // fix this: std::string element; @@ -91,7 +91,7 @@ namespace soe } /////////////////////////////////////////////////////////////////////////////////////////// - unsigned SerializeStringList::Write(unsigned char * stream, unsigned size) const + unsigned Write(unsigned char * stream, unsigned size) const { unsigned index = 0; unsigned bytes = 0; @@ -153,7 +153,7 @@ namespace soe : mMaxStringLength(maxStringLength), mMaxVectorLength(maxVectorLength) { } - SerializeStringVector::SerializeStringVector(stringVector_t vStrings) + SerializeStringVector(stringVector_t vStrings) : mMaxStringLength(DEFAULT_MAX_LENGTH_STRING), mMaxVectorLength(DEFAULT_MAX_NUMBER_ELEMENTS) { for(stringVector_t::iterator i = vStrings.begin(); i != vStrings.end(); i++) @@ -163,7 +163,7 @@ namespace soe } /////////////////////////////////////////////////////////////////////////////////////////// - unsigned SerializeStringVector::Read(const unsigned char * stream, unsigned size) + unsigned Read(const unsigned char * stream, unsigned size) { // fix this: std::string element; @@ -194,7 +194,7 @@ namespace soe } /////////////////////////////////////////////////////////////////////////////////////////// - unsigned SerializeStringVector::Write(unsigned char * stream, unsigned size) const + unsigned Write(unsigned char * stream, unsigned size) const { unsigned index = 0; unsigned bytes = 0; diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h index 5ee582338..4af421bbc 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h @@ -4,6 +4,7 @@ #ifdef TRACK_READ_WRITE_FAILURES # include "trackMessageFailures.h" #endif +#include #include namespace soe diff --git a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp index 1400bf5cc..be0a43764 100644 --- a/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp +++ b/src/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp @@ -7,26 +7,26 @@ #include #include -using namespace std; -#define transform std::transform +//using namespace std; +//#define transform std::transform namespace soe { void makeupper(std::string& str) { - transform(str.begin(), str.end(), str.begin(), toupper); + std::transform(str.begin(), str.end(), str.begin(), toupper); } std::string touppercase(const std::string& str) { std::string tmp = str; - transform(tmp.begin(), tmp.end(), tmp.begin(), toupper); + std::transform(tmp.begin(), tmp.end(), tmp.begin(), toupper); return tmp; } void makelower(std::string& str) { - transform(str.begin(), str.end(), str.begin(), tolower); + std::transform(str.begin(), str.end(), str.begin(), tolower); } std::string tolowercase(const std::string& str) diff --git a/src/external/3rd/library/udplibrary/udplibrary.dsp b/src/external/3rd/library/udplibrary/udplibrary.dsp index 22f1ff436..8aecdb9ca 100644 --- a/src/external/3rd/library/udplibrary/udplibrary.dsp +++ b/src/external/3rd/library/udplibrary/udplibrary.dsp @@ -1,152 +1,152 @@ -# Microsoft Developer Studio Project File - Name="udplibrary" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=udplibrary - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "udplibrary.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "udplibrary.mak" CFG="udplibrary - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "udplibrary - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "udplibrary - Win32 Optimized" (based on "Win32 (x86) Static Library") -!MESSAGE "udplibrary - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "udplibrary" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "udplibrary - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Release" -# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W4 /WX /GX /Zi /O2 /I "..\stlport453\stlport" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "udplibrary - Win32 Optimized" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Optimized" -# PROP BASE Intermediate_Dir "Optimized" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Optimized" -# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Optimized" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /WX /Gm /GX /Zi /Od /I "..\stlport453\stlport" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "udplibrary - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Debug" -# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /WX /Gm /GX /Zi /Od /I "..\stlport453\stlport" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "udplibrary - Win32 Release" -# Name "udplibrary - Win32 Optimized" -# Name "udplibrary - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\UdpLibrary.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\hashtable.hpp -# End Source File -# Begin Source File - -SOURCE=.\PointerDeque.hpp -# End Source File -# Begin Source File - -SOURCE=.\priority.hpp -# End Source File -# Begin Source File - -SOURCE=.\UdpHandler.h -# End Source File -# Begin Source File - -SOURCE=.\UdpHandler.hpp -# End Source File -# Begin Source File - -SOURCE=.\UdpLibrary.h -# End Source File -# Begin Source File - -SOURCE=.\UdpLibrary.hpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="udplibrary" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=udplibrary - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "udplibrary.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "udplibrary.mak" CFG="udplibrary - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "udplibrary - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "udplibrary - Win32 Optimized" (based on "Win32 (x86) Static Library") +!MESSAGE "udplibrary - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "udplibrary" +# PROP Scc_LocalPath "." +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "udplibrary - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Release" +# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MT /W4 /WX /GX /Zi /O2 /I "..\stlport453\stlport" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "udplibrary - Win32 Optimized" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Optimized" +# PROP BASE Intermediate_Dir "Optimized" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Optimized" +# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Optimized" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /WX /Gm /GX /Zi /Od /I "..\stlport453\stlport" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "udplibrary - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\..\compile\win32\udplibrary\Debug" +# PROP Intermediate_Dir "..\..\..\..\compile\win32\udplibrary\Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /WX /Gm /GX /Zi /Od /I "..\stlport453\stlport" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "udplibrary - Win32 Release" +# Name "udplibrary - Win32 Optimized" +# Name "udplibrary - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\UdpLibrary.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\hashtable.hpp +# End Source File +# Begin Source File + +SOURCE=.\PointerDeque.hpp +# End Source File +# Begin Source File + +SOURCE=.\priority.hpp +# End Source File +# Begin Source File + +SOURCE=.\UdpHandler.h +# End Source File +# Begin Source File + +SOURCE=.\UdpHandler.hpp +# End Source File +# Begin Source File + +SOURCE=.\UdpLibrary.h +# End Source File +# Begin Source File + +SOURCE=.\UdpLibrary.hpp +# End Source File +# End Group +# End Target +# End Project diff --git a/src/external/3rd/library/udplibrary/udplibrary.vcxproj.filters b/src/external/3rd/library/udplibrary/udplibrary.vcxproj.filters index b08e5b3f8..87e72698e 100644 --- a/src/external/3rd/library/udplibrary/udplibrary.vcxproj.filters +++ b/src/external/3rd/library/udplibrary/udplibrary.vcxproj.filters @@ -2,11 +2,11 @@ - {8566deab-a6fa-441f-8d7f-b5450e88eb89} + {6fd7bd79-1657-4e16-a996-7f49403727ea} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {249c5d40-7cd5-45f8-a196-002d9179c230} + {6f30646c-ccd8-4ef1-aaca-7bc5f2abc461} h;hpp;hxx;hm;inl diff --git a/src/external/3rd/library/ui/src/shared/UIColorEffector.cpp b/src/external/3rd/library/ui/src/shared/UIColorEffector.cpp index deacdc663..29863d603 100644 --- a/src/external/3rd/library/ui/src/shared/UIColorEffector.cpp +++ b/src/external/3rd/library/ui/src/shared/UIColorEffector.cpp @@ -15,6 +15,7 @@ #include "UIWidget.h" #include +#include // ====================================================================== diff --git a/src/external/3rd/library/ui/src/shared/UIComboBox.cpp b/src/external/3rd/library/ui/src/shared/UIComboBox.cpp index fb6596b99..432354738 100644 --- a/src/external/3rd/library/ui/src/shared/UIComboBox.cpp +++ b/src/external/3rd/library/ui/src/shared/UIComboBox.cpp @@ -28,7 +28,7 @@ #include "UnicodeUtils.h" #include - +#include //====================================================================== const char * const UIComboBox::TypeName = "ComboBox"; diff --git a/src/external/3rd/library/ui/src/shared/UIComposite.cpp b/src/external/3rd/library/ui/src/shared/UIComposite.cpp index c0476a3c0..ecc806cec 100644 --- a/src/external/3rd/library/ui/src/shared/UIComposite.cpp +++ b/src/external/3rd/library/ui/src/shared/UIComposite.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include diff --git a/src/external/3rd/library/ui/src/shared/UIList.cpp b/src/external/3rd/library/ui/src/shared/UIList.cpp index c4a382081..12b5b7224 100644 --- a/src/external/3rd/library/ui/src/shared/UIList.cpp +++ b/src/external/3rd/library/ui/src/shared/UIList.cpp @@ -26,6 +26,7 @@ #include #include #include +#include //====================================================================== diff --git a/src/external/3rd/library/ui/src/shared/UIPie.cpp b/src/external/3rd/library/ui/src/shared/UIPie.cpp index a287bae10..2b304214c 100644 --- a/src/external/3rd/library/ui/src/shared/UIPie.cpp +++ b/src/external/3rd/library/ui/src/shared/UIPie.cpp @@ -17,7 +17,7 @@ #include #include - +#include //---------------------------------------------------------------------- @@ -513,7 +513,7 @@ void UIPie::RenderCenter (UICanvas & canvas) const s_uvsScratchBuf.push_back (uvs); } - canvas.RenderTriangles (imageStyle->GetSourceCanvas (), mNumSegments, s_triangleScratchBuf.begin (), s_uvsScratchBuf.begin ()); + canvas.RenderTriangles (imageStyle->GetSourceCanvas (), mNumSegments, s_triangleScratchBuf.data, s_uvsScratchBuf.data); } //---------------------------------------------------------------------- diff --git a/src/external/3rd/library/ui/src/shared/UIPieStyle.cpp b/src/external/3rd/library/ui/src/shared/UIPieStyle.cpp index 44de19e4c..591555741 100644 --- a/src/external/3rd/library/ui/src/shared/UIPieStyle.cpp +++ b/src/external/3rd/library/ui/src/shared/UIPieStyle.cpp @@ -15,6 +15,7 @@ #include #include +#include //====================================================================== diff --git a/src/external/3rd/library/ui/src/shared/UITreeView.cpp b/src/external/3rd/library/ui/src/shared/UITreeView.cpp index 338a42863..5783b71cd 100644 --- a/src/external/3rd/library/ui/src/shared/UITreeView.cpp +++ b/src/external/3rd/library/ui/src/shared/UITreeView.cpp @@ -23,6 +23,7 @@ #include #include +#include //---------------------------------------------------------------------- diff --git a/src/external/3rd/library/ui/src/shared/UITreeViewStyle.cpp b/src/external/3rd/library/ui/src/shared/UITreeViewStyle.cpp index da868ca75..5b68805bc 100644 --- a/src/external/3rd/library/ui/src/shared/UITreeViewStyle.cpp +++ b/src/external/3rd/library/ui/src/shared/UITreeViewStyle.cpp @@ -17,7 +17,7 @@ #include #include - +#include //====================================================================== const char * const UITreeViewStyle::TypeName = "TreeViewStyle"; diff --git a/src/external/3rd/library/ui/src/shared/boundary/UIBoundaryPolygon.cpp b/src/external/3rd/library/ui/src/shared/boundary/UIBoundaryPolygon.cpp index adb6bf490..0c41e6ab8 100644 --- a/src/external/3rd/library/ui/src/shared/boundary/UIBoundaryPolygon.cpp +++ b/src/external/3rd/library/ui/src/shared/boundary/UIBoundaryPolygon.cpp @@ -9,7 +9,7 @@ #include "UIBoundaryPolygon.h" #include - +#include // ====================================================================== UIBoundaryPolygon::PointData::PointData () : diff --git a/src/external/3rd/library/ui/src/shared/boundary/UIWidgetBoundaries.cpp b/src/external/3rd/library/ui/src/shared/boundary/UIWidgetBoundaries.cpp index c88395b6a..3f55055af 100644 --- a/src/external/3rd/library/ui/src/shared/boundary/UIWidgetBoundaries.cpp +++ b/src/external/3rd/library/ui/src/shared/boundary/UIWidgetBoundaries.cpp @@ -14,7 +14,8 @@ #include #include - +#include +#include // ====================================================================== UI_MEMORY_BLOCK_MANAGER_IMPLEMENTATION(UIWidgetBoundaries, 1); diff --git a/src/external/3rd/library/ui/src/shared/core/UILowerString.cpp b/src/external/3rd/library/ui/src/shared/core/UILowerString.cpp index e177fd492..052b16155 100644 --- a/src/external/3rd/library/ui/src/shared/core/UILowerString.cpp +++ b/src/external/3rd/library/ui/src/shared/core/UILowerString.cpp @@ -9,6 +9,7 @@ #include "UILowerString.h" #include +#include #include #include diff --git a/src/external/3rd/library/ui/src/shared/core/UiMemoryBlockManager.h b/src/external/3rd/library/ui/src/shared/core/UiMemoryBlockManager.h index 11d70233a..3f39af225 100644 --- a/src/external/3rd/library/ui/src/shared/core/UiMemoryBlockManager.h +++ b/src/external/3rd/library/ui/src/shared/core/UiMemoryBlockManager.h @@ -13,6 +13,8 @@ #include #include +#include +#include class UiMemoryBlockManager { diff --git a/src/external/3rd/library/ui/src/win32/UIBaseObject.cpp b/src/external/3rd/library/ui/src/win32/UIBaseObject.cpp index 0945122ba..3020ed16a 100644 --- a/src/external/3rd/library/ui/src/win32/UIBaseObject.cpp +++ b/src/external/3rd/library/ui/src/win32/UIBaseObject.cpp @@ -18,6 +18,7 @@ #include #include #include +#include //----------------------------------------------------------------- #define UI_BASE_OBJECT_USE_LEAK_FINDER 0 diff --git a/src/external/3rd/library/ui/src/win32/UIButton.cpp b/src/external/3rd/library/ui/src/win32/UIButton.cpp index aad636f2c..cdc3f7b3f 100644 --- a/src/external/3rd/library/ui/src/win32/UIButton.cpp +++ b/src/external/3rd/library/ui/src/win32/UIButton.cpp @@ -18,7 +18,7 @@ #include #include - +#include //---------------------------------------------------------------------- const char * const UIButton::TypeName = "Button"; diff --git a/src/external/3rd/library/ui/src/win32/UICursorSet.cpp b/src/external/3rd/library/ui/src/win32/UICursorSet.cpp index bb99d161f..ff9e56ffc 100644 --- a/src/external/3rd/library/ui/src/win32/UICursorSet.cpp +++ b/src/external/3rd/library/ui/src/win32/UICursorSet.cpp @@ -14,7 +14,7 @@ #include #include - +#include //====================================================================== const char * const UICursorSet::TypeName = "CursorSet"; diff --git a/src/external/3rd/library/ui/src/win32/UIPopupMenu.cpp b/src/external/3rd/library/ui/src/win32/UIPopupMenu.cpp index 56c6876e8..9716f6d05 100644 --- a/src/external/3rd/library/ui/src/win32/UIPopupMenu.cpp +++ b/src/external/3rd/library/ui/src/win32/UIPopupMenu.cpp @@ -23,6 +23,7 @@ #include #include #include +#include const char * const UIPopupMenu::TypeName = "PopupMenu"; diff --git a/src/external/3rd/library/ui/src/win32/UIRadialMenu.cpp b/src/external/3rd/library/ui/src/win32/UIRadialMenu.cpp index 763f724c6..572b99ae0 100644 --- a/src/external/3rd/library/ui/src/win32/UIRadialMenu.cpp +++ b/src/external/3rd/library/ui/src/win32/UIRadialMenu.cpp @@ -24,6 +24,7 @@ #include #include #include +#include const char *UIRadialMenu::TypeName = "RadialMenu"; diff --git a/src/external/3rd/library/ui/src/win32/UIRectangleStyle.cpp b/src/external/3rd/library/ui/src/win32/UIRectangleStyle.cpp index 7262dc251..991416805 100644 --- a/src/external/3rd/library/ui/src/win32/UIRectangleStyle.cpp +++ b/src/external/3rd/library/ui/src/win32/UIRectangleStyle.cpp @@ -11,7 +11,7 @@ #include #include - +#include //----------------------------------------------------------------- const char * const UIRectangleStyle::TypeName = "RectangleStyle"; diff --git a/src/external/3rd/library/ui/src/win32/UIScrollbar.cpp b/src/external/3rd/library/ui/src/win32/UIScrollbar.cpp index 5d44c76eb..c5fd6c512 100644 --- a/src/external/3rd/library/ui/src/win32/UIScrollbar.cpp +++ b/src/external/3rd/library/ui/src/win32/UIScrollbar.cpp @@ -10,6 +10,7 @@ #include #include #include +#include const char * const UIScrollbar::TypeName = "Scrollbar"; diff --git a/src/external/3rd/library/ui/src/win32/UISliderbar.cpp b/src/external/3rd/library/ui/src/win32/UISliderbar.cpp index 0ee26e414..5a8e1371a 100644 --- a/src/external/3rd/library/ui/src/win32/UISliderbar.cpp +++ b/src/external/3rd/library/ui/src/win32/UISliderbar.cpp @@ -14,7 +14,7 @@ #include "UIWidgetRectangleStyles.h" #include - +#include //---------------------------------------------------------------------- const char * const UISliderbar::TypeName = "Sliderbar"; diff --git a/src/external/3rd/library/ui/src/win32/UISliderplane.cpp b/src/external/3rd/library/ui/src/win32/UISliderplane.cpp index 46d2b292d..627ac1372 100644 --- a/src/external/3rd/library/ui/src/win32/UISliderplane.cpp +++ b/src/external/3rd/library/ui/src/win32/UISliderplane.cpp @@ -14,6 +14,7 @@ #include #include #include +#include const char *UISliderplane::TypeName = "Sliderplane"; diff --git a/src/external/3rd/library/ui/src/win32/UIStlFwd.h b/src/external/3rd/library/ui/src/win32/UIStlFwd.h index daa1c4f29..5a807ade0 100644 --- a/src/external/3rd/library/ui/src/win32/UIStlFwd.h +++ b/src/external/3rd/library/ui/src/win32/UIStlFwd.h @@ -10,35 +10,15 @@ // ====================================================================== -// grab stlport configuration -#include "stl/_config.h" - -namespace std -{ - template struct less; - template struct equal_to; - template struct pair; - template struct hash; - template class allocator; - template class basic_string; - template class char_traits; - - template class bitset; - template class deque; - template class list; - template class queue; - template class vector; - template class stack; - template class priority_queue; - template class map; - template class hash_map; - template class multimap; - template class set; - template class hash_set; - template class multiset; - - typedef basic_string, allocator > string; -} +#include +#include +#include +#include +#include +#include +#include +#include +#include template > struct ui_stddeque { @@ -55,9 +35,9 @@ template , class _Alloc typedef std::map<_Key, _Tp, _Compare, _Alloc> fwd; }; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct ui_stdhash_map +template , class _Alloc = std::allocator< std::pair > > struct ui_stdhash_map { - typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; + typedef std::hash_map<_Key, _Tp, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator< std::pair > > struct ui_stdmultimap @@ -70,9 +50,9 @@ template , class _Alloc = std::allo typedef std::set<_Key, _Compare, _Alloc> fwd; }; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct ui_stdhash_set +template , class _Alloc = std::allocator<_Key> > struct ui_stdhash_set { - typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd; + typedef std::hash_set<_Key, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator<_Key> > struct ui_stdmultiset diff --git a/src/external/3rd/library/ui/src/win32/UITabbedPane.cpp b/src/external/3rd/library/ui/src/win32/UITabbedPane.cpp index ce42475fd..32f2cbb0a 100644 --- a/src/external/3rd/library/ui/src/win32/UITabbedPane.cpp +++ b/src/external/3rd/library/ui/src/win32/UITabbedPane.cpp @@ -17,6 +17,7 @@ #include #include #include +#include const char * UITabbedPane::TypeName = "TabbedPane"; diff --git a/src/external/3rd/library/ui/src/win32/UIText.cpp b/src/external/3rd/library/ui/src/win32/UIText.cpp index ffe05fc68..a1e878cb9 100644 --- a/src/external/3rd/library/ui/src/win32/UIText.cpp +++ b/src/external/3rd/library/ui/src/win32/UIText.cpp @@ -22,7 +22,7 @@ #include #include - +#include //---------------------------------------------------------------------- diff --git a/src/external/3rd/library/ui/src/win32/UITextBox.cpp b/src/external/3rd/library/ui/src/win32/UITextBox.cpp index ffcdb25ab..f696ecd4c 100644 --- a/src/external/3rd/library/ui/src/win32/UITextBox.cpp +++ b/src/external/3rd/library/ui/src/win32/UITextBox.cpp @@ -23,6 +23,7 @@ #include #include #include +#include const char * const UITextbox::TypeName = "Textbox"; const UIString::value_type UITextbox::PasswordCharacter = '*'; diff --git a/src/external/3rd/library/ui/src/win32/UITextStyle.cpp b/src/external/3rd/library/ui/src/win32/UITextStyle.cpp index dab3da3ac..94875042e 100644 --- a/src/external/3rd/library/ui/src/win32/UITextStyle.cpp +++ b/src/external/3rd/library/ui/src/win32/UITextStyle.cpp @@ -15,7 +15,8 @@ #include #include #include - +#include +#include // ============================================================== namespace diff --git a/src/external/3rd/library/ui/src/win32/UITypes.cpp b/src/external/3rd/library/ui/src/win32/UITypes.cpp index 5df4196a8..136ab6455 100644 --- a/src/external/3rd/library/ui/src/win32/UITypes.cpp +++ b/src/external/3rd/library/ui/src/win32/UITypes.cpp @@ -9,7 +9,7 @@ #include "UITypes.h" #include #include - +#include //====================================================================== const UIRect UIRect::zero; diff --git a/src/external/3rd/library/ui/src/win32/UIUtils.cpp b/src/external/3rd/library/ui/src/win32/UIUtils.cpp index 99bb53621..e4472eb53 100644 --- a/src/external/3rd/library/ui/src/win32/UIUtils.cpp +++ b/src/external/3rd/library/ui/src/win32/UIUtils.cpp @@ -9,7 +9,7 @@ #include #include #include - +#include //====================================================================================== namespace diff --git a/src/external/3rd/library/ui/src/win32/UIVolumePage.cpp b/src/external/3rd/library/ui/src/win32/UIVolumePage.cpp index 8bf90d2a5..56d435d4e 100644 --- a/src/external/3rd/library/ui/src/win32/UIVolumePage.cpp +++ b/src/external/3rd/library/ui/src/win32/UIVolumePage.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include diff --git a/src/external/3rd/library/ui/src/win32/UIWidget.cpp b/src/external/3rd/library/ui/src/win32/UIWidget.cpp index d7aa010c0..122b80f05 100644 --- a/src/external/3rd/library/ui/src/win32/UIWidget.cpp +++ b/src/external/3rd/library/ui/src/win32/UIWidget.cpp @@ -28,6 +28,7 @@ #include #include #include +#include const char * const UIWidget::TypeName = "Widget"; diff --git a/src/external/ours/library/archive/src/shared/AutoByteStream.h b/src/external/ours/library/archive/src/shared/AutoByteStream.h index 21eb963f0..b6c30c3f2 100644 --- a/src/external/ours/library/archive/src/shared/AutoByteStream.h +++ b/src/external/ours/library/archive/src/shared/AutoByteStream.h @@ -284,7 +284,7 @@ const ValueType & AutoVariable::get() const template void AutoVariable::pack(ByteStream & target) const { - Archive::put(target, value); + put(target, value); } //--------------------------------------------------------------------- @@ -322,7 +322,8 @@ void AutoVariable::set(const ValueType & rhs) template void AutoVariable::unpack(ReadIterator & source) { - Archive::get(source, value); + using Archive::get; + get(source, value); } //----------------------------------------------------------------------- @@ -463,7 +464,7 @@ inline void AutoArray::pack(Archive::ByteStream & target) const typename std::vector::const_iterator i; for(i = array.begin(); i != array.end(); ++i) { - Archive::put(target, (*i)); + put(target, (*i)); } } @@ -491,13 +492,14 @@ inline void AutoArray::pack(Archive::ByteStream & target) const template inline void AutoArray::unpack(Archive::ReadIterator & source) { + using Archive::get; unsigned int arraySize; Archive::get(source, arraySize); ValueType v; for(unsigned int i = 0; i < arraySize; ++i) { - Archive::get(source, v); + get(source, v); array.push_back(v); } } @@ -637,7 +639,7 @@ inline void AutoList::pack(Archive::ByteStream & target) const typename std::list::const_iterator i; for(i = theList.begin(); i != theList.end(); ++i) { - Archive::put(target, (*i)); + put(target, (*i)); } } @@ -665,13 +667,14 @@ inline void AutoList::pack(Archive::ByteStream & target) const template inline void AutoList::unpack(Archive::ReadIterator & source) { + using Archive::get; unsigned int arraySize; Archive::get(source, arraySize); ValueType v; for(unsigned int i = 0; i < arraySize; ++i) { - Archive::get(source, v); + get(source, v); theList.push_back(v); } } diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaByteStream.h b/src/external/ours/library/archive/src/shared/AutoDeltaByteStream.h index e8821a746..53b4d07d0 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaByteStream.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaByteStream.h @@ -85,10 +85,10 @@ private: only AutoDeltaByteStreams may interpret a delta package at run time. AutoDeltaByteStream objects can also deserialize from ByteStream and - AutoByteStream objects using the unpack() method. To unpack a + AutoByteStream objects using the unpack() method. To unpack a delta ByteStream, AutoDeltaByteStream provides unpackDeltas(). - AutoDeltaVariable objects, which are contained by a + AutoDeltaVariable objects, which are contained by a AutoDeltaByteStream, can set threshold values to trigger a change (e.g. a value representing heading may need to change by more than 3 degrees before the object is considered "changed"). @@ -131,20 +131,20 @@ private: { MyAutoDeltaByteStream a; MyAutoDeltaByteStream b; - + a.setValue(2.0f); // change of 2, not enough to trigger a delta b.setValue(1.0f); b.unpackDeltas(a.packDeltas()); assert(b.getValue() == 1.0f); // no deltas from (a) - a.setValue(5.0f); // large enough change + a.setValue(5.0f); // large enough change b.unpackDeltas(a.packDeltas()); assert(b.getValue() == a.getValue() && b.getValue() == 5.0f); } \endcode - + */ class AutoDeltaByteStream : public AutoByteStream { @@ -252,13 +252,13 @@ inline const unsigned short int AutoDeltaVariableBase::getIndex() const //----------------------------------------------------------------------- /** @brief Get a pointer to this variable's owner ByteStream - + As the AutoDeltaVariableBase is used in a non-const manner, it will insert itself into it's owner AutoDeltaByteStream::dirtyList - set. + set. When the AutoDeltaByteStream executes AutoDeltaByteStream::packDeltas(), - it will iterate through this set to determine which + it will iterate through this set to determine which variables may be dirty, invoke AutoDeltaVariableBase::isDirty() on each variable in the set, and if it is dirty, include the value in the ByteStream buffer. @@ -305,7 +305,7 @@ inline void AutoDeltaVariableBase::setIndex(const unsigned short int newIndex) //----------------------------------------------------------------------- /** - @brief set the AutoDeltaVariableBase::owner member to the address of + @brief set the AutoDeltaVariableBase::owner member to the address of some AutoDeltaByteStream instance. A AutoDeltaVariableBase or derived object must put itself on @@ -346,10 +346,10 @@ inline void AutoDeltaVariableBase::touch() MyAutoDeltaByteStream(); ~MyAutoDeltaByteStream() {}; - void setValue(const int value) + void setValue(const int value) { i = value; }; - const int getValue() const + const int getValue() const { return i; }; private: @@ -442,8 +442,8 @@ lastValue(ValueType()) @brief AutoDeltaVariable copy constructor This copy constructor will perform a deep copy of the current - value from the source AutoDeltaVariable. It does not copy - AutoDeltaVariableBase members such as the owner. The owner MUST + value from the source AutoDeltaVariable. It does not copy + AutoDeltaVariableBase members such as the owner. The owner MUST be set explicitly. @author Justin Randall @@ -473,7 +473,7 @@ lastValue(source.currentValue) MyAutoDeltaByteStream::MyAutoDeltaByteStream() { // set myAutoInt current value to 35 - myAutoInt(35); + myAutoInt(35); myAutoInt.setOwner(this); // copy myAutoInt @@ -521,7 +521,7 @@ inline AutoDeltaVariable::~AutoDeltaVariable() //----------------------------------------------------------------------- template -inline AutoDeltaVariable & AutoDeltaVariable::operator =(const AutoDeltaVariable & rhs) +inline AutoDeltaVariable & AutoDeltaVariable::operator =(const AutoDeltaVariable & rhs) { if(&rhs != this) set(rhs.currentValue); @@ -531,7 +531,7 @@ inline AutoDeltaVariable & AutoDeltaVariable::operator =(c //----------------------------------------------------------------------- template -inline AutoDeltaVariable & AutoDeltaVariable::operator =(const ValueType & rhs) +inline AutoDeltaVariable & AutoDeltaVariable::operator =(const ValueType & rhs) { if(rhs != currentValue) set(rhs); @@ -540,7 +540,7 @@ inline AutoDeltaVariable & AutoDeltaVariable::operator =(c //----------------------------------------------------------------------- /** - @brief assign the lastValue to the currentValue to avert isDirty() + @brief assign the lastValue to the currentValue to avert isDirty() returning true. @author Justin Randall @@ -578,7 +578,7 @@ inline const ValueType & AutoDeltaVariable::get() const When a AutoDeltaVariable is used in a non-const manner, it is placed on the AutoDeltaByteStream::dirtyList until AutoDeltaByteStream::packDeltas() - is invoked. All members on the list are checked to see if their value + is invoked. All members on the list are checked to see if their value has changed enough to warrant a new delta ByteStream. Any change in values triggers isDirty() to return true. @@ -629,7 +629,7 @@ inline const bool AutoDeltaVariable::isDirty() const template inline void AutoDeltaVariable::pack(ByteStream & target) const { - Archive::put(target, currentValue); + put(target, currentValue); } //----------------------------------------------------------------------- @@ -672,7 +672,7 @@ inline void AutoDeltaVariable::set(const ValueType & source) MUST contain the value -- that is, variables must be retrieve in the order they were packed. - AutoByteStream classes and their derivatives automatically pack and + AutoByteStream classes and their derivatives automatically pack and unpack data in the correct order. This protected method is visible only to ByteStreams. @@ -691,7 +691,8 @@ inline void AutoDeltaVariable::set(const ValueType & source) template inline void AutoDeltaVariable::unpack(ReadIterator & source) { - Archive::get(source, currentValue); + using Archive::get; + get(source, currentValue); clearDelta(); } @@ -700,7 +701,8 @@ inline void AutoDeltaVariable::unpack(ReadIterator & source) template inline void AutoDeltaVariable::unpackDelta(ReadIterator & source) { - Archive::get(source, currentValue); + using Archive::get; + get(source, currentValue); touch(); } diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaMap.h b/src/external/ours/library/archive/src/shared/AutoDeltaMap.h index 4f86fc3e6..9256495cf 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaMap.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaMap.h @@ -356,8 +356,8 @@ inline void AutoDeltaMap::pack(ByteStream & targ { cmd = Command::ADD; Archive::put(target, cmd); - Archive::put(target, (*i).first); - Archive::put(target, (*i).second); + put(target, (*i).first); + put(target, (*i).second); } } @@ -380,8 +380,8 @@ inline void AutoDeltaMap::pack(ByteStream & targ { assert(c->cmd == Command::ADD); // only add is valid in packing the whole container Archive::put(target, c->cmd); - Archive::put(target, c->key); - Archive::put(target, c->value); + put(target, c->key); + put(target, c->value); } } @@ -415,14 +415,14 @@ inline void AutoDeltaMap::packDelta(ByteStream & case Command::SET: case Command::ERASE: { - Archive::put(target, c.key); - Archive::put(target, c.value); + put(target, c.key); + put(target, c.value); } break; default: assert(false); // unknown command put INTO the archive!!!! THis will // cause a crash when unpacking on a remote system - + } } clearDelta(); @@ -443,13 +443,13 @@ inline const size_t AutoDeltaMap::size() const //----------------------------------------------------------------------- /** @brief set an element in the map - - If the key does not exist in the map, then an add is queued (which + + If the key does not exist in the map, then an add is queued (which will trigger a delta), the value is added to the map, and touch() is called place the container on the AutoDeltaByteStream's dirty list. If they key exists, and the values differ, and if the key is not in the - changes set, the old value is stored in changes, the new value is in + changes set, the old value is stored in changes, the new value is in the current container's map and the container invokes touch() to place itself on the AutoDeltaByteStream's dirty list. @@ -496,7 +496,7 @@ inline void AutoDeltaMap::set(const KeyType & ke @brief rebuild the container from a byte stream The container first determines the number of changes that will be - applied, which is the first element in the ByteStream. + applied, which is the first element in the ByteStream. Then, for each element, the command is read (CONTAINER_SET or CONTAINER_ERASE). If it is a CONTAINER_SET, then the key and value @@ -523,8 +523,8 @@ inline void AutoDeltaMap::unpack(ReadIterator & { Archive::get(source, c.cmd); assert(c.cmd == Command::ADD); // only add is valid in unpack - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); container[c.key] = c.value; onInsert(c.key, c.value); } @@ -558,8 +558,8 @@ inline void AutoDeltaMap::unpack(ReadIterator & { Archive::get(source, c.cmd); assert(c.cmd == Command::ADD); // only add is valid in unpack - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); data.push_back(c); } } @@ -597,8 +597,8 @@ inline void AutoDeltaMap::unpackDelta(ReadIterat for (i = 0; i < skipCount; ++i) { Archive::get(source, c.cmd); - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); } for ( ; i < commandCount; ++i) { @@ -608,15 +608,15 @@ inline void AutoDeltaMap::unpackDelta(ReadIterat case Command::ADD: case Command::SET: { - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); AutoDeltaMap::set(c.key, c.value); } break; case Command::ERASE: { - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); AutoDeltaMap::erase(c.key); } break; @@ -661,8 +661,8 @@ inline void AutoDeltaMap::unpackDelta(ReadIterat case Command::SET: case Command::ERASE: { - Archive::get(source, c.key); - Archive::get(source, c.value); + get(source, c.key); + get(source, c.value); } break; default: diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h b/src/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h index f5b679a39..e73b56b30 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h @@ -10,8 +10,8 @@ // ====================================================================== -#include "Archive/AutoDeltaMap.h" #include +#include "AutoDeltaMap.h" // ====================================================================== @@ -180,53 +180,63 @@ namespace Archive // ====================================================================== // pack-to-string functions for specific types + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %f"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %.2f:"); } + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %i"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %i:"); } + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %u"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %u:"); } #ifdef WIN32 + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%lu %I64u"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%lu %I64u:"); } #else + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%lu %llu"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%lu %llu:"); diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaQueue.h b/src/external/ours/library/archive/src/shared/AutoDeltaQueue.h index c2f6005f0..5b29aacf3 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaQueue.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaQueue.h @@ -258,7 +258,7 @@ inline void AutoDeltaQueue::pack(ByteStream &target) const { cmd = ModifyCommand::PUSH; Archive::put(target, cmd); - Archive::put(target, (*i)); + put(target, (*i)); } } @@ -277,12 +277,12 @@ inline void AutoDeltaQueue::packDelta(ByteStream &target) const { case ModifyCommand::PUSH: { - Archive::put(target, c.value); + put(target, c.value); } break; case ModifyCommand::ERASE: { - Archive::put(target, c.position); + put(target, c.position); } break; } @@ -317,6 +317,8 @@ inline void AutoDeltaQueue::push(ValueType const &value) template inline void AutoDeltaQueue::unpack(ReadIterator &source) { + using Archive::get; + // unpacking baseline data container.clear(); clearDelta(); @@ -331,7 +333,7 @@ inline void AutoDeltaQueue::unpack(ReadIterator &source) { Archive::get(source, c.cmd); assert(c.cmd == ModifyCommand::PUSH); // only push valid for pack/unpack - Archive::get(source, c.value); + get(source, c.value); container.push_back(c.value); } } @@ -341,6 +343,7 @@ inline void AutoDeltaQueue::unpack(ReadIterator &source) template inline void AutoDeltaQueue::unpackDelta(ReadIterator &source) { + using Archive::get; ModifyCommand c; size_t skipCount, commandCount, targetBaselineCommandCount; @@ -364,12 +367,12 @@ inline void AutoDeltaQueue::unpackDelta(ReadIterator &source) { case ModifyCommand::PUSH: { - Archive::get(source, c.value); + get(source, c.value); } break; case ModifyCommand::ERASE: { - Archive::get(source, c.position); + get(source, c.position); } break; default: @@ -384,13 +387,13 @@ inline void AutoDeltaQueue::unpackDelta(ReadIterator &source) { case ModifyCommand::PUSH: { - Archive::get(source, c.value); + get(source, c.value); AutoDeltaQueue::push(c.value); } break; case ModifyCommand::ERASE: { - Archive::get(source, c.position); + get(source, c.position); AutoDeltaQueue::erase(c.position); } break; diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaSet.h b/src/external/ours/library/archive/src/shared/AutoDeltaSet.h index d94da710c..a548dce42 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaSet.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaSet.h @@ -28,7 +28,7 @@ public: typedef typename SetType::size_type size_type; typedef typename SetType::const_iterator const_iterator; typedef typename SetType::const_reverse_iterator const_reverse_iterator; - + public: struct Command { @@ -41,7 +41,7 @@ public: unsigned char cmd; ValueType value; }; - + public: AutoDeltaSet(); ~AutoDeltaSet(); @@ -166,7 +166,7 @@ inline typename AutoDeltaSet::const_iterator AutoDeltaSet template inline typename AutoDeltaSet::const_iterator AutoDeltaSet::erase(ValueType const &value) { - SetType::const_iterator i(find(value)); + typename SetType::const_iterator i(find(value)); return erase(i); } @@ -183,7 +183,13 @@ inline typename AutoDeltaSet::const_iterator AutoDeltaSet c.value = *i; m_commands.push_back(c); ++m_baselineCommandCount; - m_set.erase(i++); + + // @note apathy - hack to convert from const_iterator to iterator as requried by STLPort + typename SetType::iterator tmp(m_set.begin()); + std::advance(tmp, std::distance(tmp, i)); + i++; + m_set.erase(tmp); + touch(); onErase(c.value); onChanged(); @@ -298,7 +304,7 @@ inline void AutoDeltaSet::pack(ByteStream &target) const Archive::put(target, m_set.size()); Archive::put(target, m_baselineCommandCount); for (typename SetType::const_iterator i = m_set.begin(); i != m_set.end(); ++i) - Archive::put(target, *i); + put(target, *i); } // ---------------------------------------------------------------------- @@ -309,7 +315,7 @@ inline void AutoDeltaSet::pack(ByteStream &target, std::s Archive::put(target, data.size()); Archive::put(target, static_cast(0)); // baselineCommandCount for (typename std::set::const_iterator i = data.begin(); i != data.end(); ++i) - Archive::put(target, *i); + put(target, *i); } //----------------------------------------------------------------------- @@ -327,7 +333,7 @@ inline void AutoDeltaSet::packDelta(ByteStream &target) c { case Command::ERASE: case Command::INSERT: - Archive::put(target, c.value); + put(target, c.value); break; case Command::CLEAR: break; @@ -404,7 +410,7 @@ inline const size_t AutoDeltaSet::size() const //----------------------------------------------------------------------- template -inline void AutoDeltaSet::unpack(ReadIterator &source) +inline void AutoDeltaSet::unpack(ReadIterator &source) { m_set.clear(); clearDelta(); @@ -414,10 +420,10 @@ inline void AutoDeltaSet::unpack(ReadIterator &source) Archive::get(source, commandCount); Archive::get(source, m_baselineCommandCount); - + using Archive::get; for (size_t i = 0; i < commandCount; ++i) { - Archive::get(source, value); + get(source, value); m_set.insert(value); } @@ -470,7 +476,7 @@ inline void AutoDeltaSet::unpackDelta(ReadIterator &sourc break; } data.push_back(c); - } + } } //----------------------------------------------------------------------- @@ -478,6 +484,7 @@ inline void AutoDeltaSet::unpackDelta(ReadIterator &sourc template inline void AutoDeltaSet::unpackDelta(ReadIterator &source) { + using Archive::get; Command c; size_t skipCount, commandCount, targetBaselineCommandCount; @@ -501,7 +508,7 @@ inline void AutoDeltaSet::unpackDelta(ReadIterator &sourc { Archive::get(source, c.cmd); if (c.cmd != Command::CLEAR) - Archive::get(source, c.value); + get(source, c.value); } for ( ; i < commandCount; ++i) { @@ -509,11 +516,11 @@ inline void AutoDeltaSet::unpackDelta(ReadIterator &sourc switch (c.cmd) { case Command::ERASE: - Archive::get(source, c.value); + get(source, c.value); AutoDeltaSet::erase(c.value); break; case Command::INSERT: - Archive::get(source, c.value); + get(source, c.value); AutoDeltaSet::insert(c.value); break; case Command::CLEAR: @@ -534,4 +541,3 @@ inline void AutoDeltaSet::unpackDelta(ReadIterator &sourc // ====================================================================== #endif // _INCLUDED__AutoDeltaSet_H - diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaVector.h b/src/external/ours/library/archive/src/shared/AutoDeltaVector.h index 0f0b4e03f..5d2d37bf8 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaVector.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaVector.h @@ -1,4 +1,3 @@ - #ifndef _INCLUDED_AutoDeltaVector_H #define _INCLUDED_AutoDeltaVector_H @@ -21,7 +20,7 @@ public: typedef typename std::vector::const_iterator const_iterator; typedef typename std::vector::const_reverse_iterator const_reverse_iterator; typedef std::vector VectorType; - + public: struct Command { @@ -37,7 +36,7 @@ public: unsigned short int index; ValueType value; }; - + public: AutoDeltaVector(); explicit AutoDeltaVector(size_t initialSize); @@ -372,7 +371,7 @@ inline void AutoDeltaVector::pack(ByteStream & target) co typename std::vector::const_iterator i; for (i = v.begin(); i != v.end(); ++i) { - Archive::put(target, (*i)); + put(target, (*i)); } } @@ -386,8 +385,8 @@ inline void AutoDeltaVector::pack(ByteStream & target, co typename std::vector::const_iterator i; for (i = data.begin(); i != data.end(); ++i) { - Archive::put(target, *i); - } + put(target, *i); + } } //----------------------------------------------------------------------- @@ -410,11 +409,11 @@ inline void AutoDeltaVector::packDelta(ByteStream & targe break; case Command::INSERT: Archive::put(target, c.index); - Archive::put(target, c.value); + put(target, c.value); break; case Command::SET: Archive::put(target, c.index); - Archive::put(target, c.value); + put(target, c.value); break; case Command::SETALL: { @@ -422,7 +421,7 @@ inline void AutoDeltaVector::packDelta(ByteStream & targe for (unsigned int j = 0; j < c.index; ++j) { ++i; - Archive::put(target, (*i).value); + put(target, (*i).value); } } break; @@ -515,7 +514,7 @@ inline void AutoDeltaVector::set(const unsigned int eleme c.value = newValue; commands.push_back(c); ++baselineCommandCount; - + if(element >= v.size()) v.resize(element + 1); @@ -616,8 +615,9 @@ inline const size_t AutoDeltaVector::size() const //----------------------------------------------------------------------- template -inline void AutoDeltaVector::unpack(ReadIterator & source) +inline void AutoDeltaVector::unpack(ReadIterator & source) { + using Archive::get; // unpacking the whole kazaba v.clear(); clearDelta(); @@ -630,7 +630,7 @@ inline void AutoDeltaVector::unpack(ReadIterator & source for (size_t i = 0; i < commandCount; ++i) { - Archive::get(source, value); + get(source, value); v.push_back(value); } @@ -642,6 +642,7 @@ inline void AutoDeltaVector::unpack(ReadIterator & source template inline void AutoDeltaVector::unpack(ReadIterator & source, std::vector & data) { + using Archive::get; // unpacking the whole kazaba size_t commandCount; size_t bcc; @@ -652,10 +653,10 @@ inline void AutoDeltaVector::unpack(ReadIterator & source for (size_t i = 0; i < commandCount; ++i) { - Archive::get(source,c.value); + get(source,c.value); c.index = static_cast(i); c.cmd = Command::INSERT; - + data.push_back(c); } } @@ -665,6 +666,7 @@ inline void AutoDeltaVector::unpack(ReadIterator & source template inline void AutoDeltaVector::unpackDelta(ReadIterator & source, std::vector & data) { + using Archive::get; Command c; size_t commandCount, targetBaselineCommandCount; @@ -681,11 +683,11 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s break; case Command::INSERT: Archive::get(source, c.index); - Archive::get(source, c.value); + get(source, c.value); break; case Command::SET: Archive::get(source, c.index); - Archive::get(source, c.value); + get(source, c.value); break; case Command::SETALL: // SETALL is not supported by the static AutoDeltaVector unpack function, because there's no place to put the value assert(false); @@ -696,7 +698,7 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s break; } data.push_back(c); - } + } } //----------------------------------------------------------------------- @@ -704,6 +706,7 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s template inline void AutoDeltaVector::unpackDelta(ReadIterator & source) { + using Archive::get; Command c; size_t skipCount, commandCount, targetBaselineCommandCount; @@ -727,11 +730,11 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s for (unsigned int j = 0; j < c.index; ++j) { ++i; - Archive::get(source, c.value); + get(source, c.value); } } else if (c.cmd != Command::ERASE && c.cmd != Command::CLEAR) - Archive::get(source, c.value); + get(source, c.value); } for ( ; i < commandCount; ++i) { @@ -740,21 +743,21 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s { case Command::ERASE: { - Archive::get(source, c.index); + get(source, c.index); AutoDeltaVector::erase(c.index); } break; case Command::INSERT: { Archive::get(source, c.index); - Archive::get(source, c.value); + get(source, c.value); AutoDeltaVector::insert(c.index, c.value); } break; case Command::SET: { Archive::get(source, c.index); - Archive::get(source, c.value); + get(source, c.value); AutoDeltaVector::set(c.index, c.value); } break; @@ -767,7 +770,7 @@ inline void AutoDeltaVector::unpackDelta(ReadIterator & s for (unsigned int j = 0; j < c.index; ++j) { ++i; - Archive::get(source, value); + get(source, value); tempVec.push_back(value); } AutoDeltaVector::set(tempVec); @@ -794,3 +797,4 @@ inline const ValueType & AutoDeltaVector::operator[] (con #endif // _INCLUDED__AutoDeltaVector_H + diff --git a/src/external/ours/library/archive/src/shared/AutoDeltaVectorObserver.h b/src/external/ours/library/archive/src/shared/AutoDeltaVectorObserver.h index 75447dc6b..516e6b9f7 100644 --- a/src/external/ours/library/archive/src/shared/AutoDeltaVectorObserver.h +++ b/src/external/ours/library/archive/src/shared/AutoDeltaVectorObserver.h @@ -190,3 +190,4 @@ inline void AutoDeltaVectorObserver +#include // ====================================================================== diff --git a/src/external/ours/library/archive/src/shared/ByteStream.h b/src/external/ours/library/archive/src/shared/ByteStream.h index ec360ca0c..eda154d52 100644 --- a/src/external/ours/library/archive/src/shared/ByteStream.h +++ b/src/external/ours/library/archive/src/shared/ByteStream.h @@ -7,6 +7,7 @@ #pragma warning ( disable : 4514 ) // inlined function has been removed #endif +#include #include //--------------------------------------------------------------------- diff --git a/src/external/ours/library/archive/src/shared/Makefile.am b/src/external/ours/library/archive/src/shared/Makefile.am index 2b2a6a1ad..7f711281b 100644 --- a/src/external/ours/library/archive/src/shared/Makefile.am +++ b/src/external/ours/library/archive/src/shared/Makefile.am @@ -1,7 +1,6 @@ AUTOMAKE_OPTIONS=foreign noinst_LTLIBRARIES=libarchiveshared.la libarchiveshared_la_CXXFLAGS=-I$(archive_dir)/include \ - -I$(stlport_dir)/stlport \ -Wno-ctor-dtor-privacy libarchiveshared_la_SOURCES=Archive.h \ AutoByteStream.cpp \ diff --git a/src/external/ours/library/crypto/src/shared/original/Makefile.am b/src/external/ours/library/crypto/src/shared/original/Makefile.am index 30d8e8d13..a830676c6 100644 --- a/src/external/ours/library/crypto/src/shared/original/Makefile.am +++ b/src/external/ours/library/crypto/src/shared/original/Makefile.am @@ -1,7 +1,6 @@ AUTOMAKE_OPTIONS=foreign noinst_LTLIBRARIES=libcryptosharedoriginal.la libcryptosharedoriginal_la_CXXFLAGS=-I$(crypto_dir)/include \ - -I$(stlport_dir)/stlport \ -Wno-ctor-dtor-privacy CXXFLAGS=-g -O2 libcryptosharedoriginal_la_SOURCES=config.h \ diff --git a/src/external/ours/library/crypto/src/shared/original/iterhash.cpp b/src/external/ours/library/crypto/src/shared/original/iterhash.cpp index 83b9ee166..1730ce941 100644 --- a/src/external/ours/library/crypto/src/shared/original/iterhash.cpp +++ b/src/external/ours/library/crypto/src/shared/original/iterhash.cpp @@ -5,106 +5,6 @@ NAMESPACE_BEGIN(CryptoPP) -template -IteratedHashBase::IteratedHashBase(unsigned int blockSize, unsigned int digestSize) - : blockSize(blockSize), countLo(0), countHi(0) - , data(blockSize/sizeof(T)), digest(digestSize/sizeof(T)) -{ -} - -template void IteratedHashBase::Update(const byte *input, unsigned int len) -{ - HashWordType tmp = countLo; - if ((countLo = tmp + ((word32)len << 3)) < tmp) - countHi++; // Carry from low to high - - int rshift = (8*sizeof(HashWordType)-3); - if (rshift<32) - { - countHi += len >> rshift; - } - - assert((blockSize & (blockSize-1)) == 0); // blockSize is a power of 2 - unsigned int num = (unsigned int)(tmp >> 3) & (blockSize-1); - - if (num != 0) - { - if ((num+len) >= blockSize) - { - memcpy((byte *)data.ptr+num, input, blockSize-num); - HashBlock(data); - input += (blockSize-num); - len-=(blockSize - num); - num=0; - // drop through and do the rest - } - else - { - memcpy((byte *)data.ptr+num, input, len); - return; - } - } - - // we now can process the input data in blocks of blockSize - // chars and save the leftovers to this->data. - if (len >= blockSize) - { - if (IsAligned(input)) - { - unsigned int leftOver = HashMultipleBlocks((T *)input, len); - input += (len - leftOver); - len = leftOver; - } - else - do - { // copy input first if it's not aligned correctly - memcpy(data, input, blockSize); - HashBlock(data); - input+=blockSize; - len-=blockSize; - } while (len >= blockSize); - } - - memcpy(data, input, len); -} - -template unsigned int IteratedHashBase::HashMultipleBlocks(const T *input, unsigned int length) -{ - do - { - HashBlock(input); - input += blockSize/sizeof(T); - length -= blockSize; - } - while (length >= blockSize); - return length; -} - -template void IteratedHashBase::PadLastBlock(unsigned int lastBlockSize, byte padFirst) -{ - unsigned int num = (unsigned int)(countLo >> 3) & (blockSize-1); - assert(num < blockSize); - ((byte *)data.ptr)[num++]=padFirst; - if (num <= lastBlockSize) - memset((byte *)data.ptr+num, 0, lastBlockSize-num); - else - { - memset((byte *)data.ptr+num, 0, blockSize-num); - HashBlock(data); - memset(data, 0, lastBlockSize); - } -} - -template void IteratedHashBase::Reinit() -{ - countLo = countHi = 0; - Init(); -} - -// provide empty definitions to avoid instantiation warnings -template void IteratedHashBase::Init() {} -template void IteratedHashBase::HashBlock(const T *input) {} - #ifdef WORD64_AVAILABLE template class IteratedHashBase; #endif diff --git a/src/external/ours/library/crypto/src/shared/original/iterhash.h b/src/external/ours/library/crypto/src/shared/original/iterhash.h index ac9e0efe5..a0abd0e73 100644 --- a/src/external/ours/library/crypto/src/shared/original/iterhash.h +++ b/src/external/ours/library/crypto/src/shared/original/iterhash.h @@ -34,6 +34,106 @@ protected: SecBlock digest; // Message digest }; +template +IteratedHashBase::IteratedHashBase(unsigned int blockSize, unsigned int digestSize) + : blockSize(blockSize), countLo(0), countHi(0) + , data(blockSize/sizeof(T)), digest(digestSize/sizeof(T)) +{ +} + +template void IteratedHashBase::Update(const byte *input, unsigned int len) +{ + HashWordType tmp = countLo; + if ((countLo = tmp + ((word32)len << 3)) < tmp) + countHi++; // Carry from low to high + + int rshift = (8*sizeof(HashWordType)-3); + if (rshift<32) + { + countHi += len >> rshift; + } + + assert((blockSize & (blockSize-1)) == 0); // blockSize is a power of 2 + unsigned int num = (unsigned int)(tmp >> 3) & (blockSize-1); + + if (num != 0) + { + if ((num+len) >= blockSize) + { + memcpy((byte *)data.ptr+num, input, blockSize-num); + HashBlock(data); + input += (blockSize-num); + len-=(blockSize - num); + num=0; + // drop through and do the rest + } + else + { + memcpy((byte *)data.ptr+num, input, len); + return; + } + } + + // we now can process the input data in blocks of blockSize + // chars and save the leftovers to this->data. + if (len >= blockSize) + { + if (IsAligned(input)) + { + unsigned int leftOver = HashMultipleBlocks((T *)input, len); + input += (len - leftOver); + len = leftOver; + } + else + do + { // copy input first if it's not aligned correctly + memcpy(data, input, blockSize); + HashBlock(data); + input+=blockSize; + len-=blockSize; + } while (len >= blockSize); + } + + memcpy(data, input, len); +} + +template unsigned int IteratedHashBase::HashMultipleBlocks(const T *input, unsigned int length) +{ + do + { + HashBlock(input); + input += blockSize/sizeof(T); + length -= blockSize; + } + while (length >= blockSize); + return length; +} + +template void IteratedHashBase::PadLastBlock(unsigned int lastBlockSize, byte padFirst) +{ + unsigned int num = (unsigned int)(countLo >> 3) & (blockSize-1); + assert(num < blockSize); + ((byte *)data.ptr)[num++]=padFirst; + if (num <= lastBlockSize) + memset((byte *)data.ptr+num, 0, lastBlockSize-num); + else + { + memset((byte *)data.ptr+num, 0, blockSize-num); + HashBlock(data); + memset(data, 0, lastBlockSize); + } +} + +template void IteratedHashBase::Reinit() +{ + countLo = countHi = 0; + Init(); +} + +// provide empty definitions to avoid instantiation warnings +template void IteratedHashBase::Init() {} +template void IteratedHashBase::HashBlock(const T *input) {} + //! . template class IteratedHash : public IteratedHashBase @@ -41,7 +141,7 @@ class IteratedHash : public IteratedHashBase public: typedef T HashWordType; enum {HIGHFIRST = H, BLOCKSIZE = S}; - + IteratedHash(unsigned int digestSize) : IteratedHashBase(BLOCKSIZE, digestSize) {} inline static void CorrectEndianess(HashWordType *out, const HashWordType *in, unsigned int byteCount) @@ -54,7 +154,7 @@ public: void Final(byte *hash) { - PadLastBlock(BLOCKSIZE - 2*sizeof(HashWordType)); + this->PadLastBlock(BLOCKSIZE - 2*sizeof(HashWordType)); CorrectEndianess(this->data, this->data, BLOCKSIZE - 2*sizeof(HashWordType)); this->data[this->data.size-2] = HIGHFIRST ? this->countHi : this->countLo; diff --git a/src/external/ours/library/crypto/src/shared/wrapper/Makefile.am b/src/external/ours/library/crypto/src/shared/wrapper/Makefile.am index 32286c53e..9ebcb8534 100644 --- a/src/external/ours/library/crypto/src/shared/wrapper/Makefile.am +++ b/src/external/ours/library/crypto/src/shared/wrapper/Makefile.am @@ -1,7 +1,6 @@ AUTOMAKE_OPTIONS=foreign noinst_LTLIBRARIES=libcryptosharedwrapper.la libcryptosharedwrapper_la_CXXFLAGS=-I$(crypto_dir)/include \ - -I$(stlport_dir)/stlport \ -Wno-ctor-dtor-privacy libcryptosharedwrapper_la_SOURCES=CryptoBufferTransform.h \ Hash.cpp \ diff --git a/src/external/ours/library/localization/src/shared/LocalizationManager.cpp b/src/external/ours/library/localization/src/shared/LocalizationManager.cpp index 9c9f5dfe5..f55d7f9cf 100644 --- a/src/external/ours/library/localization/src/shared/LocalizationManager.cpp +++ b/src/external/ours/library/localization/src/shared/LocalizationManager.cpp @@ -13,6 +13,7 @@ #include "UnicodeUtils.h" #include "fileInterface/AbstractFile.h" #include +#include #include #include #include diff --git a/src/external/ours/library/localization/src/shared/LocalizationManager.h b/src/external/ours/library/localization/src/shared/LocalizationManager.h index 70823546d..e31844c49 100644 --- a/src/external/ours/library/localization/src/shared/LocalizationManager.h +++ b/src/external/ours/library/localization/src/shared/LocalizationManager.h @@ -18,7 +18,7 @@ #pragma warning (disable:4786) #endif -#include +#include #include "Unicode.h" #include "UnicodeUtils.h" @@ -57,8 +57,8 @@ public: ~LocalizationManager (); typedef std::pair TimedStringTable; - typedef std::hash_map StringTableMap_t; - typedef std::hash_map LocalizationManagerHashMap; + typedef std::unordered_map StringTableMap_t; + typedef std::unordered_map LocalizationManagerHashMap; static void install (AbstractFileFactory * fileFactory, Unicode::UnicodeNarrowStringVector & localeNames, bool debugStrings, DebugBadStringsFunc debugBadStringsFunc = 0, bool displayBadStringIds = true); static void remove (); diff --git a/src/external/ours/library/localization/src/shared/LocalizedStringTable.cpp b/src/external/ours/library/localization/src/shared/LocalizedStringTable.cpp index 6d3d022dc..10ab6c608 100644 --- a/src/external/ours/library/localization/src/shared/LocalizedStringTable.cpp +++ b/src/external/ours/library/localization/src/shared/LocalizedStringTable.cpp @@ -12,8 +12,11 @@ #include "LocalizedString.h" #include "UnicodeUtils.h" +#include + #include #include +#include // ====================================================================== diff --git a/src/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp b/src/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp index ed77eef85..049b8a816 100644 --- a/src/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp +++ b/src/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp @@ -11,10 +11,12 @@ #include "LocalizedString.h" #include "fileInterface/AbstractFile.h" #include "UnicodeUtils.h" + +#include #include #include - +#include namespace LocalizedStringTableReaderWriterNamespace { @@ -424,7 +426,7 @@ LocalizedString * LocalizedStringTableRW::addString (LocalizedStrin m_nameMap [name] = locstr->getId (); m_idNameMap [id] = name; - m_nextUniqueId = std::max (m_nextUniqueId, locstr->getId () + 1); + m_nextUniqueId = std::max(m_nextUniqueId, locstr->getId () + 1); return locstr; } diff --git a/src/external/ours/library/localization/src/shared/Makefile.am b/src/external/ours/library/localization/src/shared/Makefile.am index 4d69d8c56..6aea22ee7 100644 --- a/src/external/ours/library/localization/src/shared/Makefile.am +++ b/src/external/ours/library/localization/src/shared/Makefile.am @@ -1,7 +1,6 @@ AUTOMAKE_OPTIONS=foreign noinst_LTLIBRARIES=liblocalizationshared.la liblocalizationshared_la_CXXFLAGS=-I../../include \ - -I$(stlport_dir)/stlport \ -I$(fileInterface_dir)/include/public \ -I$(unicode_dir)/include \ -Wno-ctor-dtor-privacy diff --git a/src/external/ours/library/localization/src/shared/StringId.cpp b/src/external/ours/library/localization/src/shared/StringId.cpp index 9a233acd7..cb1492e41 100644 --- a/src/external/ours/library/localization/src/shared/StringId.cpp +++ b/src/external/ours/library/localization/src/shared/StringId.cpp @@ -12,6 +12,8 @@ #include "LocalizationManager.h" #include "UnicodeUtils.h" #include +#include +#include //---------------------------------------------------------------------- diff --git a/src/external/ours/library/unicode/src/shared/Unicode.h b/src/external/ours/library/unicode/src/shared/Unicode.h index c20d6b784..0f29b5891 100644 --- a/src/external/ours/library/unicode/src/shared/Unicode.h +++ b/src/external/ours/library/unicode/src/shared/Unicode.h @@ -18,6 +18,7 @@ #endif #include +#include //----------------------------------------------------------------- @@ -45,6 +46,25 @@ namespace Unicode const String emptyString; } +namespace std { + + template<> + struct hash + { + std::size_t operator()(const Unicode::String& s) const + { + std::size_t hash = 0; + int offset = 'a' - 1; + for(Unicode::String::const_iterator it=s.begin(); it!=s.end(); ++it) { + hash = hash << 1 | (*it - offset); + } + + return hash; + } + }; + +} + //----------------------------------------------------------------- #endif diff --git a/src/external/ours/library/unicode/src/shared/UnicodeBlocks.cpp b/src/external/ours/library/unicode/src/shared/UnicodeBlocks.cpp index feb26ae3d..204aa6e80 100644 --- a/src/external/ours/library/unicode/src/shared/UnicodeBlocks.cpp +++ b/src/external/ours/library/unicode/src/shared/UnicodeBlocks.cpp @@ -10,6 +10,8 @@ #include "FirstUnicode.h" #include "UnicodeBlocks.h" +#include + // ====================================================================== using namespace Unicode::Blocks; diff --git a/src/external/ours/library/unicode/src/shared/UnicodeBlocks.h b/src/external/ours/library/unicode/src/shared/UnicodeBlocks.h index 16f9d4a70..42ab4d9ab 100644 --- a/src/external/ours/library/unicode/src/shared/UnicodeBlocks.h +++ b/src/external/ours/library/unicode/src/shared/UnicodeBlocks.h @@ -341,7 +341,7 @@ namespace Unicode { const NameMap_t::const_iterator iter = m_nameMap.find (name); - if (iter != m_idMap.end ()) + if (iter != m_nameMap.end ()) return (*iter).second; else return m_errorData; diff --git a/src/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp b/src/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp index 2be6eab95..e5783d98a 100644 --- a/src/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp +++ b/src/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp @@ -14,6 +14,7 @@ #include "UnicodeCharacterData.h" #include +#include #include #include diff --git a/src/external/ours/library/unicode/src/shared/UnicodeUtils.cpp b/src/external/ours/library/unicode/src/shared/UnicodeUtils.cpp index dab969929..4417fc0cd 100644 --- a/src/external/ours/library/unicode/src/shared/UnicodeUtils.cpp +++ b/src/external/ours/library/unicode/src/shared/UnicodeUtils.cpp @@ -8,6 +8,7 @@ #include "FirstUnicode.h" #include "UnicodeUtils.h" +#include #include #include diff --git a/src/external/ours/library/unicode/src/shared/UnicodeUtils.h b/src/external/ours/library/unicode/src/shared/UnicodeUtils.h index 48f881555..f2a722ae1 100644 --- a/src/external/ours/library/unicode/src/shared/UnicodeUtils.h +++ b/src/external/ours/library/unicode/src/shared/UnicodeUtils.h @@ -17,6 +17,8 @@ #pragma warning (disable:4786) #endif +#include + #include "Unicode.h" #include "utf8.h" diff --git a/src/game/client/application/SwgClient/src/shared/FirstSwgClient.h b/src/game/client/application/SwgClient/src/shared/FirstSwgClient.h index f1be55ae6..cd4db1d6f 100644 --- a/src/game/client/application/SwgClient/src/shared/FirstSwgClient.h +++ b/src/game/client/application/SwgClient/src/shared/FirstSwgClient.h @@ -10,8 +10,8 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" -#include "../../../../../../external/3rd/library/ui/include/_precompile.h" +#include "sharedFoundation/FirstSharedFoundation.h" +#include "_precompile.h" // ====================================================================== diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp index 3359cbed2..5e689b2c2 100644 --- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp @@ -39,15 +39,15 @@ #include "sharedDebug/SetupSharedDebug.h" #include "sharedFile/SetupSharedFile.h" #include "sharedFile/TreeFile.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ApplicationVersion.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Branch.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Binary.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigFile.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrashReportInformation.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ExitChain.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation//Os.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h" +#include "sharedFoundation/ApplicationVersion.h" +#include "sharedFoundation/Branch.h" +#include "sharedFoundation/Binary.h" +#include "sharedFoundation/ConfigFile.h" +#include "sharedFoundation/CrashReportInformation.h" +#include "sharedFoundation/ExitChain.h" +#include "sharedFoundation/Os.h" +#include "sharedFoundation/Production.h" +#include "sharedFoundation/SetupSharedFoundation.h" #include "sharedGame/CommoditiesAdvancedSearchAttribute.h" #include "sharedGame/SetupSharedGame.h" #include "sharedImage/SetupSharedImage.h" diff --git a/src/game/client/application/SwgClient/src/win32/SwgClient.rc b/src/game/client/application/SwgClient/src/win32/SwgClient.rc index 9742abf1b..f741045c1 100644 --- a/src/game/client/application/SwgClient/src/win32/SwgClient.rc +++ b/src/game/client/application/SwgClient/src/win32/SwgClient.rc @@ -7,8 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "WinResrc.h" -#define IDC_STATIC -1 +#include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/src/game/client/application/SwgClient/src/win32/WinMain.cpp b/src/game/client/application/SwgClient/src/win32/WinMain.cpp index 381dac6bc..1f83b0d9b 100644 --- a/src/game/client/application/SwgClient/src/win32/WinMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/WinMain.cpp @@ -12,8 +12,8 @@ #include "StringId.h" #include "clientGame/Game.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" -#include "../../../../../../engine/shared/library/sharedGame/include/public/sharedGame/PlatformFeatureBits.h" +#include "sharedFoundation/Production.h" +#include "sharedGame/PlatformFeatureBits.h" #include diff --git a/src/game/client/application/SwgClientSetup/src/win32/FirstSwgClientSetup.h b/src/game/client/application/SwgClientSetup/src/win32/FirstSwgClientSetup.h index 1b694cf1e..ebcf9500a 100644 --- a/src/game/client/application/SwgClientSetup/src/win32/FirstSwgClientSetup.h +++ b/src/game/client/application/SwgClientSetup/src/win32/FirstSwgClientSetup.h @@ -20,15 +20,15 @@ // ====================================================================== -#include "../../../../../../external/3rd/library/atlmfc/include/afx.h" -#include "../../../../../../external/3rd/library/atlmfc/include/afxwin.h" // MFC core and standard components -#include "../../../../../../external/3rd/library/atlmfc/include/afxext.h" // MFC extensions -#include "../../../../../../external/3rd/library/atlmfc/include/afxdisp.h" // MFC Automation classes -#include "../../../../../../external/3rd/library/atlmfc/include/afxdtctl.h" // MFC support for Internet Explorer 4 Common Controls +#include +#include // MFC core and standard components +#include // MFC extensions +#include // MFC Automation classes +#include // MFC support for Internet Explorer 4 Common Controls #ifndef _AFX_NO_AFXCMN_SUPPORT -#include "../../../../../../external/3rd/library/atlmfc/include/afxcmn.h" // MFC support for Windows Common Controls +#include // MFC support for Windows Common Controls #endif -#include "../../../../../../external/3rd/library/atlmfc/include/atlbase.h" +#include #include diff --git a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.cpp b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.cpp index d906a9afc..fae5189f8 100644 --- a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.cpp +++ b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.cpp @@ -630,7 +630,7 @@ BOOL SwgClientSetupApp::InitInstance() // ====================================================================== -//int callBlat(int argc, char **argv, char **envp); +int callBlat(int argc, char **argv, char **envp); // ---------------------------------------------------------------------- @@ -668,7 +668,7 @@ void SwgClientSetupNamespace::sendMail(std::string const & to, std::string const memset(envp, 0, 256); //call into blat to send the mail - //callBlat(argc, argv, &envp); + callBlat(argc, argv, &envp); //clean up allocated memory delete[] argv; diff --git a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc index 77916be50..de9180f3e 100644 --- a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc +++ b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.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 @@ -937,7 +937,7 @@ LANGUAGE 9, 1 #pragma code_page(1252) #endif //_WIN32 #include "res\SwgClientSetup.rc2" // non-Microsoft Visual C++ edited resources -#include "../../../../../../external/3rd/library/atlmfc/include/afxres.rc" // Standard components +#include "afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.csproj b/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.csproj index 75fc8527f..eac9bd34a 100644 --- a/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.csproj +++ b/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.csproj @@ -1,5 +1,4 @@ - - + Local 8.0.50727 @@ -25,8 +24,6 @@ - v2.0 - 2.0 bin\Debug\ diff --git a/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.sln b/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.sln index 9f1f5f9e2..d5902631f 100644 --- a/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.sln +++ b/src/game/client/application/SwgCsTool/src/win32/SWGCSTool.sln @@ -1,21 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWGCSTool", "SWGCSTool.csproj", "{C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ProjectConfiguration) = postSolution + {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Debug.ActiveCfg = Debug|.NET + {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Debug.Build.0 = Debug|.NET + {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Release.ActiveCfg = Release|.NET + {C2CB2932-B1D7-47EC-AAB0-0C3DE624A2DE}.Release.Build.0 = Release|.NET EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal diff --git a/src/game/client/application/SwgGodClient/src/BookmarkData.h b/src/game/client/application/SwgGodClient/src/BookmarkData.h index 02d232b34..662c7676b 100644 --- a/src/game/client/application/SwgGodClient/src/BookmarkData.h +++ b/src/game/client/application/SwgGodClient/src/BookmarkData.h @@ -10,7 +10,7 @@ #include "clientGame/FreeCamera.h" #include "Singleton/Singleton.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/game/client/application/SwgGodClient/src/FirstSwgGodClient.h b/src/game/client/application/SwgGodClient/src/FirstSwgGodClient.h index 3e72f585b..c6e68e0df 100644 --- a/src/game/client/application/SwgGodClient/src/FirstSwgGodClient.h +++ b/src/game/client/application/SwgGodClient/src/FirstSwgGodClient.h @@ -1,6 +1,6 @@ #pragma warning (disable:4505) -#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" diff --git a/src/game/client/application/SwgGodClient/src/FormWindow.h b/src/game/client/application/SwgGodClient/src/FormWindow.h index 8a971d2f6..eca7dc5f6 100644 --- a/src/game/client/application/SwgGodClient/src/FormWindow.h +++ b/src/game/client/application/SwgGodClient/src/FormWindow.h @@ -12,7 +12,7 @@ #include "BaseFormWindow.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedGame/FormManager.h" // ====================================================================== diff --git a/src/game/client/application/SwgGodClient/src/GameWidget.h b/src/game/client/application/SwgGodClient/src/GameWidget.h index baca81f8b..51947d373 100644 --- a/src/game/client/application/SwgGodClient/src/GameWidget.h +++ b/src/game/client/application/SwgGodClient/src/GameWidget.h @@ -30,9 +30,9 @@ namespace MessageDispatch // ====================================================================== //@todo get in the precompiled headers -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h" +#include "sharedFoundation/StlForwardDeclaration.h" #include "sharedFoundationTypes/FoundationTypes.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" // in the precompiled header, but included by QT-generated code that doesn't use our precompiled headers #include "sharedMessageDispatch/Transceiver.h" // in the precompiled header, but included by QT-generated code that doesn't use our precompiled headers diff --git a/src/game/client/application/SwgGodClient/src/GodClientData.h b/src/game/client/application/SwgGodClient/src/GodClientData.h index c23650608..982409a1e 100644 --- a/src/game/client/application/SwgGodClient/src/GodClientData.h +++ b/src/game/client/application/SwgGodClient/src/GodClientData.h @@ -8,12 +8,12 @@ #ifndef INCLUDED_GodClientData_H #define INCLUDED_GodClientData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Vector.h" #include "sharedMath/Vector2d.h" #include "sharedMath/Transform.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkIdArchive.h" #include "sharedNetworkMessages/AIDebuggingMessages.h" #include "clientGame/ClientObject.h" diff --git a/src/game/client/application/SwgGodClient/src/RegionRenderer.h b/src/game/client/application/SwgGodClient/src/RegionRenderer.h index d9d1b9361..5e0f450c0 100644 --- a/src/game/client/application/SwgGodClient/src/RegionRenderer.h +++ b/src/game/client/application/SwgGodClient/src/RegionRenderer.h @@ -13,7 +13,7 @@ #include #include #include "sharedFoundationTypes/FoundationTypes.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //----------------------------------------------------------------------------- diff --git a/src/game/client/application/SwgGodClient/src/ServerCommander.h b/src/game/client/application/SwgGodClient/src/ServerCommander.h index 3a8a6991c..631973a0f 100644 --- a/src/game/client/application/SwgGodClient/src/ServerCommander.h +++ b/src/game/client/application/SwgGodClient/src/ServerCommander.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "Singleton/Singleton.h" diff --git a/src/game/client/application/SwgGodClient/src/ServerObjectData.h b/src/game/client/application/SwgGodClient/src/ServerObjectData.h index 2f92e6515..de4674980 100644 --- a/src/game/client/application/SwgGodClient/src/ServerObjectData.h +++ b/src/game/client/application/SwgGodClient/src/ServerObjectData.h @@ -11,7 +11,7 @@ // ====================================================================== #include "Singleton/Singleton.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //---------------------------------------------------------------------- diff --git a/src/game/client/application/SwgGodClient/src/TriggerWindow.h b/src/game/client/application/SwgGodClient/src/TriggerWindow.h index 0d2bb4ccf..b91e0e0b8 100644 --- a/src/game/client/application/SwgGodClient/src/TriggerWindow.h +++ b/src/game/client/application/SwgGodClient/src/TriggerWindow.h @@ -11,7 +11,7 @@ // ====================================================================== #include "BaseTriggerWindow.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/game/client/application/SwgHeadlessClient/src/shared/FirstSwgHeadlessClient.h b/src/game/client/application/SwgHeadlessClient/src/shared/FirstSwgHeadlessClient.h index dd89acbf9..cd4db1d6f 100644 --- a/src/game/client/application/SwgHeadlessClient/src/shared/FirstSwgHeadlessClient.h +++ b/src/game/client/application/SwgHeadlessClient/src/shared/FirstSwgHeadlessClient.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "_precompile.h" // ====================================================================== diff --git a/src/game/client/library/swgClientAutomation/src/win32/FirstSwgClientAutomation.h b/src/game/client/library/swgClientAutomation/src/win32/FirstSwgClientAutomation.h index 2ce6f1532..2b019ec6a 100644 --- a/src/game/client/library/swgClientAutomation/src/win32/FirstSwgClientAutomation.h +++ b/src/game/client/library/swgClientAutomation/src/win32/FirstSwgClientAutomation.h @@ -1,7 +1,7 @@ #ifndef INCLUDED_FirstSwgClientAutomation_H #define INCLUDED_FirstSwgClientAutomation_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include diff --git a/src/game/client/library/swgClientQtWidgets/src/shared/core/FirstSwgClientQtWidgets.h b/src/game/client/library/swgClientQtWidgets/src/shared/core/FirstSwgClientQtWidgets.h index 39de369a7..165089cb3 100644 --- a/src/game/client/library/swgClientQtWidgets/src/shared/core/FirstSwgClientQtWidgets.h +++ b/src/game/client/library/swgClientQtWidgets/src/shared/core/FirstSwgClientQtWidgets.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.cpp b/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.cpp index e986f9c6d..60f5f0aaf 100644 --- a/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.cpp +++ b/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.cpp @@ -95,7 +95,7 @@ #include #include #include - +#include #if 0 // Animation Editor includes diff --git a/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.h b/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.h index 29b8d5209..8d53be804 100644 --- a/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.h +++ b/src/game/client/library/swgClientQtWidgets/src/win32/GameWidget.h @@ -18,7 +18,7 @@ class GroundScene; #include "sharedMessageDispatch/Receiver.h" // in the precompiled header, but included by QT-generated code that doesn't use our precompiled headers #include // in the precompiled header, but included by QT-generated code that doesn't use our precompiled headers -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StlForwardDeclaration.h" +#include "sharedFoundation/StlForwardDeclaration.h" #include #include diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/FirstSwgClientUserInterface.h b/src/game/client/library/swgClientUserInterface/src/shared/core/FirstSwgClientUserInterface.h index 02dbf8ac3..537958ac2 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/FirstSwgClientUserInterface.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/FirstSwgClientUserInterface.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "clientUserInterface/FirstClientUserInterface.h" // ====================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiContainerProvider.h b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiContainerProvider.h index f87a8c5e1..5a84636c5 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiContainerProvider.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiContainerProvider.h @@ -10,8 +10,8 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkId.h" class ClientObject; class SwgCuiContainerProviderFilter; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.h index e6a40be41..c08252960 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "UIEventCallback.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBid.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBid.h index 42b2ab2dc..9ff0f552b 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBid.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBid.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class UIButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBuy.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBuy.h index 5d9f0eb82..b3a498010 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBuy.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionBuy.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class UIButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionDetails.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionDetails.h index 2753d7efc..c6849c0bf 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionDetails.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionDetails.h @@ -12,7 +12,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class CuiWidget3dObjectListViewer; class UIButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListBase.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListBase.h index 9e224ecd6..479034e94 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListBase.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListBase.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class UITabbedPane; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListView.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListView.h index d34cb71cd..88bfbf54a 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListView.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionListView.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_SwgCuiAuctionListView_H #define INCLUDED_SwgCuiAuctionListView_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" //====================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionPaneTableModel.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionPaneTableModel.h index c31946c53..973ce84fc 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionPaneTableModel.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionPaneTableModel.h @@ -9,7 +9,7 @@ #define INCLUDED_SwgCuiAuctionPaneSwgCuiAuctionPaneTableModel_H #include "UITableModel.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "swgClientUserInterface/SwgCuiAuctionPaneTypes.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionSell.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionSell.h index d37d28560..e8e922669 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionSell.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAuctionSell.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class ClientObject; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSelection.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSelection.h index 132262353..edeabc479 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSelection.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSelection.h @@ -6,7 +6,7 @@ #include "sharedMessageDispatch/Receiver.h" #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class CreatureObject; class CuiMessageBox; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSetupProf.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSetupProf.h index 5d45afac6..abc8a5c1a 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSetupProf.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSetupProf.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_SwgCuiAvatarSetupProf_H #define INCLUDED_SwgCuiAvatarSetupProf_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" #include "sharedMath/Vector.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSimple.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSimple.h index 22c793662..8a7cd44c7 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSimple.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAvatarSimple.h @@ -15,7 +15,7 @@ #include "swgClientUserInterface/SwgCuiAvatarCustomizationBase_CustomizationGroup.h" #include "SwgCuiAvatarCreationHelper.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include #include diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiBuffBuilderBuffer.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiBuffBuilderBuffer.h index 3d0f35dfa..9799e52c9 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiBuffBuilderBuffer.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiBuffBuilderBuffer.h @@ -9,7 +9,7 @@ #define INCLUDED_SwgCuiBuffBuilderBuffer_H #include "clientGame/PlayerCreatureController.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiCustomize.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiCustomize.h index 22c9f3f09..f6898513c 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiCustomize.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiCustomize.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class CachedNetworkId; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDroidCommand.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDroidCommand.h index 47412b4bb..1b4ada4df 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDroidCommand.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDroidCommand.h @@ -13,7 +13,7 @@ #include "UIEventCallback.h" #include "clientGame/ClientObject.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" //=================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroup.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroup.h index 69dbb53bc..30b741bf8 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroup.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroup.h @@ -10,7 +10,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroupLootLottery.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroupLootLottery.h index f4fd30900..30b29faf9 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroupLootLottery.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiGroupLootLottery.h @@ -13,7 +13,7 @@ #include "UIEventCallback.h" #include "clientGame/ClientObject.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" //=================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.h index ed7762c40..b42eba50d 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.h @@ -13,7 +13,7 @@ #include "sharedMath/Vector.h" #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "UITypes.h" #include "clientObject/ReticleObject.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h index de163c36c..a294d194b 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h @@ -8,7 +8,7 @@ #ifndef INCLUDED_SwgCuiHudSpace_H #define INCLUDED_SwgCuiHudSpace_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "swgClientUserInterface/SwgCuiHud.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMahjong.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMahjong.h index 20974fac7..497081c1b 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMahjong.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMahjong.h @@ -4,7 +4,7 @@ #include "clientUserInterface/CuiMinigameManager.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" #include diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser.h index 94fb65a99..c416ac13c 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser.h @@ -13,7 +13,7 @@ #include "sharedMessageDispatch/Receiver.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class UIPage; class UIButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser_TableModel.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser_TableModel.h index eaa7c97db..d46b5e558 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser_TableModel.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionBrowser_TableModel.h @@ -12,8 +12,8 @@ #include "swgClientUserInterface/SwgCuiMissionBrowser.h" #include "UITableModel.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/NetworkId.h" +#include "sharedFoundation/Watcher.h" class MessageQueueMissionListResponseData; class NetworkId; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionDetails.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionDetails.h index 05e4c5ecc..b55e7d8c3 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionDetails.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiMissionDetails.h @@ -12,7 +12,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMessageDispatch/Receiver.h" #include "clientGame/ClientWaypointObject.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNotifications.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNotifications.h index 557343830..88e844609 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNotifications.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNotifications.h @@ -16,7 +16,7 @@ #include "clientAudio/SoundId.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedObject/CachedNetworkId.h" #include "UITypes.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestBuilder.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestBuilder.h index 3b627cccb..4e4252eaa 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestBuilder.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestBuilder.h @@ -11,7 +11,7 @@ //====================================================================== #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/CrcLowerString.h" +#include "sharedFoundation/CrcLowerString.h" #include "sharedGame/CollectionsDataTable.h" #include "UIEventCallback.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestHelper.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestHelper.h index bdbaeb2a6..46b3fb56f 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestHelper.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiQuestHelper.h @@ -11,7 +11,7 @@ // ====================================================================== #include "clientGame/ClientObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" // ---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction.h index 079a4e295..d891541a3 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction.h @@ -10,7 +10,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" #include "clientUserInterface/CuiMediator.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction_Quantity.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction_Quantity.h index e1c4a6933..4902ba568 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction_Quantity.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiResourceExtraction_Quantity.h @@ -12,7 +12,7 @@ #include "sharedMessageDispatch/Receiver.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class UISliderbar; class UIButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap.h index 258c93fef..0f289fe0a 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap.h @@ -16,7 +16,7 @@ #include "clientAudio/SoundId.h" #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedObject/CachedNetworkId.h" #include "UITypes.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap_Profession.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap_Profession.h index d3562f3f0..da6bd3cac 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap_Profession.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiRoadmap_Profession.h @@ -17,7 +17,7 @@ #include "clientUserInterface/CuiMediator.h" #include "swgClientUserInterface/SwgCuiRoadmap.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedObject/CachedNetworkId.h" #include "UITypes.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipChoose.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipChoose.h index 4a235a017..a88f6a595 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipChoose.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipChoose.h @@ -13,7 +13,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/PlayerCreatureController.h" #include "clientGame/ShipObject.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentDetail.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentDetail.h index 56506ff5d..1d22831a0 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentDetail.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentDetail.h @@ -13,7 +13,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ShipObject.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentManagement.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentManagement.h index 2ec487ed1..93490ffa7 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentManagement.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipComponentManagement.h @@ -13,7 +13,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ClientObject.h" #include "clientGame/ShipObject.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipView.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipView.h index d0f76a7d5..bee7107e7 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipView.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiShipView.h @@ -13,7 +13,7 @@ #include "clientUserInterface/CuiMediator.h" #include "UIEventCallback.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ShipObject.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroup.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroup.h index 02540f3e6..570ac89d8 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroup.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroup.h @@ -11,7 +11,7 @@ //====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" //---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroupLaunch.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroupLaunch.h index d8a9ea587..d72e3eec1 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroupLaunch.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceGroupLaunch.h @@ -13,7 +13,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "clientGame/ShipObject.h" //=================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceMiningSale.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceMiningSale.h index d15335d91..db559aef8 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceMiningSale.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceMiningSale.h @@ -9,7 +9,7 @@ #define INCLUDED_SwgCuiSpaceMiningSale_H #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "UIEventCallback.h" class UIText; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical.h index aaa694c42..8d1dcaa38 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical.h @@ -12,7 +12,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class UIButton; class UIEffector; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2.h index 223f9eebc..68f27edbf 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2.h @@ -12,7 +12,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class UIButton; class UIEffector; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2_BlipPane.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2_BlipPane.h index 421428873..aa1809ca8 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2_BlipPane.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical2_BlipPane.h @@ -12,7 +12,7 @@ #include "UIWidget.h" #include "swgClientUserInterface/SwgCuiSpaceRadarSpherical2.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class ClientObject; class Object; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical_BlipPane.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical_BlipPane.h index 99c58e5ba..8030982a6 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical_BlipPane.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceRadarSpherical_BlipPane.h @@ -12,7 +12,7 @@ #include "UIWidget.h" #include "swgClientUserInterface/SwgCuiSpaceRadarSpherical.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" class ClientObject; class Object; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceZoneMap.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceZoneMap.h index 5fa3de856..80d0e63c8 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceZoneMap.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSpaceZoneMap.h @@ -13,7 +13,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" #include "clientGame/ZoneMapObject.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Watcher.h" +#include "sharedFoundation/Watcher.h" #include "sharedMath/Vector.h" #include "sharedMessageDispatch/Receiver.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiStructurePlacement.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiStructurePlacement.h index 916ba953c..a573b1b66 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiStructurePlacement.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiStructurePlacement.h @@ -15,7 +15,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" #include "sharedObject/LotType.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class Object; class ObjectTemplate; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSurvey.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSurvey.h index 99e9c18c0..902de8ace 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSurvey.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiSurvey.h @@ -14,7 +14,7 @@ #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgSharedNetworkMessages/SurveyMessage.h" #include "UITypes.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiTicketPurchase.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiTicketPurchase.h index 05ecf434f..7cae59f8d 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiTicketPurchase.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiTicketPurchase.h @@ -20,7 +20,7 @@ class UIText; #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" //=================================================================== diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiToolbar.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiToolbar.h index 1abfd6d0f..f570eba41 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiToolbar.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiToolbar.h @@ -12,7 +12,7 @@ #include "clientGame/ClientCommandQueue.h" #include "clientGame/Game.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedObject/CachedNetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceActiveSpeakers.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceActiveSpeakers.h index 49eb9c5ab..03aaeb150 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceActiveSpeakers.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceActiveSpeakers.h @@ -12,7 +12,7 @@ #include "clientGame/ClientObject.h" #include "clientUserInterface/CuiVoiceChatManager.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" // ---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceFlyBar.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceFlyBar.h index 32c05159e..44ab9cd33 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceFlyBar.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiVoiceFlyBar.h @@ -12,7 +12,7 @@ #include "clientGame/ClientObject.h" #include "clientUserInterface/CuiVoiceChatManager.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "swgClientUserInterface/SwgCuiLockableMediator.h" // ---------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWeaponGroupAssignment.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWeaponGroupAssignment.h index d8f4f240b..78620566d 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWeaponGroupAssignment.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWeaponGroupAssignment.h @@ -12,7 +12,7 @@ #include "UIEventCallback.h" #include "clientUserInterface/CuiMediator.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" class ShipObject; class UIList; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.h index 0149b9056..3faed0bef 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.h @@ -15,7 +15,7 @@ #include "libMozilla/libMozilla.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Timer.h" +#include "sharedFoundation/Timer.h" #include "UIImage.h" #include "UIText.h" diff --git a/src/game/server/application/SwgBattlefieldTool/src/shared/FirstSwgBattlefieldTool.h b/src/game/server/application/SwgBattlefieldTool/src/shared/FirstSwgBattlefieldTool.h index 50d9e43e8..f3f86debe 100644 --- a/src/game/server/application/SwgBattlefieldTool/src/shared/FirstSwgBattlefieldTool.h +++ b/src/game/server/application/SwgBattlefieldTool/src/shared/FirstSwgBattlefieldTool.h @@ -1 +1 @@ -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" diff --git a/src/game/server/application/SwgContentBuilder/src/win32/FirstSwgContentBuilder.h b/src/game/server/application/SwgContentBuilder/src/win32/FirstSwgContentBuilder.h index 07de78e56..ca9a83da0 100644 --- a/src/game/server/application/SwgContentBuilder/src/win32/FirstSwgContentBuilder.h +++ b/src/game/server/application/SwgContentBuilder/src/win32/FirstSwgContentBuilder.h @@ -24,7 +24,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/game/server/application/SwgConversationEditor/src/win32/FirstSwgConversationEditor.h b/src/game/server/application/SwgConversationEditor/src/win32/FirstSwgConversationEditor.h index a7999b740..8d29400b0 100644 --- a/src/game/server/application/SwgConversationEditor/src/win32/FirstSwgConversationEditor.h +++ b/src/game/server/application/SwgConversationEditor/src/win32/FirstSwgConversationEditor.h @@ -38,7 +38,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h index 0768fafff..5180b92a9 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h @@ -13,7 +13,7 @@ #include "serverDatabase/AbstractTableBuffer.h" #include "sharedDatabaseInterface/DbModeQuery.h" #include "sharedDatabaseInterface/DbSession.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include #include #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h index f22b5754d..bf2fc1d6e 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h @@ -11,7 +11,7 @@ // ====================================================================== -#include +#include #include "serverDatabase/TableBuffer.h" // ====================================================================== @@ -37,7 +37,7 @@ class IndexedNetworkTableBuffer : public TableBuffer IndexedNetworkTableBuffer(TableBufferMode mode, DB::ModeQuery *query); private: - typedef std::hash_map IndexType; + typedef std::unordered_map IndexType; /** * Index to locate rows. * diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/LocationBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/LocationBuffer.h index 2ed47771c..6d31adbf0 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/LocationBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/LocationBuffer.h @@ -14,7 +14,7 @@ #include #include "serverDatabase/TableBuffer.h" #include "serverUtility/LocationData.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" namespace DBSchema { diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h index 269731d87..603a9d707 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h @@ -13,7 +13,7 @@ #include "SwgDatabaseServer/CommoditiesQuery.h" #include "SwgDatabaseServer/CommoditiesSchema.h" #include "serverDatabase/AbstractTableBuffer.h" -#include +#include #include // ====================================================================== @@ -47,10 +47,10 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRow *row); private: - typedef std::hash_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; - typedef std::hash_map > > AttributesType; + typedef std::unordered_map > > AttributesType; AttributesType m_attributes; private: @@ -79,7 +79,7 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRowDelete *row); private: - typedef std::hash_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; private: @@ -108,7 +108,7 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRowUpdate *row); private: - typedef std::hash_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; private: diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.h index 27b676abd..372da7e02 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.h @@ -13,8 +13,8 @@ #include "IndexedNetworkTableBuffer.h" #include "SwgDatabaseServer/ObjectsTableQuery.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/DynamicVariableList.h" +#include "sharedFoundation/Tag.h" // ====================================================================== diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h index 7cca99f84..61ff386b7 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h @@ -13,7 +13,7 @@ #include "SwgDatabaseServer/ObjectTableBuffer.h" #include "SwgDatabaseServer/ObjectVariableQueries.h" #include "serverDatabase/AbstractTableBuffer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariableList.h" +#include "sharedFoundation/DynamicVariableList.h" #include #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/PropertyListBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/PropertyListBuffer.h index 4799fb83e..c610dd9aa 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/PropertyListBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/PropertyListBuffer.h @@ -12,7 +12,7 @@ #include "SwgDatabaseServer/PropertyListQuery.h" #include "serverDatabase/TableBuffer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ScriptBuffer.h b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ScriptBuffer.h index 178f0efd7..a848d712f 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ScriptBuffer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/buffers/ScriptBuffer.h @@ -16,7 +16,7 @@ #include #include #include "serverDatabase/AbstractTableBuffer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "sharedLog/Log.h" namespace DB diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.h b/src/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.h index fb1a66c7a..bb0736833 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.h @@ -11,7 +11,7 @@ #include "serverDatabase/dBAuctionRecord.h" #include "serverDatabase/dBBidRecord.h" #include "serverDatabase/dBLocationRecord.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedSynchronization/Mutex.h" #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/CommoditiesSnapshot.h b/src/game/server/application/SwgDatabaseServer/src/shared/core/CommoditiesSnapshot.h index 64bce22ea..a577e61eb 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/CommoditiesSnapshot.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/CommoditiesSnapshot.h @@ -13,7 +13,7 @@ #include "Archive/ByteStream.h" #include "serverDatabase/Snapshot.h" #include "serverDatabase/TableBuffer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "SwgDatabaseServer/AuctionLocationsBuffer.h" #include "SwgDatabaseServer/MarketAuctionsBuffer.h" #include "SwgDatabaseServer/MarketAuctionBidsBuffer.h" diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/FirstSwgDatabaseServer.h b/src/game/server/application/SwgDatabaseServer/src/shared/core/FirstSwgDatabaseServer.h index 7aeaa7272..00bb71756 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/FirstSwgDatabaseServer.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/FirstSwgDatabaseServer.h @@ -10,11 +10,11 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedDebug/FirstSharedDebug.h" #include "sharedMemoryManager/FirstSharedMemoryManager.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" #ifdef _WIN32 #pragma warning(disable: 4100) // unreferenced formal parameter diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp b/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp index 0226690b6..d5955036a 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp @@ -10,7 +10,8 @@ #include "SwgDatabaseServer/TaskSaveObjvarNames.h" #include "sharedFoundation/ExitChain.h" -#include +#include +#include #include #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.h b/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.h index 5c3c35315..fa2c989ce 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.h @@ -34,10 +34,10 @@ class ObjvarNameManager DB::TaskRequest *saveNewNames(); private: - typedef stdhash_map::fwd NameToIdMapType; + typedef stdunordered_map::fwd NameToIdMapType; NameToIdMapType *m_nameToIdMap; - typedef stdhash_map::fwd IdToNameMapType; + typedef stdunordered_map::fwd IdToNameMapType; IdToNameMapType *m_idToNameMap; typedef stdvector >::fwd NewNamesType; diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h b/src/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h index 5de57e6aa..ee36cc391 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h @@ -13,7 +13,7 @@ #include "Archive/ByteStream.h" #include "serverDatabase/Snapshot.h" #include "serverDatabase/TableBuffer.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Tag.h" +#include "sharedFoundation/Tag.h" #include "SwgDatabaseServer/BattlefieldParticipantBuffer.h" #include "SwgDatabaseServer/BountyHunterTargetBuffer.h" #include "SwgDatabaseServer/CreatureObjectBuffer.h" @@ -448,7 +448,7 @@ protected: void ignorePersistedFlag (const NetworkId &objectId, Archive::ReadIterator &data) const; - OfflineMoneyCustomPersistStep * SwgSnapshot::getOfflineMoneyCustomPersistStep(); + OfflineMoneyCustomPersistStep * getOfflineMoneyCustomPersistStep(); private: SwgSnapshot(const SwgSnapshot&); //disable diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template index 7005f139f..4c1e0e2da 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template @@ -49,4 +49,3384 @@ #pragma warning(disable : 4100) //!!!BEGIN GENERATED DECODER +void SwgSnapshot::decodeSharedBattlefieldMarkerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_battlefieldMarkerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedBattlefieldMarkerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerBattlefieldMarkerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_battlefieldMarkerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + std::string temp; + Archive::get(data,temp); + row->region_name=temp; + break; + } + case 17: + { + decodeBattlefieldParticipants(objectId,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerBattlefieldMarkerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientBattlefieldMarkerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_battlefieldMarkerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientBattlefieldMarkerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedBuildingObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_buildingObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedBuildingObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerBuildingObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_buildingObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Allowed,data,isBaseline); + break; + } + case 17: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Banned,data,isBaseline); + break; + } + case 18: + { + bool temp; + Archive::get(data,temp); + row->is_public=temp; + break; + } + case 19: + { + int temp; + Archive::get(data,temp); + row->maintenance_cost=temp; + break; + } + case 20: + { + real temp; + Archive::get(data,temp); + row->time_last_checked=temp; + break; + } + case 21: + { + int temp; + Archive::get(data,temp); + row->city_id=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerBuildingObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientBuildingObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_buildingObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientBuildingObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedCellObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cellObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 4: + { + bool temp; + Archive::get(data,temp); + row->is_public=temp; + break; + } + case 5: + { + int temp; + Archive::get(data,temp); + row->cell_number=temp; + WARNING_STRICT_FATAL(temp==-1,("Received CellObject %s with cell number -1.\n",objectId.getValueString().c_str())); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedCellObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerCellObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cellObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Allowed,data,isBaseline); + break; + } + case 12: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Banned,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerCellObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientCellObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cellObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientCellObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedCityObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cityObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedCityObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerCityObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cityObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Cities,data,isBaseline); + break; + } + case 12: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Citizens,data,isBaseline); + break; + } + case 13: + { + decodePropertyList(objectId,PropertyListBuffer::LI_CityStructures,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerCityObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientCityObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_cityObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientCityObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedCreatureObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_creatureObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + Postures::Enumerator temp; + Archive::get(data,temp); + row->posture=temp; + break; + } + case 14: + { + uint8 temp; + Archive::get(data,temp); + row->rank=temp; + break; + } + case 15: + { + NetworkId temp; + Archive::get(data,temp); + row->master_id=temp; + break; + } + case 16: + { + float temp; + Archive::get(data,temp); + row->scale_factor=temp; + break; + } + case 17: + { + int temp; + Archive::get(data,temp); + row->shock_wounds=temp; + break; + } + case 18: + { + uint64 temp; + Archive::get(data,temp); + row->states=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedCreatureObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerCreatureObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_creatureObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + decodeAttributes(objectId,data,isBaseline,0); + break; + } + case 17: + { + float temp; + Archive::get(data,temp); + row->base_run_speed=temp; + break; + } + case 18: + { + float temp; + Archive::get(data,temp); + row->base_walk_speed=temp; + break; + } + case 19: + { + decodePersistedBuffs(data,row->persisted_buffs); + break; + } + case 20: + { + float temp; + Archive::get(data,temp); + row->ws_x=temp; + break; + } + case 21: + { + float temp; + Archive::get(data,temp); + row->ws_y=temp; + break; + } + case 22: + { + float temp; + Archive::get(data,temp); + row->ws_z=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerCreatureObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientCreatureObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_creatureObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 2: + { + decodeAttributes(objectId,data,isBaseline,9); + break; + } + case 3: + { + decodePropertyList(objectId,PropertyListBuffer::LI_Skills,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientCreatureObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedFactoryObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_factoryObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedFactoryObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerFactoryObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_factoryObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerFactoryObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientFactoryObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_factoryObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientFactoryObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedGuildObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_guildObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 4: + { + decodePropertyList(objectId,PropertyListBuffer::LI_GuildAbbrevs,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedGuildObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerGuildObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_guildObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + decodePropertyList(objectId,PropertyListBuffer::LI_GuildNames,data,isBaseline); + break; + } + case 12: + { + decodePropertyList(objectId,PropertyListBuffer::LI_GuildLeaders,data,isBaseline); + break; + } + case 13: + { + decodePropertyList(objectId,PropertyListBuffer::LI_GuildMembers,data,isBaseline); + break; + } + case 14: + { + decodePropertyList(objectId,PropertyListBuffer::LI_GuildEnemies,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerGuildObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientGuildObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_guildObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientGuildObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedHarvesterInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeSharedInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_harvesterInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedHarvesterInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerHarvesterInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 19) + { + decodeServerInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_harvesterInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 19: + { + float temp; + Archive::get(data,temp); + row->installed_efficiency=temp; + break; + } + case 20: + { + NetworkId temp; + Archive::get(data,temp); + row->resource_type=temp; + break; + } + case 21: + { + int temp; + Archive::get(data,temp); + row->max_extraction_rate=temp; + break; + } + case 22: + { + float temp; + Archive::get(data,temp); + row->current_extraction_rate=temp; + break; + } + case 23: + { + int temp; + Archive::get(data,temp); + row->max_hopper_amount=temp; + break; + } + case 24: + { + NetworkId temp; + Archive::get(data,temp); + row->hopper_resource=temp; + break; + } + case 25: + { + float temp; + Archive::get(data,temp); + row->hopper_amount=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerHarvesterInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientHarvesterInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_harvesterInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientHarvesterInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_installationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + bool temp; + Archive::get(data,temp); + row->activated=temp; + break; + } + case 14: + { + float temp; + Archive::get(data,temp); + row->power=temp; + break; + } + case 15: + { + float temp; + Archive::get(data,temp); + row->power_rate=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_installationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + int32 temp; + Archive::get(data,temp); + row->installation_type=temp; + break; + } + case 17: + { + float temp; + Archive::get(data,temp); + row->tick_count=temp; + break; + } + case 18: + { + float temp; + Archive::get(data,temp); + row->activate_start_time=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_installationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedIntangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_intangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 4: + { + int temp; + Archive::get(data,temp); + row->count=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedIntangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerIntangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_intangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerIntangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientIntangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_intangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientIntangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedManufactureInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeSharedInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedManufactureInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerManufactureInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 19) + { + decodeServerInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerManufactureInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientManufactureInstallationObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientInstallationObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureInstallationObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientManufactureInstallationObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedManufactureSchematicObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 5) + { + decodeSharedIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureSchematicObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 5: + { + decodeManufactureSchematicAttributes(objectId,data,isBaseline); + break; + } + case 6: + { + int temp; + Archive::get(data,temp); + row->items_per_container=temp; + break; + } + case 7: + { + float temp; + Archive::get(data,temp); + row->manufacture_time=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedManufactureSchematicObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerManufactureSchematicObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureSchematicObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + int temp; + Archive::get(data,temp); + row->draft_schematic=temp; + break; + } + case 12: + { + NetworkId temp; + Archive::get(data,temp); + row->creator_id=temp; + break; + } + case 13: + { + Unicode::String temp; + Archive::get(data,temp); + row->creator_name=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerManufactureSchematicObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientManufactureSchematicObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_manufactureSchematicObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientManufactureSchematicObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedMissionObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 5) + { + decodeSharedIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_missionObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 5: + { + int temp; + Archive::get(data,temp); + row->difficulty=temp; + break; + } + case 6: + { + decodeLocation(data,row->end_x,row->end_y,row->end_z,row->end_cell,row->end_scene); + break; + } + case 7: + { + Unicode::String temp; + Archive::get(data,temp); + row->mission_creator=temp; + break; + } + case 8: + { + int temp; + Archive::get(data,temp); + row->reward=temp; + break; + } + case 9: + { + decodeLocation(data,row->start_x,row->start_y,row->start_z,row->start_cell,row->start_scene); + break; + } + case 10: + { + uint32 temp; + Archive::get(data,temp); + row->target_appearance=temp; + break; + } + case 11: + { + decodeStringId(data,row->description_table,row->description_text); + break; + } + case 12: + { + decodeStringId(data,row->title_table,row->title_text); + break; + } + case 13: + { + int temp; + Archive::get(data,temp); + row->status=temp; + break; + } + case 14: + { + uint32 temp; + Archive::get(data,temp); + row->mission_type=temp; + break; + } + case 15: + { + std::string temp; + Archive::get(data,temp); + row->target_name=temp; + break; + } + case 16: + { + decodeSingleWaypoint(objectId,data,isBaseline); + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedMissionObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerMissionObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_missionObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + std::string temp; + Archive::get(data,temp); + row->root_script_name=temp; + break; + } + case 12: + { + NetworkId temp; + Archive::get(data,temp); + row->mission_holder_id=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerMissionObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientMissionObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_missionObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientMissionObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedPlanetObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_planetObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedPlanetObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerPlanetObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_planetObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + std::string temp; + Archive::get(data,temp); + row->planet_name=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerPlanetObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientPlanetObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientUniverseObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_planetObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientPlanetObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedPlayerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 5) + { + decodeSharedIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 5: + { + decodeMatchMakingId(data,row->character_profile_id); + break; + } + case 6: + { + decodeMatchMakingId(data,row->personal_profile_id); + break; + } + case 7: + { + NullEncodedStandardString temp; + Archive::get(data,temp); + row->skill_title=temp; + break; + } + case 8: + { + int temp; + Archive::get(data,temp); + row->born_date=temp; + break; + } + case 9: + { + int temp; + Archive::get(data,temp); + row->played_time=temp; + break; + } + case 10: + { + int temp; + Archive::get(data,temp); + row->role_icon_choice=temp; + break; + } + case 11: + { + std::string temp; + Archive::get(data,temp); + row->skill_template=temp; + break; + } + case 12: + { + int32 temp; + Archive::get(data,temp); + row->current_gcw_points=temp; + break; + } + case 13: + { + int32 temp; + Archive::get(data,temp); + row->current_pvp_kills=temp; + break; + } + case 14: + { + int64 temp; + Archive::get(data,temp); + row->lifetime_gcw_points=temp; + break; + } + case 15: + { + int32 temp; + Archive::get(data,temp); + row->lifetime_pvp_kills=temp; + break; + } + case 16: + { + BitArray temp; + Archive::get(data,temp); + row->collections=temp; + break; + } + case 17: + { + BitArray temp; + Archive::get(data,temp); + row->collections2=temp; + break; + } + case 18: + { + bool temp; + Archive::get(data,temp); + row->show_backpack=temp; + break; + } + case 19: + { + bool temp; + Archive::get(data,temp); + row->show_helmet=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedPlayerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerPlayerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + StationId temp; + Archive::get(data,temp); + row->station_id=temp; + break; + } + case 12: + { + NetworkId temp; + Archive::get(data,temp); + row->house_id=temp; + break; + } + case 13: + { + int temp; + Archive::get(data,temp); + row->account_num_lots=temp; + break; + } + case 14: + { + int temp; + Archive::get(data,temp); + row->account_max_lots_adjustment=temp; + break; + } + case 15: + { + bool temp; + Archive::get(data,temp); + row->account_is_outcast=temp; + break; + } + case 16: + { + float temp; + Archive::get(data,temp); + row->account_cheater_level=temp; + break; + } + case 17: + { + float temp; + Archive::get(data,temp); + row->force_regen_rate=temp; + break; + } + case 18: + { + int32 temp; + Archive::get(data,temp); + row->current_gcw_rating=temp; + break; + } + case 19: + { + int32 temp; + Archive::get(data,temp); + row->max_gcw_imperial_rating=temp; + break; + } + case 20: + { + int32 temp; + Archive::get(data,temp); + row->max_gcw_rebel_rating=temp; + break; + } + case 21: + { + int32 temp; + Archive::get(data,temp); + row->next_gcw_rating_calc_time=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerPlayerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientPlayerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientIntangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientPlayerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedPlayerQuestObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerQuestObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + std::string temp; + Archive::get(data,temp); + row->title=temp; + break; + } + case 14: + { + std::string temp; + Archive::get(data,temp); + row->description=temp; + break; + } + case 15: + { + NetworkId temp; + Archive::get(data,temp); + row->creator=temp; + break; + } + case 16: + { + int temp; + Archive::get(data,temp); + row->total_tasks=temp; + break; + } + case 17: + { + int temp; + Archive::get(data,temp); + row->difficulty=temp; + break; + } + case 18: + { + std::string temp; + Archive::get(data,temp); + row->task_title1=temp; + break; + } + case 19: + { + std::string temp; + Archive::get(data,temp); + row->task_description1=temp; + break; + } + case 20: + { + std::string temp; + Archive::get(data,temp); + row->task_title2=temp; + break; + } + case 21: + { + std::string temp; + Archive::get(data,temp); + row->task_description2=temp; + break; + } + case 22: + { + std::string temp; + Archive::get(data,temp); + row->task_title3=temp; + break; + } + case 23: + { + std::string temp; + Archive::get(data,temp); + row->task_description3=temp; + break; + } + case 24: + { + std::string temp; + Archive::get(data,temp); + row->task_title4=temp; + break; + } + case 25: + { + std::string temp; + Archive::get(data,temp); + row->task_description4=temp; + break; + } + case 26: + { + std::string temp; + Archive::get(data,temp); + row->task_title5=temp; + break; + } + case 27: + { + std::string temp; + Archive::get(data,temp); + row->task_description5=temp; + break; + } + case 28: + { + std::string temp; + Archive::get(data,temp); + row->task_title6=temp; + break; + } + case 29: + { + std::string temp; + Archive::get(data,temp); + row->task_description6=temp; + break; + } + case 30: + { + std::string temp; + Archive::get(data,temp); + row->task_title7=temp; + break; + } + case 31: + { + std::string temp; + Archive::get(data,temp); + row->task_description7=temp; + break; + } + case 32: + { + std::string temp; + Archive::get(data,temp); + row->task_title8=temp; + break; + } + case 33: + { + std::string temp; + Archive::get(data,temp); + row->task_description8=temp; + break; + } + case 34: + { + std::string temp; + Archive::get(data,temp); + row->task_title9=temp; + break; + } + case 35: + { + std::string temp; + Archive::get(data,temp); + row->task_description9=temp; + break; + } + case 36: + { + std::string temp; + Archive::get(data,temp); + row->task_title10=temp; + break; + } + case 37: + { + std::string temp; + Archive::get(data,temp); + row->task_description10=temp; + break; + } + case 38: + { + std::string temp; + Archive::get(data,temp); + row->task_title11=temp; + break; + } + case 39: + { + std::string temp; + Archive::get(data,temp); + row->task_description11=temp; + break; + } + case 40: + { + std::string temp; + Archive::get(data,temp); + row->task_title12=temp; + break; + } + case 41: + { + std::string temp; + Archive::get(data,temp); + row->task_description12=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedPlayerQuestObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerPlayerQuestObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerQuestObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerPlayerQuestObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientPlayerQuestObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerQuestObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientPlayerQuestObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedResourceContainerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_resourceContainerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + int temp; + Archive::get(data,temp); + row->quantity=temp; + break; + } + case 14: + { + NetworkId temp; + Archive::get(data,temp); + row->resource_type=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedResourceContainerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerResourceContainerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_resourceContainerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + NetworkId temp; + Archive::get(data,temp); + row->source=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerResourceContainerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientResourceContainerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_resourceContainerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientResourceContainerObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedServerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_objectTableBuffer.addEmptyRow(objectId); + + switch(index) + { + case 0: + { + float temp; + Archive::get(data,temp); + row->complexity=temp; + break; + } + case 1: + { + decodeStringId(data,row->name_string_table,row->name_string_text); + break; + } + case 2: + { + NullEncodedUnicodeString temp; + Archive::get(data,temp); + row->object_name=temp; + break; + } + case 3: + { + int temp; + Archive::get(data,temp); + row->volume=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedServerObject. Index is %hu.\n",index)); + } +} + +void SwgSnapshot::decodeServerServerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_objectTableBuffer.addEmptyRow(objectId); + + switch(index) + { + case 0: + { + int temp; + Archive::get(data,temp); + row->cache_version=temp; + break; + } + case 1: + { + bool temp; + Archive::get(data,temp); + row->load_contents=temp; + break; + } + case 2: + { + decodeObjVarFreeFlags(objectId,data,isBaseline); + break; + } + case 3: + { + decodeObjVars(objectId,data,isBaseline); + break; + } + case 4: + { + ignorePersistedFlag(objectId,data); + break; + } + case 5: + { + bool temp; + Archive::get(data,temp); + row->player_controlled=temp; + break; + } + case 6: + { + std::string temp; + Archive::get(data,temp); + row->scene_id=temp; + break; + } + case 7: + { + decodeScriptObject(objectId,data,isBaseline); + break; + } + case 8: + { + int temp; + Archive::get(data,temp); + row->conversion_id=temp; + break; + } + case 9: + { + std::string temp; + Archive::get(data,temp); + row->static_item_name=temp; + break; + } + case 10: + { + int temp; + Archive::get(data,temp); + row->static_item_version=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerServerObject. Index is %hu.\n",index)); + } +} + +void SwgSnapshot::decodeClientServerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_objectTableBuffer.addEmptyRow(objectId); + + switch(index) + { + case 0: + { + int temp; + Archive::get(data,temp); + row->bank_balance=temp; + break; + } + case 1: + { + int temp; + Archive::get(data,temp); + row->cash_balance=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientServerObject. Index is %hu.\n",index)); + } +} + +void SwgSnapshot::decodeSharedShipObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_shipObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + float temp; + Archive::get(data,temp); + row->slide_dampener=temp; + break; + } + case 14: + { + float temp; + Archive::get(data,temp); + row->current_chassis_hit_points=temp; + break; + } + case 15: + { + float temp; + Archive::get(data,temp); + row->maximum_chassis_hit_points=temp; + break; + } + case 16: + { + uint32 temp; + Archive::get(data,temp); + row->chassis_type=temp; + break; + } + case 17: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_armor_hp_maximum=packedValue; + break; + } + case 18: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_armor_hp_current=packedValue; + break; + } + case 19: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_hp_current=packedValue; + break; + } + case 20: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_hp_maximum=packedValue; + break; + } + case 21: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_flags=packedValue; + break; + } + case 22: + { + float temp; + Archive::get(data,temp); + row->shield_hp_front_maximum=temp; + break; + } + case 23: + { + float temp; + Archive::get(data,temp); + row->shield_hp_back_maximum=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedShipObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerShipObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_shipObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_crc=packedValue; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerShipObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientShipObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_shipObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 2: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_efficiency_general=packedValue; + break; + } + case 3: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_efficiency_eng=packedValue; + break; + } + case 4: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_eng_maintenance=packedValue; + break; + } + case 5: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_mass=packedValue; + break; + } + case 6: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_names=packedValue; + break; + } + case 7: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cmp_creators=packedValue; + break; + } + case 8: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_damage_maximum=packedValue; + break; + } + case 9: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_damage_minimum=packedValue; + break; + } + case 10: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_effectiveness_shields=packedValue; + break; + } + case 11: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_effectiveness_armor=packedValue; + break; + } + case 12: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_eng_per_shot=packedValue; + break; + } + case 13: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_refire_rate=packedValue; + break; + } + case 14: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_ammo_current=packedValue; + break; + } + case 15: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_ammo_maximum=packedValue; + break; + } + case 16: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->weapon_ammo_type=packedValue; + break; + } + case 17: + { + float temp; + Archive::get(data,temp); + row->chassis_cmp_mass_maximum=temp; + break; + } + case 18: + { + float temp; + Archive::get(data,temp); + row->shield_recharge_rate=temp; + break; + } + case 19: + { + float temp; + Archive::get(data,temp); + row->capacitor_eng_maximum=temp; + break; + } + case 20: + { + float temp; + Archive::get(data,temp); + row->capacitor_eng_recharge_rate=temp; + break; + } + case 21: + { + float temp; + Archive::get(data,temp); + row->engine_acc_rate=temp; + break; + } + case 22: + { + float temp; + Archive::get(data,temp); + row->engine_deceleration_rate=temp; + break; + } + case 23: + { + float temp; + Archive::get(data,temp); + row->engine_pitch_acc_rate=temp; + break; + } + case 24: + { + float temp; + Archive::get(data,temp); + row->engine_yaw_acc_rate=temp; + break; + } + case 25: + { + float temp; + Archive::get(data,temp); + row->engine_roll_acc_rate=temp; + break; + } + case 26: + { + float temp; + Archive::get(data,temp); + row->engine_pitch_rate_maximum=temp; + break; + } + case 27: + { + float temp; + Archive::get(data,temp); + row->engine_yaw_rate_maximum=temp; + break; + } + case 28: + { + float temp; + Archive::get(data,temp); + row->engine_roll_rate_maximum=temp; + break; + } + case 29: + { + float temp; + Archive::get(data,temp); + row->engine_speed_maximum=temp; + break; + } + case 30: + { + float temp; + Archive::get(data,temp); + row->reactor_eng_generation_rate=temp; + break; + } + case 31: + { + float temp; + Archive::get(data,temp); + row->booster_eng_maximum=temp; + break; + } + case 32: + { + float temp; + Archive::get(data,temp); + row->booster_eng_recharge_rate=temp; + break; + } + case 33: + { + float temp; + Archive::get(data,temp); + row->booster_eng_consumption_rate=temp; + break; + } + case 34: + { + float temp; + Archive::get(data,temp); + row->booster_acc=temp; + break; + } + case 35: + { + float temp; + Archive::get(data,temp); + row->booster_speed_maximum=temp; + break; + } + case 36: + { + float temp; + Archive::get(data,temp); + row->droid_if_cmd_speed=temp; + break; + } + case 37: + { + NetworkId temp; + Archive::get(data,temp); + row->installed_dcd=temp; + break; + } + case 38: + { + int temp; + Archive::get(data,temp); + row->cargo_hold_contents_maximum=temp; + break; + } + case 39: + { + int temp; + Archive::get(data,temp); + row->cargo_hold_contents_current=temp; + break; + } + case 40: + { + std::string packedValue; + Archive::AutoDeltaPackedMap::unpack(data,packedValue); + row->cargo_hold_contents=packedValue; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientShipObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedStaticObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_staticObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedStaticObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerStaticObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_staticObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerStaticObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientStaticObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_staticObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientStaticObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedTangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_tangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 4: + { + uint32 temp; + Archive::get(data,temp); + row->pvp_faction=temp; + break; + } + case 5: + { + int temp; + Archive::get(data,temp); + row->pvp_type=temp; + break; + } + case 6: + { + std::string temp; + Archive::get(data,temp); + row->appearance_data=temp; + break; + } + case 7: + { + decodeComponents(objectId,data,isBaseline); + break; + } + case 8: + { + int temp; + Archive::get(data,temp); + row->condition=temp; + break; + } + case 9: + { + int temp; + Archive::get(data,temp); + row->count=temp; + break; + } + case 10: + { + int temp; + Archive::get(data,temp); + row->damage_taken=temp; + break; + } + case 11: + { + int temp; + Archive::get(data,temp); + row->max_hit_points=temp; + break; + } + case 12: + { + bool temp; + Archive::get(data,temp); + row->visible=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedTangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerTangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_tangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 11: + { + std::string temp; + Archive::get(data,temp); + row->custom_appearance=temp; + break; + } + case 12: + { + decodeLocationDataList(objectId,1,data,isBaseline); + break; + } + case 13: + { + NetworkId temp; + Archive::get(data,temp); + row->owner_id=temp; + break; + } + case 14: + { + NetworkId temp; + Archive::get(data,temp); + row->creator_id=temp; + break; + } + case 15: + { + uint32 temp; + Archive::get(data,temp); + row->source_draft_schematic=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerTangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientTangibleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_tangibleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientTangibleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedUniverseObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 4) + { + decodeSharedServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_universeObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedUniverseObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerUniverseObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 11) + { + decodeServerServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_universeObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerUniverseObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientUniverseObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientServerObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_universeObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientUniverseObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedVehicleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_vehicleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedVehicleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerVehicleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_vehicleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + int temp; + Archive::get(data,temp); + row->bogus=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerVehicleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientVehicleObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_vehicleObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientVehicleObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeSharedWeaponObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 13) + { + decodeSharedTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_weaponObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 13: + { + float temp; + Archive::get(data,temp); + row->attack_speed=temp; + break; + } + case 14: + { + int temp; + Archive::get(data,temp); + row->accuracy=temp; + break; + } + case 15: + { + float temp; + Archive::get(data,temp); + row->min_range=temp; + break; + } + case 16: + { + float temp; + Archive::get(data,temp); + row->max_range=temp; + break; + } + case 17: + { + int temp; + Archive::get(data,temp); + row->damage_type=temp; + break; + } + case 18: + { + int temp; + Archive::get(data,temp); + row->elemental_type=temp; + break; + } + case 19: + { + int temp; + Archive::get(data,temp); + row->elemental_value=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeSharedWeaponObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeServerWeaponObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 16) + { + decodeServerTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_weaponObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 16: + { + int temp; + Archive::get(data,temp); + row->min_damage=temp; + break; + } + case 17: + { + int temp; + Archive::get(data,temp); + row->max_damage=temp; + break; + } + case 18: + { + float temp; + Archive::get(data,temp); + row->wound_chance=temp; + break; + } + case 19: + { + int temp; + Archive::get(data,temp); + row->attack_cost=temp; + break; + } + case 20: + { + float temp; + Archive::get(data,temp); + row->damage_radius=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeServerWeaponObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeClientWeaponObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + if (index < 2) + { + decodeClientTangibleObject(objectId,index,data, isBaseline); + } + else + { + DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_weaponObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeClientWeaponObject. Index is %hu.\n",index)); + } + } +} + +void SwgSnapshot::decodeParentClientPlayerObject(NetworkId const & objectId, uint16 index, Archive::ReadIterator &data, bool isBaseline) +{ + UNREF(isBaseline); + + DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findRowByIndex(objectId); + if (row==NULL) + row=m_playerObjectBuffer.addEmptyRow(objectId); + + switch(index) + { + case 0: + { + decodeExperience(objectId,data,isBaseline); + break; + } + case 1: + { + decodeWaypoints(objectId,data,isBaseline); + break; + } + case 2: + { + int temp; + Archive::get(data,temp); + row->force_power=temp; + break; + } + case 3: + { + int temp; + Archive::get(data,temp); + row->max_force_power=temp; + break; + } + case 4: + { + BitArray temp; + Archive::get(data,temp); + row->completed_quests=temp; + break; + } + case 5: + { + BitArray temp; + Archive::get(data,temp); + row->active_quests=temp; + break; + } + case 6: + { + uint32 temp; + Archive::get(data,temp); + row->current_quest=temp; + break; + } + case 7: + { + decodeQuests(objectId,data,row->quests,row->quests2,row->quests3,row->quests4); + break; + } + case 8: + { + std::string temp; + Archive::get(data,temp); + row->working_skill=temp; + break; + } + default: + DEBUG_REPORT_LOG(true,("Fell through cases in decodeParentClientPlayerObject. Index is %hu.\n",index)); + } +} + +void SwgSnapshot::decodeServerData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) +{ + switch(typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + decodeServerBattlefieldMarkerObject(objectId, index, bs, isBaseline); + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + decodeServerBuildingObject(objectId, index, bs, isBaseline); + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + decodeServerCellObject(objectId, index, bs, isBaseline); + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + decodeServerCityObject(objectId, index, bs, isBaseline); + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + decodeServerCreatureObject(objectId, index, bs, isBaseline); + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + decodeServerFactoryObject(objectId, index, bs, isBaseline); + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + decodeServerGuildObject(objectId, index, bs, isBaseline); + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + decodeServerHarvesterInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + decodeServerInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + decodeServerIntangibleObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + decodeServerManufactureInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + decodeServerManufactureSchematicObject(objectId, index, bs, isBaseline); + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + decodeServerMissionObject(objectId, index, bs, isBaseline); + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + decodeServerPlanetObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + decodeServerPlayerObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + decodeServerPlayerQuestObject(objectId, index, bs, isBaseline); + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + decodeServerResourceContainerObject(objectId, index, bs, isBaseline); + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + decodeServerServerObject(objectId, index, bs, isBaseline); + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + decodeServerShipObject(objectId, index, bs, isBaseline); + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + decodeServerStaticObject(objectId, index, bs, isBaseline); + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + decodeServerTangibleObject(objectId, index, bs, isBaseline); + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + decodeServerUniverseObject(objectId, index, bs, isBaseline); + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + decodeServerVehicleObject(objectId, index, bs, isBaseline); + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + decodeServerWeaponObject(objectId, index, bs, isBaseline); + break; + } +} + +void SwgSnapshot::decodeSharedData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) +{ + switch(typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + decodeSharedBattlefieldMarkerObject(objectId, index, bs, isBaseline); + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + decodeSharedBuildingObject(objectId, index, bs, isBaseline); + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + decodeSharedCellObject(objectId, index, bs, isBaseline); + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + decodeSharedCityObject(objectId, index, bs, isBaseline); + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + decodeSharedCreatureObject(objectId, index, bs, isBaseline); + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + decodeSharedFactoryObject(objectId, index, bs, isBaseline); + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + decodeSharedGuildObject(objectId, index, bs, isBaseline); + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + decodeSharedHarvesterInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + decodeSharedInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + decodeSharedIntangibleObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + decodeSharedManufactureInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + decodeSharedManufactureSchematicObject(objectId, index, bs, isBaseline); + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + decodeSharedMissionObject(objectId, index, bs, isBaseline); + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + decodeSharedPlanetObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + decodeSharedPlayerObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + decodeSharedPlayerQuestObject(objectId, index, bs, isBaseline); + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + decodeSharedResourceContainerObject(objectId, index, bs, isBaseline); + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + decodeSharedServerObject(objectId, index, bs, isBaseline); + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + decodeSharedShipObject(objectId, index, bs, isBaseline); + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + decodeSharedStaticObject(objectId, index, bs, isBaseline); + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + decodeSharedTangibleObject(objectId, index, bs, isBaseline); + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + decodeSharedUniverseObject(objectId, index, bs, isBaseline); + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + decodeSharedVehicleObject(objectId, index, bs, isBaseline); + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + decodeSharedWeaponObject(objectId, index, bs, isBaseline); + break; + } +} + +void SwgSnapshot::decodeClientData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) +{ + switch(typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + decodeClientBattlefieldMarkerObject(objectId, index, bs, isBaseline); + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + decodeClientBuildingObject(objectId, index, bs, isBaseline); + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + decodeClientCellObject(objectId, index, bs, isBaseline); + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + decodeClientCityObject(objectId, index, bs, isBaseline); + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + decodeClientCreatureObject(objectId, index, bs, isBaseline); + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + decodeClientFactoryObject(objectId, index, bs, isBaseline); + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + decodeClientGuildObject(objectId, index, bs, isBaseline); + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + decodeClientHarvesterInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + decodeClientInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + decodeClientIntangibleObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + decodeClientManufactureInstallationObject(objectId, index, bs, isBaseline); + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + decodeClientManufactureSchematicObject(objectId, index, bs, isBaseline); + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + decodeClientMissionObject(objectId, index, bs, isBaseline); + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + decodeClientPlanetObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + decodeClientPlayerObject(objectId, index, bs, isBaseline); + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + decodeClientPlayerQuestObject(objectId, index, bs, isBaseline); + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + decodeClientResourceContainerObject(objectId, index, bs, isBaseline); + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + decodeClientServerObject(objectId, index, bs, isBaseline); + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + decodeClientShipObject(objectId, index, bs, isBaseline); + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + decodeClientStaticObject(objectId, index, bs, isBaseline); + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + decodeClientTangibleObject(objectId, index, bs, isBaseline); + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + decodeClientUniverseObject(objectId, index, bs, isBaseline); + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + decodeClientVehicleObject(objectId, index, bs, isBaseline); + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + decodeClientWeaponObject(objectId, index, bs, isBaseline); + break; + } +} + +void SwgSnapshot::decodeParentClientData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) +{ + switch(typeId) + { + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + decodeParentClientPlayerObject(objectId, index, bs, isBaseline); + break; + } +} + //!!!END GENERATED DECODER diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template index 494b6ce0f..1dba75a46 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template @@ -50,4 +50,2694 @@ #include //!!!BEGIN GENERATED ENCODER +bool SwgSnapshot::encodeSharedBattlefieldMarkerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedBattlefieldMarkerObject"); + + const DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BattlefieldMarkerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerBattlefieldMarkerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=18; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerBattlefieldMarkerObject"); + + const DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BattlefieldMarkerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string temp; + row->region_name.getValue(temp); + Archive::put(data,temp); + } + encodeBattlefieldParticipants(objectId,data); + return true; +} + +bool SwgSnapshot::encodeClientBattlefieldMarkerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientBattlefieldMarkerObject"); + + const DBSchema::BattlefieldMarkerObjectBufferRow *row=m_battlefieldMarkerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BattlefieldMarkerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedBuildingObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedBuildingObject"); + + const DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BuildingObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerBuildingObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=22; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerBuildingObject"); + + const DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BuildingObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodePropertyList(objectId,PropertyListBuffer::LI_Allowed,data); + encodePropertyList(objectId,PropertyListBuffer::LI_Banned,data); + { + bool temp; + row->is_public.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->maintenance_cost.getValue(temp); + Archive::put(data,temp); + } + { + real temp; + row->time_last_checked.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->city_id.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientBuildingObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientBuildingObject"); + + const DBSchema::BuildingObjectBufferRow *row=m_buildingObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no BuildingObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedCellObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=6; + Archive::put(data,temp); + } + encodeSharedServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedCellObject"); + + const DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CellObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + bool temp; + row->is_public.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->cell_number.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerCellObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeServerServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerCellObject"); + + const DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CellObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodePropertyList(objectId,PropertyListBuffer::LI_Allowed,data); + encodePropertyList(objectId,PropertyListBuffer::LI_Banned,data); + return true; +} + +bool SwgSnapshot::encodeClientCellObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientCellObject"); + + const DBSchema::CellObjectBufferRow *row=m_cellObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CellObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedCityObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + encodeSharedUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedCityObject"); + + const DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CityObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerCityObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=14; + Archive::put(data,temp); + } + encodeServerUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerCityObject"); + + const DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CityObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodePropertyList(objectId,PropertyListBuffer::LI_Cities,data); + encodePropertyList(objectId,PropertyListBuffer::LI_Citizens,data); + encodePropertyList(objectId,PropertyListBuffer::LI_CityStructures,data); + return true; +} + +bool SwgSnapshot::encodeClientCityObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientCityObject"); + + const DBSchema::CityObjectBufferRow *row=m_cityObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CityObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedCreatureObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=19; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedCreatureObject"); + + const DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CreatureObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + Postures::Enumerator temp; + row->posture.getValue(temp); + Archive::put(data,temp); + } + { + uint8 temp; + row->rank.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->master_id.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->scale_factor.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->shock_wounds.getValue(temp); + Archive::put(data,temp); + } + { + uint64 temp; + row->states.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerCreatureObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=23; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerCreatureObject"); + + const DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CreatureObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodeAttributes(objectId,data,0); + { + float temp; + row->base_run_speed.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->base_walk_speed.getValue(temp); + Archive::put(data,temp); + } + encodePersistedBuffs(data,row->persisted_buffs); + { + float temp; + row->ws_x.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->ws_y.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->ws_z.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientCreatureObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientCreatureObject"); + + const DBSchema::CreatureObjectBufferRow *row=m_creatureObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no CreatureObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodeAttributes(objectId,data,9); + encodePropertyList(objectId,PropertyListBuffer::LI_Skills,data); + return true; +} + +bool SwgSnapshot::encodeSharedFactoryObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedFactoryObject"); + + const DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no FactoryObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerFactoryObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerFactoryObject"); + + const DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no FactoryObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientFactoryObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientFactoryObject"); + + const DBSchema::FactoryObjectBufferRow *row=m_factoryObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no FactoryObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedGuildObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=5; + Archive::put(data,temp); + } + encodeSharedUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedGuildObject"); + + const DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no GuildObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodePropertyList(objectId,PropertyListBuffer::LI_GuildAbbrevs,data); + return true; +} + +bool SwgSnapshot::encodeServerGuildObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=15; + Archive::put(data,temp); + } + encodeServerUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerGuildObject"); + + const DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no GuildObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodePropertyList(objectId,PropertyListBuffer::LI_GuildNames,data); + encodePropertyList(objectId,PropertyListBuffer::LI_GuildLeaders,data); + encodePropertyList(objectId,PropertyListBuffer::LI_GuildMembers,data); + encodePropertyList(objectId,PropertyListBuffer::LI_GuildEnemies,data); + return true; +} + +bool SwgSnapshot::encodeClientGuildObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientGuildObject"); + + const DBSchema::GuildObjectBufferRow *row=m_guildObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no GuildObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedHarvesterInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeSharedInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedHarvesterInstallationObject"); + + const DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no HarvesterInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerHarvesterInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=26; + Archive::put(data,temp); + } + encodeServerInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerHarvesterInstallationObject"); + + const DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no HarvesterInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + float temp; + row->installed_efficiency.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->resource_type.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->max_extraction_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->current_extraction_rate.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->max_hopper_amount.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->hopper_resource.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->hopper_amount.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientHarvesterInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientHarvesterInstallationObject"); + + const DBSchema::HarvesterInstallationObjectBufferRow *row=m_harvesterInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no HarvesterInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedInstallationObject"); + + const DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no InstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + bool temp; + row->activated.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->power.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->power_rate.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=19; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerInstallationObject"); + + const DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no InstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int32 temp; + row->installation_type.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->tick_count.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->activate_start_time.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientInstallationObject"); + + const DBSchema::InstallationObjectBufferRow *row=m_installationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no InstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedIntangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=5; + Archive::put(data,temp); + } + encodeSharedServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedIntangibleObject"); + + const DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no IntangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->count.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerIntangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=11; + Archive::put(data,temp); + } + encodeServerServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerIntangibleObject"); + + const DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no IntangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientIntangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientIntangibleObject"); + + const DBSchema::IntangibleObjectBufferRow *row=m_intangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no IntangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedManufactureInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeSharedInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedManufactureInstallationObject"); + + const DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerManufactureInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=19; + Archive::put(data,temp); + } + encodeServerInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerManufactureInstallationObject"); + + const DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientManufactureInstallationObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientInstallationObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientManufactureInstallationObject"); + + const DBSchema::ManufactureInstallationObjectBufferRow *row=m_manufactureInstallationObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureInstallationObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedManufactureSchematicObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=8; + Archive::put(data,temp); + } + encodeSharedIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedManufactureSchematicObject"); + + const DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureSchematicObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodeManufactureSchematicAttributes(objectId,data); + { + int temp; + row->items_per_container.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->manufacture_time.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerManufactureSchematicObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=14; + Archive::put(data,temp); + } + encodeServerIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerManufactureSchematicObject"); + + const DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureSchematicObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->draft_schematic.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->creator_id.getValue(temp); + Archive::put(data,temp); + } + { + Unicode::String temp; + row->creator_name.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientManufactureSchematicObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientManufactureSchematicObject"); + + const DBSchema::ManufactureSchematicObjectBufferRow *row=m_manufactureSchematicObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ManufactureSchematicObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedMissionObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=17; + Archive::put(data,temp); + } + encodeSharedIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedMissionObject"); + + const DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no MissionObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->difficulty.getValue(temp); + Archive::put(data,temp); + } + encodeLocation(data,row->end_x,row->end_y,row->end_z,row->end_cell,row->end_scene); + { + Unicode::String temp; + row->mission_creator.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->reward.getValue(temp); + Archive::put(data,temp); + } + encodeLocation(data,row->start_x,row->start_y,row->start_z,row->start_cell,row->start_scene); + { + uint32 temp; + row->target_appearance.getValue(temp); + Archive::put(data,temp); + } + encodeStringId(data,row->description_table,row->description_text); + encodeStringId(data,row->title_table,row->title_text); + { + int temp; + row->status.getValue(temp); + Archive::put(data,temp); + } + { + uint32 temp; + row->mission_type.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->target_name.getValue(temp); + Archive::put(data,temp); + } + encodeSingleWaypoint(objectId,data); + return true; +} + +bool SwgSnapshot::encodeServerMissionObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeServerIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerMissionObject"); + + const DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no MissionObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string temp; + row->root_script_name.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->mission_holder_id.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientMissionObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientMissionObject"); + + const DBSchema::MissionObjectBufferRow *row=m_missionObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no MissionObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedPlanetObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + encodeSharedUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedPlanetObject"); + + const DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlanetObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerPlanetObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=12; + Archive::put(data,temp); + } + encodeServerUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerPlanetObject"); + + const DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlanetObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string temp; + row->planet_name.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientPlanetObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientUniverseObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientPlanetObject"); + + const DBSchema::PlanetObjectBufferRow *row=m_planetObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlanetObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedPlayerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=20; + Archive::put(data,temp); + } + encodeSharedIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedPlayerObject"); + + const DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodeMatchMakingId(data,row->character_profile_id); + encodeMatchMakingId(data,row->personal_profile_id); + { + NullEncodedStandardString temp; + row->skill_title.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->born_date.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->played_time.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->role_icon_choice.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->skill_template.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->current_gcw_points.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->current_pvp_kills.getValue(temp); + Archive::put(data,temp); + } + { + int64 temp; + row->lifetime_gcw_points.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->lifetime_pvp_kills.getValue(temp); + Archive::put(data,temp); + } + { + BitArray temp; + row->collections.getValue(temp); + Archive::put(data,temp); + } + { + BitArray temp; + row->collections2.getValue(temp); + Archive::put(data,temp); + } + { + bool temp; + row->show_backpack.getValue(temp); + Archive::put(data,temp); + } + { + bool temp; + row->show_helmet.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerPlayerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=22; + Archive::put(data,temp); + } + encodeServerIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerPlayerObject"); + + const DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + StationId temp; + row->station_id.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->house_id.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->account_num_lots.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->account_max_lots_adjustment.getValue(temp); + Archive::put(data,temp); + } + { + bool temp; + row->account_is_outcast.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->account_cheater_level.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->force_regen_rate.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->current_gcw_rating.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->max_gcw_imperial_rating.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->max_gcw_rebel_rating.getValue(temp); + Archive::put(data,temp); + } + { + int32 temp; + row->next_gcw_rating_calc_time.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientPlayerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientIntangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientPlayerObject"); + + const DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedPlayerQuestObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=42; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedPlayerQuestObject"); + + const DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerQuestObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string temp; + row->title.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->description.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->creator.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->total_tasks.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->difficulty.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title1.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description1.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title2.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description2.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title3.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description3.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title4.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description4.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title5.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description5.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title6.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description6.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title7.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description7.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title8.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description8.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title9.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description9.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title10.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description10.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title11.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description11.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_title12.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->task_description12.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerPlayerQuestObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerPlayerQuestObject"); + + const DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerQuestObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientPlayerQuestObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientPlayerQuestObject"); + + const DBSchema::PlayerQuestObjectBufferRow *row=m_playerQuestObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerQuestObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedResourceContainerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=15; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedResourceContainerObject"); + + const DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ResourceContainerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->quantity.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->resource_type.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerResourceContainerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=17; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerResourceContainerObject"); + + const DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ResourceContainerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + NetworkId temp; + row->source.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientResourceContainerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientResourceContainerObject"); + + const DBSchema::ResourceContainerObjectBufferRow *row=m_resourceContainerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ResourceContainerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedServerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedServerObject"); + + const DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + float temp; + row->complexity.getValue(temp); + Archive::put(data,temp); + } + encodeStringId(data,row->name_string_table,row->name_string_text); + { + NullEncodedUnicodeString temp; + row->object_name.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->volume.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerServerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=11; + Archive::put(data,temp); + } + PROFILER_AUTO_BLOCK_DEFINE("encodeServerServerObject"); + + const DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->cache_version.getValue(temp); + Archive::put(data,temp); + } + { + bool temp; + row->load_contents.getValue(temp); + Archive::put(data,temp); + } + encodeObjVarFreeFlags(objectId,data); + encodeObjVars(objectId,data); + Archive::put(data,true); + { + bool temp; + row->player_controlled.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->scene_id.getValue(temp); + Archive::put(data,temp); + } + encodeScriptObject(objectId,data); + { + int temp; + row->conversion_id.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->static_item_name.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->static_item_version.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientServerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + PROFILER_AUTO_BLOCK_DEFINE("encodeClientServerObject"); + + const DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->bank_balance.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->cash_balance.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeSharedShipObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=24; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedShipObject"); + + const DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ShipObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + float temp; + row->slide_dampener.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->current_chassis_hit_points.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->maximum_chassis_hit_points.getValue(temp); + Archive::put(data,temp); + } + { + uint32 temp; + row->chassis_type.getValue(temp); + Archive::put(data,temp); + } + { + std::string packedValue; + row->cmp_armor_hp_maximum.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_armor_hp_current.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_hp_current.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_hp_maximum.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_flags.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + float temp; + row->shield_hp_front_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->shield_hp_back_maximum.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerShipObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=17; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerShipObject"); + + const DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ShipObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string packedValue; + row->cmp_crc.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + return true; +} + +bool SwgSnapshot::encodeClientShipObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=41; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientShipObject"); + + const DBSchema::ShipObjectBufferRow *row=m_shipObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ShipObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string packedValue; + row->cmp_efficiency_general.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_efficiency_eng.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_eng_maintenance.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_mass.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_names.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->cmp_creators.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_damage_maximum.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_damage_minimum.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_effectiveness_shields.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_effectiveness_armor.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_eng_per_shot.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_refire_rate.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_ammo_current.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_ammo_maximum.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + std::string packedValue; + row->weapon_ammo_type.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + { + float temp; + row->chassis_cmp_mass_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->shield_recharge_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->capacitor_eng_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->capacitor_eng_recharge_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_acc_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_deceleration_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_pitch_acc_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_yaw_acc_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_roll_acc_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_pitch_rate_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_yaw_rate_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_roll_rate_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->engine_speed_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->reactor_eng_generation_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->booster_eng_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->booster_eng_recharge_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->booster_eng_consumption_rate.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->booster_acc.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->booster_speed_maximum.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->droid_if_cmd_speed.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->installed_dcd.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->cargo_hold_contents_maximum.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->cargo_hold_contents_current.getValue(temp); + Archive::put(data,temp); + } + { + std::string packedValue; + row->cargo_hold_contents.getValue(packedValue); + Archive::AutoDeltaPackedMap::pack(data, packedValue); + } + return true; +} + +bool SwgSnapshot::encodeSharedStaticObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + encodeSharedServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedStaticObject"); + + const DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no StaticObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerStaticObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=11; + Archive::put(data,temp); + } + encodeServerServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerStaticObject"); + + const DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no StaticObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientStaticObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientStaticObject"); + + const DBSchema::StaticObjectBufferRow *row=m_staticObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no StaticObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedTangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeSharedServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedTangibleObject"); + + const DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no TangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + uint32 temp; + row->pvp_faction.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->pvp_type.getValue(temp); + Archive::put(data,temp); + } + { + std::string temp; + row->appearance_data.getValue(temp); + Archive::put(data,temp); + } + encodeComponents(objectId,data); + { + int temp; + row->condition.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->count.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->damage_taken.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->max_hit_points.getValue(temp); + Archive::put(data,temp); + } + { + bool temp; + row->visible.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerTangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=16; + Archive::put(data,temp); + } + encodeServerServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerTangibleObject"); + + const DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no TangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + std::string temp; + row->custom_appearance.getValue(temp); + Archive::put(data,temp); + } + encodeLocationDataList(objectId,1,data); + { + NetworkId temp; + row->owner_id.getValue(temp); + Archive::put(data,temp); + } + { + NetworkId temp; + row->creator_id.getValue(temp); + Archive::put(data,temp); + } + { + uint32 temp; + row->source_draft_schematic.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientTangibleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientTangibleObject"); + + const DBSchema::TangibleObjectBufferRow *row=m_tangibleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no TangibleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedUniverseObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=4; + Archive::put(data,temp); + } + encodeSharedServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedUniverseObject"); + + const DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no UniverseObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerUniverseObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=11; + Archive::put(data,temp); + } + encodeServerServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerUniverseObject"); + + const DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no UniverseObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeClientUniverseObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientServerObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientUniverseObject"); + + const DBSchema::UniverseObjectBufferRow *row=m_universeObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no UniverseObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedVehicleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=13; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedVehicleObject"); + + const DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no VehicleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeServerVehicleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=17; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerVehicleObject"); + + const DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no VehicleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->bogus.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientVehicleObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientVehicleObject"); + + const DBSchema::VehicleObjectBufferRow *row=m_vehicleObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no VehicleObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeSharedWeaponObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=20; + Archive::put(data,temp); + } + encodeSharedTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeSharedWeaponObject"); + + const DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no WeaponObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + float temp; + row->attack_speed.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->accuracy.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->min_range.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->max_range.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->damage_type.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->elemental_type.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->elemental_value.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeServerWeaponObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=21; + Archive::put(data,temp); + } + encodeServerTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeServerWeaponObject"); + + const DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no WeaponObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + { + int temp; + row->min_damage.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->max_damage.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->wound_chance.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->attack_cost.getValue(temp); + Archive::put(data,temp); + } + { + float temp; + row->damage_radius.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeClientWeaponObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=2; + Archive::put(data,temp); + } + encodeClientTangibleObject(objectId, data, false); + + PROFILER_AUTO_BLOCK_DEFINE("encodeClientWeaponObject"); + + const DBSchema::WeaponObjectBufferRow *row=m_weaponObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no WeaponObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + return true; +} + +bool SwgSnapshot::encodeParentClientPlayerObject(NetworkId const & objectId, Archive::ByteStream &data, bool addCount) const +{ + if (addCount) + { + uint16 temp=9; + Archive::put(data,temp); + } + PROFILER_AUTO_BLOCK_DEFINE("encodeParentClientPlayerObject"); + + const DBSchema::PlayerObjectBufferRow *row=m_playerObjectBuffer.findConstRowByIndex(objectId); + WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no PlayerObjectBufferRow in the buffer\n",objectId.getValueString().c_str())); + if (!row) + return false; + + encodeExperience(objectId,data); + encodeWaypoints(objectId,data); + { + int temp; + row->force_power.getValue(temp); + Archive::put(data,temp); + } + { + int temp; + row->max_force_power.getValue(temp); + Archive::put(data,temp); + } + { + BitArray temp; + row->completed_quests.getValue(temp); + Archive::put(data,temp); + } + { + BitArray temp; + row->active_quests.getValue(temp); + Archive::put(data,temp); + } + { + uint32 temp; + row->current_quest.getValue(temp); + Archive::put(data,temp); + } + encodeQuests(data,row->quests,row->quests2,row->quests3,row->quests4); + { + std::string temp; + row->working_skill.getValue(temp); + Archive::put(data,temp); + } + return true; +} + +bool SwgSnapshot::encodeSharedData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const +{ + Archive::ByteStream bs; + switch (typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + if (!encodeSharedBattlefieldMarkerObject(objectId, bs)) return false; + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + if (!encodeSharedBuildingObject(objectId, bs)) return false; + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + if (!encodeSharedCellObject(objectId, bs)) return false; + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + if (!encodeSharedCityObject(objectId, bs)) return false; + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + if (!encodeSharedCreatureObject(objectId, bs)) return false; + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + if (!encodeSharedFactoryObject(objectId, bs)) return false; + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + if (!encodeSharedGuildObject(objectId, bs)) return false; + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + if (!encodeSharedHarvesterInstallationObject(objectId, bs)) return false; + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + if (!encodeSharedInstallationObject(objectId, bs)) return false; + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + if (!encodeSharedIntangibleObject(objectId, bs)) return false; + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + if (!encodeSharedManufactureInstallationObject(objectId, bs)) return false; + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + if (!encodeSharedManufactureSchematicObject(objectId, bs)) return false; + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + if (!encodeSharedMissionObject(objectId, bs)) return false; + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + if (!encodeSharedPlanetObject(objectId, bs)) return false; + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + if (!encodeSharedPlayerObject(objectId, bs)) return false; + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + if (!encodeSharedPlayerQuestObject(objectId, bs)) return false; + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + if (!encodeSharedResourceContainerObject(objectId, bs)) return false; + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + if (!encodeSharedServerObject(objectId, bs)) return false; + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + if (!encodeSharedShipObject(objectId, bs)) return false; + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + if (!encodeSharedStaticObject(objectId, bs)) return false; + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + if (!encodeSharedTangibleObject(objectId, bs)) return false; + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + if (!encodeSharedUniverseObject(objectId, bs)) return false; + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + if (!encodeSharedVehicleObject(objectId, bs)) return false; + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + if (!encodeSharedWeaponObject(objectId, bs)) return false; + break; + } + + // test for 0-length message + if (bs.getSize() == 0) + return true; + + { + PROFILER_AUTO_BLOCK_DEFINE("new BaselinesMessage"); + baselines.push_back(BatchBaselinesMessageData(objectId,typeId,BaselinesMessage::BASELINES_SHARED,bs)); + } + return true; +} + +bool SwgSnapshot::encodeServerData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const +{ + Archive::ByteStream bs; + switch (typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + if (!encodeServerBattlefieldMarkerObject(objectId, bs)) return false; + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + if (!encodeServerBuildingObject(objectId, bs)) return false; + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + if (!encodeServerCellObject(objectId, bs)) return false; + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + if (!encodeServerCityObject(objectId, bs)) return false; + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + if (!encodeServerCreatureObject(objectId, bs)) return false; + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + if (!encodeServerFactoryObject(objectId, bs)) return false; + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + if (!encodeServerGuildObject(objectId, bs)) return false; + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + if (!encodeServerHarvesterInstallationObject(objectId, bs)) return false; + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + if (!encodeServerInstallationObject(objectId, bs)) return false; + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + if (!encodeServerIntangibleObject(objectId, bs)) return false; + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + if (!encodeServerManufactureInstallationObject(objectId, bs)) return false; + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + if (!encodeServerManufactureSchematicObject(objectId, bs)) return false; + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + if (!encodeServerMissionObject(objectId, bs)) return false; + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + if (!encodeServerPlanetObject(objectId, bs)) return false; + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + if (!encodeServerPlayerObject(objectId, bs)) return false; + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + if (!encodeServerPlayerQuestObject(objectId, bs)) return false; + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + if (!encodeServerResourceContainerObject(objectId, bs)) return false; + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + if (!encodeServerServerObject(objectId, bs)) return false; + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + if (!encodeServerShipObject(objectId, bs)) return false; + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + if (!encodeServerStaticObject(objectId, bs)) return false; + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + if (!encodeServerTangibleObject(objectId, bs)) return false; + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + if (!encodeServerUniverseObject(objectId, bs)) return false; + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + if (!encodeServerVehicleObject(objectId, bs)) return false; + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + if (!encodeServerWeaponObject(objectId, bs)) return false; + break; + } + + // test for 0-length message + if (bs.getSize() == 0) + return true; + + { + PROFILER_AUTO_BLOCK_DEFINE("new BaselinesMessage"); + baselines.push_back(BatchBaselinesMessageData(objectId,typeId,BaselinesMessage::BASELINES_SERVER,bs)); + } + return true; +} + +bool SwgSnapshot::encodeClientData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const +{ + Archive::ByteStream bs; + switch (typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + if (!encodeClientBattlefieldMarkerObject(objectId, bs)) return false; + break; + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + if (!encodeClientBuildingObject(objectId, bs)) return false; + break; + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + if (!encodeClientCellObject(objectId, bs)) return false; + break; + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + if (!encodeClientCityObject(objectId, bs)) return false; + break; + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + if (!encodeClientCreatureObject(objectId, bs)) return false; + break; + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + if (!encodeClientFactoryObject(objectId, bs)) return false; + break; + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + if (!encodeClientGuildObject(objectId, bs)) return false; + break; + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + if (!encodeClientHarvesterInstallationObject(objectId, bs)) return false; + break; + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + if (!encodeClientInstallationObject(objectId, bs)) return false; + break; + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + if (!encodeClientIntangibleObject(objectId, bs)) return false; + break; + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + if (!encodeClientManufactureInstallationObject(objectId, bs)) return false; + break; + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + if (!encodeClientManufactureSchematicObject(objectId, bs)) return false; + break; + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + if (!encodeClientMissionObject(objectId, bs)) return false; + break; + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + if (!encodeClientPlanetObject(objectId, bs)) return false; + break; + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + if (!encodeClientPlayerObject(objectId, bs)) return false; + break; + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + if (!encodeClientPlayerQuestObject(objectId, bs)) return false; + break; + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + if (!encodeClientResourceContainerObject(objectId, bs)) return false; + break; + case ServerObjectTemplate::ServerObjectTemplate_tag: + if (!encodeClientServerObject(objectId, bs)) return false; + break; + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + if (!encodeClientShipObject(objectId, bs)) return false; + break; + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + if (!encodeClientStaticObject(objectId, bs)) return false; + break; + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + if (!encodeClientTangibleObject(objectId, bs)) return false; + break; + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + if (!encodeClientUniverseObject(objectId, bs)) return false; + break; + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + if (!encodeClientVehicleObject(objectId, bs)) return false; + break; + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + if (!encodeClientWeaponObject(objectId, bs)) return false; + break; + } + + // test for 0-length message + if (bs.getSize() == 0) + return true; + + { + PROFILER_AUTO_BLOCK_DEFINE("new BaselinesMessage"); + baselines.push_back(BatchBaselinesMessageData(objectId,typeId,BaselinesMessage::BASELINES_CLIENT_SERVER,bs)); + } + return true; +} + +bool SwgSnapshot::encodeParentClientData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const +{ + Archive::ByteStream bs; + switch (typeId) + { + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + if (!encodeParentClientPlayerObject(objectId, bs)) return false; + break; + } + + // test for 0-length message + if (bs.getSize() == 0) + return true; + + { + PROFILER_AUTO_BLOCK_DEFINE("new BaselinesMessage"); + baselines.push_back(BatchBaselinesMessageData(objectId,typeId,BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER,bs)); + } + return true; +} + //!!!END GENERATED ENCODER diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/LoadObject_cpp.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/LoadObject_cpp.template index 1a0e94ac1..1eb77a631 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/LoadObject_cpp.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/LoadObject_cpp.template @@ -28,4 +28,546 @@ //!!!BEGIN GENERATED LOADOBJECT +void SwgSnapshot::loadBattlefieldMarkerObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_battlefieldMarkerObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newBattlefieldMarkerObject(NetworkId const & objectId) +{ + m_battlefieldMarkerObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadBuildingObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_buildingObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newBuildingObject(NetworkId const & objectId) +{ + m_buildingObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadCellObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_cellObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::newCellObject(NetworkId const & objectId) +{ + m_cellObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::loadCityObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_cityObjectBuffer.addEmptyRow(objectId); + loadUniverseObject(session,objectId); +} + +void SwgSnapshot::newCityObject(NetworkId const & objectId) +{ + m_cityObjectBuffer.addEmptyRow(objectId); + newUniverseObject(objectId); +} + +void SwgSnapshot::loadCreatureObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_creatureObjectBuffer.addEmptyRow(objectId); + loadAttributes(session,objectId); + loadSkills(session,objectId); + loadCommands(session,objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newCreatureObject(NetworkId const & objectId) +{ + m_creatureObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadFactoryObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_factoryObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newFactoryObject(NetworkId const & objectId) +{ + m_factoryObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadGuildObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_guildObjectBuffer.addEmptyRow(objectId); + loadUniverseObject(session,objectId); +} + +void SwgSnapshot::newGuildObject(NetworkId const & objectId) +{ + m_guildObjectBuffer.addEmptyRow(objectId); + newUniverseObject(objectId); +} + +void SwgSnapshot::loadHarvesterInstallationObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_harvesterInstallationObjectBuffer.addEmptyRow(objectId); + loadInstallationObject(session,objectId); +} + +void SwgSnapshot::newHarvesterInstallationObject(NetworkId const & objectId) +{ + m_harvesterInstallationObjectBuffer.addEmptyRow(objectId); + newInstallationObject(objectId); +} + +void SwgSnapshot::loadInstallationObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_installationObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newInstallationObject(NetworkId const & objectId) +{ + m_installationObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadIntangibleObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_intangibleObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::newIntangibleObject(NetworkId const & objectId) +{ + m_intangibleObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::loadManufactureInstallationObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_manufactureInstallationObjectBuffer.addEmptyRow(objectId); + loadInstallationObject(session,objectId); +} + +void SwgSnapshot::newManufactureInstallationObject(NetworkId const & objectId) +{ + m_manufactureInstallationObjectBuffer.addEmptyRow(objectId); + newInstallationObject(objectId); +} + +void SwgSnapshot::loadManufactureSchematicObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_manufactureSchematicObjectBuffer.addEmptyRow(objectId); + loadIntangibleObject(session,objectId); +} + +void SwgSnapshot::newManufactureSchematicObject(NetworkId const & objectId) +{ + m_manufactureSchematicObjectBuffer.addEmptyRow(objectId); + newIntangibleObject(objectId); +} + +void SwgSnapshot::loadMissionObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_missionObjectBuffer.addEmptyRow(objectId); + loadIntangibleObject(session,objectId); +} + +void SwgSnapshot::newMissionObject(NetworkId const & objectId) +{ + m_missionObjectBuffer.addEmptyRow(objectId); + newIntangibleObject(objectId); +} + +void SwgSnapshot::loadPlanetObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_planetObjectBuffer.addEmptyRow(objectId); + loadUniverseObject(session,objectId); +} + +void SwgSnapshot::newPlanetObject(NetworkId const & objectId) +{ + m_planetObjectBuffer.addEmptyRow(objectId); + newUniverseObject(objectId); +} + +void SwgSnapshot::loadPlayerObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_playerObjectBuffer.addEmptyRow(objectId); + loadIntangibleObject(session,objectId); +} + +void SwgSnapshot::newPlayerObject(NetworkId const & objectId) +{ + m_playerObjectBuffer.addEmptyRow(objectId); + newIntangibleObject(objectId); +} + +void SwgSnapshot::loadPlayerQuestObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_playerQuestObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newPlayerQuestObject(NetworkId const & objectId) +{ + m_playerQuestObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadResourceContainerObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_resourceContainerObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newResourceContainerObject(NetworkId const & objectId) +{ + m_resourceContainerObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadShipObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_shipObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newShipObject(NetworkId const & objectId) +{ + m_shipObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadStaticObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_staticObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::newStaticObject(NetworkId const & objectId) +{ + m_staticObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::loadTangibleObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_tangibleObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::newTangibleObject(NetworkId const & objectId) +{ + m_tangibleObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::loadUniverseObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_universeObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::newUniverseObject(NetworkId const & objectId) +{ + m_universeObjectBuffer.addEmptyRow(objectId); +} + +void SwgSnapshot::loadVehicleObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_vehicleObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newVehicleObject(NetworkId const & objectId) +{ + m_vehicleObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadWeaponObject(DB::Session *session, NetworkId const & objectId) +{ + UNREF(session); + m_weaponObjectBuffer.addEmptyRow(objectId); + loadTangibleObject(session,objectId); +} + +void SwgSnapshot::newWeaponObject(NetworkId const & objectId) +{ + m_weaponObjectBuffer.addEmptyRow(objectId); + newTangibleObject(objectId); +} + +void SwgSnapshot::loadObject(DB::Session *session,const Tag &typeId, const NetworkId &objectId) +{ + switch(typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + loadBattlefieldMarkerObject(session,objectId); + break; + + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + loadBuildingObject(session,objectId); + break; + + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + loadCellObject(session,objectId); + break; + + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + loadCityObject(session,objectId); + break; + + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + loadCreatureObject(session,objectId); + break; + + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + loadFactoryObject(session,objectId); + break; + + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + loadGuildObject(session,objectId); + break; + + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + loadHarvesterInstallationObject(session,objectId); + break; + + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + loadInstallationObject(session,objectId); + break; + + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + loadIntangibleObject(session,objectId); + break; + + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + loadManufactureInstallationObject(session,objectId); + break; + + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + loadManufactureSchematicObject(session,objectId); + break; + + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + loadMissionObject(session,objectId); + break; + + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + loadPlanetObject(session,objectId); + break; + + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + loadPlayerObject(session,objectId); + break; + + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + loadPlayerQuestObject(session,objectId); + break; + + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + loadResourceContainerObject(session,objectId); + break; + + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + loadShipObject(session,objectId); + break; + + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + loadStaticObject(session,objectId); + break; + + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + loadTangibleObject(session,objectId); + break; + + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + loadUniverseObject(session,objectId); + break; + + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + loadVehicleObject(session,objectId); + break; + + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + loadWeaponObject(session,objectId); + break; + + default: + WARNING(true,("Attempt to load object %s from the database. It has unknown type %i.",objectId.getValueString().c_str(),typeId)); + } +} + +void SwgSnapshot::newObject(NetworkId const & objectId, int templateId, Tag typeId) +{ + m_objectTableBuffer.newObject(objectId, templateId, typeId); + switch(typeId) + { + case ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag: + newBattlefieldMarkerObject(objectId); + break; + + case ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag: + newBuildingObject(objectId); + break; + + case ServerCellObjectTemplate::ServerCellObjectTemplate_tag: + newCellObject(objectId); + break; + + case ServerCityObjectTemplate::ServerCityObjectTemplate_tag: + newCityObject(objectId); + break; + + case ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag: + newCreatureObject(objectId); + break; + + case ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag: + newFactoryObject(objectId); + break; + + case ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag: + newGuildObject(objectId); + break; + + case ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag: + newHarvesterInstallationObject(objectId); + break; + + case ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag: + newInstallationObject(objectId); + break; + + case ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag: + newIntangibleObject(objectId); + break; + + case ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag: + newManufactureInstallationObject(objectId); + break; + + case ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag: + newManufactureSchematicObject(objectId); + break; + + case ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag: + newMissionObject(objectId); + break; + + case ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag: + newPlanetObject(objectId); + break; + + case ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag: + newPlayerObject(objectId); + break; + + case ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag: + newPlayerQuestObject(objectId); + break; + + case ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag: + newResourceContainerObject(objectId); + break; + + case ServerShipObjectTemplate::ServerShipObjectTemplate_tag: + newShipObject(objectId); + break; + + case ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag: + newStaticObject(objectId); + break; + + case ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag: + newTangibleObject(objectId); + break; + + case ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag: + newUniverseObject(objectId); + break; + + case ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag: + newVehicleObject(objectId); + break; + + case ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag: + newWeaponObject(objectId); + break; + + default: + WARNING(true,("Attempt to create object %s. It has unknown type %i.",objectId.getValueString().c_str(),typeId)); + } +} + +void SwgSnapshot::registerTags() +{ + m_battlefieldMarkerObjectBuffer.addTag(ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate_tag); + m_buildingObjectBuffer.addTag(ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerBuildingObjectTemplate::ServerBuildingObjectTemplate_tag); + m_cellObjectBuffer.addTag(ServerCellObjectTemplate::ServerCellObjectTemplate_tag); + m_cityObjectBuffer.addTag(ServerCityObjectTemplate::ServerCityObjectTemplate_tag); + m_universeObjectBuffer.addTag(ServerCityObjectTemplate::ServerCityObjectTemplate_tag); + m_creatureObjectBuffer.addTag(ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag); + m_factoryObjectBuffer.addTag(ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerFactoryObjectTemplate::ServerFactoryObjectTemplate_tag); + m_guildObjectBuffer.addTag(ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag); + m_universeObjectBuffer.addTag(ServerGuildObjectTemplate::ServerGuildObjectTemplate_tag); + m_harvesterInstallationObjectBuffer.addTag(ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag); + m_installationObjectBuffer.addTag(ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate_tag); + m_installationObjectBuffer.addTag(ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerInstallationObjectTemplate::ServerInstallationObjectTemplate_tag); + m_intangibleObjectBuffer.addTag(ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate_tag); + m_manufactureInstallationObjectBuffer.addTag(ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag); + m_installationObjectBuffer.addTag(ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate_tag); + m_manufactureSchematicObjectBuffer.addTag(ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag); + m_intangibleObjectBuffer.addTag(ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag); + m_missionObjectBuffer.addTag(ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag); + m_intangibleObjectBuffer.addTag(ServerMissionObjectTemplate::ServerMissionObjectTemplate_tag); + m_planetObjectBuffer.addTag(ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag); + m_universeObjectBuffer.addTag(ServerPlanetObjectTemplate::ServerPlanetObjectTemplate_tag); + m_playerObjectBuffer.addTag(ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag); + m_intangibleObjectBuffer.addTag(ServerPlayerObjectTemplate::ServerPlayerObjectTemplate_tag); + m_playerQuestObjectBuffer.addTag(ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate_tag); + m_resourceContainerObjectBuffer.addTag(ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag); + m_shipObjectBuffer.addTag(ServerShipObjectTemplate::ServerShipObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerShipObjectTemplate::ServerShipObjectTemplate_tag); + m_staticObjectBuffer.addTag(ServerStaticObjectTemplate::ServerStaticObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerTangibleObjectTemplate::ServerTangibleObjectTemplate_tag); + m_universeObjectBuffer.addTag(ServerUniverseObjectTemplate::ServerUniverseObjectTemplate_tag); + m_vehicleObjectBuffer.addTag(ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerVehicleObjectTemplate::ServerVehicleObjectTemplate_tag); + m_weaponObjectBuffer.addTag(ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag); + m_tangibleObjectBuffer.addTag(ServerWeaponObjectTemplate::ServerWeaponObjectTemplate_tag); +} + //!!!END GENERATED LOADOBJECT diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_cpp.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_cpp.template index 067f2fac9..165d5c9af 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_cpp.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_cpp.template @@ -17,6 +17,6089 @@ using namespace ObjectQueriesNamespace; // ====================================================================== //!!!BEGIN GENERATED QUERYDEFINITIONS +BattlefieldMarkerObjectQuery::BattlefieldMarkerObjectQuery() : + DatabaseProcessQuery(new BattlefieldMarkerObjectRow), + m_numItems(0) +{ +} + +bool BattlefieldMarkerObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_region_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool BattlefieldMarkerObjectQuery::addData(const DB::Row *_data) +{ + const BattlefieldMarkerObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_region_names.push_back(myData->region_name.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int BattlefieldMarkerObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void BattlefieldMarkerObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_region_names.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void BattlefieldMarkerObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_region_names.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool BattlefieldMarkerObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_region_names)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool BattlefieldMarkerObjectQuery::bindColumns() +{ + return true; +} + +void BattlefieldMarkerObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_battlefield_marker_obj (:object_id, :region_name, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_battlefield_marker_obj (:object_id, :region_name, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_battlefield_marker_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +BattlefieldMarkerObjectQuerySelect::BattlefieldMarkerObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool BattlefieldMarkerObjectQuerySelect::bindParameters () +{ + return true; +} + +bool BattlefieldMarkerObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].region_name)) return false; + return true; +} + +const std::vector & BattlefieldMarkerObjectQuerySelect::getData() const +{ + return m_data; +} + +void BattlefieldMarkerObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_battlefield_marker_object; end;"; +} + +DB::Query::QueryMode BattlefieldMarkerObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +BuildingObjectQuery::BuildingObjectQuery() : + DatabaseProcessQuery(new BuildingObjectRow), + m_numItems(0) +{ +} + +bool BuildingObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_maintenance_costs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_time_last_checkeds.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_is_publics.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_city_ids.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool BuildingObjectQuery::addData(const DB::Row *_data) +{ + const BuildingObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_maintenance_costs.push_back(myData->maintenance_cost.isNull(), myData->maintenance_cost.getValue())) return false; + if (!m_time_last_checkeds.push_back(myData->time_last_checked.isNull(), myData->time_last_checked.getValue())) return false; + if (!m_is_publics.push_back(myData->is_public.getValueASCII())) return false; + if (!m_city_ids.push_back(myData->city_id.isNull(), myData->city_id.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int BuildingObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void BuildingObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_maintenance_costs.clear(); + m_time_last_checkeds.clear(); + m_is_publics.clear(); + m_city_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void BuildingObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_maintenance_costs.free(); + m_time_last_checkeds.free(); + m_is_publics.free(); + m_city_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool BuildingObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_maintenance_costs)) return false; + if (!bindParameter(m_time_last_checkeds)) return false; + if (!bindParameter(m_is_publics)) return false; + if (!bindParameter(m_city_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool BuildingObjectQuery::bindColumns() +{ + return true; +} + +void BuildingObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_building_obj (:object_id, :maintenance_cost, :time_last_checked, :is_public, :city_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_building_obj (:object_id, :maintenance_cost, :time_last_checked, :is_public, :city_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_building_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +BuildingObjectQuerySelect::BuildingObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool BuildingObjectQuerySelect::bindParameters () +{ + return true; +} + +bool BuildingObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].maintenance_cost)) return false; + if (!bindCol(m_data[0].time_last_checked)) return false; + if (!bindCol(m_data[0].is_public)) return false; + if (!bindCol(m_data[0].city_id)) return false; + return true; +} + +const std::vector & BuildingObjectQuerySelect::getData() const +{ + return m_data; +} + +void BuildingObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_building_object; end;"; +} + +DB::Query::QueryMode BuildingObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +CellObjectQuery::CellObjectQuery() : + DatabaseProcessQuery(new CellObjectRow), + m_numItems(0) +{ +} + +bool CellObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cell_numbers.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_is_publics.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool CellObjectQuery::addData(const DB::Row *_data) +{ + const CellObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_cell_numbers.push_back(myData->cell_number.isNull(), myData->cell_number.getValue())) return false; + if (!m_is_publics.push_back(myData->is_public.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int CellObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void CellObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_cell_numbers.clear(); + m_is_publics.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void CellObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_cell_numbers.free(); + m_is_publics.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool CellObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_cell_numbers)) return false; + if (!bindParameter(m_is_publics)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool CellObjectQuery::bindColumns() +{ + return true; +} + +void CellObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_cell_obj (:object_id, :cell_number, :is_public, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_cell_obj (:object_id, :cell_number, :is_public, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_cell_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +CellObjectQuerySelect::CellObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool CellObjectQuerySelect::bindParameters () +{ + return true; +} + +bool CellObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].cell_number)) return false; + if (!bindCol(m_data[0].is_public)) return false; + return true; +} + +const std::vector & CellObjectQuerySelect::getData() const +{ + return m_data; +} + +void CellObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_cell_object; end;"; +} + +DB::Query::QueryMode CellObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +CityObjectQuery::CityObjectQuery() : + DatabaseProcessQuery(new CityObjectRow), + m_numItems(0) +{ +} + +bool CityObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool CityObjectQuery::addData(const DB::Row *_data) +{ + const CityObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int CityObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void CityObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void CityObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool CityObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool CityObjectQuery::bindColumns() +{ + return true; +} + +void CityObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_city_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_city_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_city_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +CityObjectQuerySelect::CityObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool CityObjectQuerySelect::bindParameters () +{ + return true; +} + +bool CityObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & CityObjectQuerySelect::getData() const +{ + return m_data; +} + +void CityObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_city_object; end;"; +} + +DB::Query::QueryMode CityObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +CreatureObjectQuery::CreatureObjectQuery() : + DatabaseProcessQuery(new CreatureObjectRow), + m_numItems(0) +{ +} + +bool CreatureObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_scale_factors.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_statess.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_postures.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_shock_woundss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_master_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_ranks.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_base_walk_speeds.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_base_run_speeds.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_0s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_1s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_2s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_3s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_4s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_5s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_6s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_7s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_8s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_9s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_10s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_11s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_12s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_13s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_14s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_15s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_16s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_17s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_18s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_19s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_20s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_21s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_22s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_23s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_24s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_25s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attribute_26s.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_persisted_buffss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_ws_xs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_ws_ys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_ws_zs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool CreatureObjectQuery::addData(const DB::Row *_data) +{ + const CreatureObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_scale_factors.push_back(myData->scale_factor.isNull(), myData->scale_factor.getValue())) return false; + if (!m_statess.push_back(myData->states.isNull(), myData->states.getValue())) return false; + if (!m_postures.push_back(myData->posture.isNull(), myData->posture.getValue())) return false; + if (!m_shock_woundss.push_back(myData->shock_wounds.isNull(), myData->shock_wounds.getValue())) return false; + if (!m_master_ids.push_back(myData->master_id.getValueASCII())) return false; + if (!m_ranks.push_back(myData->rank.isNull(), myData->rank.getValue())) return false; + if (!m_base_walk_speeds.push_back(myData->base_walk_speed.isNull(), myData->base_walk_speed.getValue())) return false; + if (!m_base_run_speeds.push_back(myData->base_run_speed.isNull(), myData->base_run_speed.getValue())) return false; + if (!m_attribute_0s.push_back(myData->attribute_0.isNull(), myData->attribute_0.getValue())) return false; + if (!m_attribute_1s.push_back(myData->attribute_1.isNull(), myData->attribute_1.getValue())) return false; + if (!m_attribute_2s.push_back(myData->attribute_2.isNull(), myData->attribute_2.getValue())) return false; + if (!m_attribute_3s.push_back(myData->attribute_3.isNull(), myData->attribute_3.getValue())) return false; + if (!m_attribute_4s.push_back(myData->attribute_4.isNull(), myData->attribute_4.getValue())) return false; + if (!m_attribute_5s.push_back(myData->attribute_5.isNull(), myData->attribute_5.getValue())) return false; + if (!m_attribute_6s.push_back(myData->attribute_6.isNull(), myData->attribute_6.getValue())) return false; + if (!m_attribute_7s.push_back(myData->attribute_7.isNull(), myData->attribute_7.getValue())) return false; + if (!m_attribute_8s.push_back(myData->attribute_8.isNull(), myData->attribute_8.getValue())) return false; + if (!m_attribute_9s.push_back(myData->attribute_9.isNull(), myData->attribute_9.getValue())) return false; + if (!m_attribute_10s.push_back(myData->attribute_10.isNull(), myData->attribute_10.getValue())) return false; + if (!m_attribute_11s.push_back(myData->attribute_11.isNull(), myData->attribute_11.getValue())) return false; + if (!m_attribute_12s.push_back(myData->attribute_12.isNull(), myData->attribute_12.getValue())) return false; + if (!m_attribute_13s.push_back(myData->attribute_13.isNull(), myData->attribute_13.getValue())) return false; + if (!m_attribute_14s.push_back(myData->attribute_14.isNull(), myData->attribute_14.getValue())) return false; + if (!m_attribute_15s.push_back(myData->attribute_15.isNull(), myData->attribute_15.getValue())) return false; + if (!m_attribute_16s.push_back(myData->attribute_16.isNull(), myData->attribute_16.getValue())) return false; + if (!m_attribute_17s.push_back(myData->attribute_17.isNull(), myData->attribute_17.getValue())) return false; + if (!m_attribute_18s.push_back(myData->attribute_18.isNull(), myData->attribute_18.getValue())) return false; + if (!m_attribute_19s.push_back(myData->attribute_19.isNull(), myData->attribute_19.getValue())) return false; + if (!m_attribute_20s.push_back(myData->attribute_20.isNull(), myData->attribute_20.getValue())) return false; + if (!m_attribute_21s.push_back(myData->attribute_21.isNull(), myData->attribute_21.getValue())) return false; + if (!m_attribute_22s.push_back(myData->attribute_22.isNull(), myData->attribute_22.getValue())) return false; + if (!m_attribute_23s.push_back(myData->attribute_23.isNull(), myData->attribute_23.getValue())) return false; + if (!m_attribute_24s.push_back(myData->attribute_24.isNull(), myData->attribute_24.getValue())) return false; + if (!m_attribute_25s.push_back(myData->attribute_25.isNull(), myData->attribute_25.getValue())) return false; + if (!m_attribute_26s.push_back(myData->attribute_26.isNull(), myData->attribute_26.getValue())) return false; + if (!m_persisted_buffss.push_back(myData->persisted_buffs.getValueASCII())) return false; + if (!m_ws_xs.push_back(myData->ws_x.isNull(), myData->ws_x.getValue())) return false; + if (!m_ws_ys.push_back(myData->ws_y.isNull(), myData->ws_y.getValue())) return false; + if (!m_ws_zs.push_back(myData->ws_z.isNull(), myData->ws_z.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int CreatureObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void CreatureObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_scale_factors.clear(); + m_statess.clear(); + m_postures.clear(); + m_shock_woundss.clear(); + m_master_ids.clear(); + m_ranks.clear(); + m_base_walk_speeds.clear(); + m_base_run_speeds.clear(); + m_attribute_0s.clear(); + m_attribute_1s.clear(); + m_attribute_2s.clear(); + m_attribute_3s.clear(); + m_attribute_4s.clear(); + m_attribute_5s.clear(); + m_attribute_6s.clear(); + m_attribute_7s.clear(); + m_attribute_8s.clear(); + m_attribute_9s.clear(); + m_attribute_10s.clear(); + m_attribute_11s.clear(); + m_attribute_12s.clear(); + m_attribute_13s.clear(); + m_attribute_14s.clear(); + m_attribute_15s.clear(); + m_attribute_16s.clear(); + m_attribute_17s.clear(); + m_attribute_18s.clear(); + m_attribute_19s.clear(); + m_attribute_20s.clear(); + m_attribute_21s.clear(); + m_attribute_22s.clear(); + m_attribute_23s.clear(); + m_attribute_24s.clear(); + m_attribute_25s.clear(); + m_attribute_26s.clear(); + m_persisted_buffss.clear(); + m_ws_xs.clear(); + m_ws_ys.clear(); + m_ws_zs.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void CreatureObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_scale_factors.free(); + m_statess.free(); + m_postures.free(); + m_shock_woundss.free(); + m_master_ids.free(); + m_ranks.free(); + m_base_walk_speeds.free(); + m_base_run_speeds.free(); + m_attribute_0s.free(); + m_attribute_1s.free(); + m_attribute_2s.free(); + m_attribute_3s.free(); + m_attribute_4s.free(); + m_attribute_5s.free(); + m_attribute_6s.free(); + m_attribute_7s.free(); + m_attribute_8s.free(); + m_attribute_9s.free(); + m_attribute_10s.free(); + m_attribute_11s.free(); + m_attribute_12s.free(); + m_attribute_13s.free(); + m_attribute_14s.free(); + m_attribute_15s.free(); + m_attribute_16s.free(); + m_attribute_17s.free(); + m_attribute_18s.free(); + m_attribute_19s.free(); + m_attribute_20s.free(); + m_attribute_21s.free(); + m_attribute_22s.free(); + m_attribute_23s.free(); + m_attribute_24s.free(); + m_attribute_25s.free(); + m_attribute_26s.free(); + m_persisted_buffss.free(); + m_ws_xs.free(); + m_ws_ys.free(); + m_ws_zs.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool CreatureObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_scale_factors)) return false; + if (!bindParameter(m_statess)) return false; + if (!bindParameter(m_postures)) return false; + if (!bindParameter(m_shock_woundss)) return false; + if (!bindParameter(m_master_ids)) return false; + if (!bindParameter(m_ranks)) return false; + if (!bindParameter(m_base_walk_speeds)) return false; + if (!bindParameter(m_base_run_speeds)) return false; + if (!bindParameter(m_attribute_0s)) return false; + if (!bindParameter(m_attribute_1s)) return false; + if (!bindParameter(m_attribute_2s)) return false; + if (!bindParameter(m_attribute_3s)) return false; + if (!bindParameter(m_attribute_4s)) return false; + if (!bindParameter(m_attribute_5s)) return false; + if (!bindParameter(m_attribute_6s)) return false; + if (!bindParameter(m_attribute_7s)) return false; + if (!bindParameter(m_attribute_8s)) return false; + if (!bindParameter(m_attribute_9s)) return false; + if (!bindParameter(m_attribute_10s)) return false; + if (!bindParameter(m_attribute_11s)) return false; + if (!bindParameter(m_attribute_12s)) return false; + if (!bindParameter(m_attribute_13s)) return false; + if (!bindParameter(m_attribute_14s)) return false; + if (!bindParameter(m_attribute_15s)) return false; + if (!bindParameter(m_attribute_16s)) return false; + if (!bindParameter(m_attribute_17s)) return false; + if (!bindParameter(m_attribute_18s)) return false; + if (!bindParameter(m_attribute_19s)) return false; + if (!bindParameter(m_attribute_20s)) return false; + if (!bindParameter(m_attribute_21s)) return false; + if (!bindParameter(m_attribute_22s)) return false; + if (!bindParameter(m_attribute_23s)) return false; + if (!bindParameter(m_attribute_24s)) return false; + if (!bindParameter(m_attribute_25s)) return false; + if (!bindParameter(m_attribute_26s)) return false; + if (!bindParameter(m_persisted_buffss)) return false; + if (!bindParameter(m_ws_xs)) return false; + if (!bindParameter(m_ws_ys)) return false; + if (!bindParameter(m_ws_zs)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool CreatureObjectQuery::bindColumns() +{ + return true; +} + +void CreatureObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_creature_obj (:object_id, :scale_factor, :states, :posture, :shock_wounds, :master_id, :rank, :base_walk_speed, :base_run_speed, :attribute_0, :attribute_1, :attribute_2, :attribute_3, :attribute_4, :attribute_5, :attribute_6, :attribute_7, :attribute_8, :attribute_9, :attribute_10, :attribute_11, :attribute_12, :attribute_13, :attribute_14, :attribute_15, :attribute_16, :attribute_17, :attribute_18, :attribute_19, :attribute_20, :attribute_21, :attribute_22, :attribute_23, :attribute_24, :attribute_25, :attribute_26, :persisted_buffs, :ws_x, :ws_y, :ws_z, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_creature_obj (:object_id, :scale_factor, :states, :posture, :shock_wounds, :master_id, :rank, :base_walk_speed, :base_run_speed, :attribute_0, :attribute_1, :attribute_2, :attribute_3, :attribute_4, :attribute_5, :attribute_6, :attribute_7, :attribute_8, :attribute_9, :attribute_10, :attribute_11, :attribute_12, :attribute_13, :attribute_14, :attribute_15, :attribute_16, :attribute_17, :attribute_18, :attribute_19, :attribute_20, :attribute_21, :attribute_22, :attribute_23, :attribute_24, :attribute_25, :attribute_26, :persisted_buffs, :ws_x, :ws_y, :ws_z, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_creature_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +CreatureObjectQuerySelect::CreatureObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool CreatureObjectQuerySelect::bindParameters () +{ + return true; +} + +bool CreatureObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].scale_factor)) return false; + if (!bindCol(m_data[0].states)) return false; + if (!bindCol(m_data[0].posture)) return false; + if (!bindCol(m_data[0].shock_wounds)) return false; + if (!bindCol(m_data[0].master_id)) return false; + if (!bindCol(m_data[0].rank)) return false; + if (!bindCol(m_data[0].base_walk_speed)) return false; + if (!bindCol(m_data[0].base_run_speed)) return false; + if (!bindCol(m_data[0].attribute_0)) return false; + if (!bindCol(m_data[0].attribute_1)) return false; + if (!bindCol(m_data[0].attribute_2)) return false; + if (!bindCol(m_data[0].attribute_3)) return false; + if (!bindCol(m_data[0].attribute_4)) return false; + if (!bindCol(m_data[0].attribute_5)) return false; + if (!bindCol(m_data[0].attribute_6)) return false; + if (!bindCol(m_data[0].attribute_7)) return false; + if (!bindCol(m_data[0].attribute_8)) return false; + if (!bindCol(m_data[0].attribute_9)) return false; + if (!bindCol(m_data[0].attribute_10)) return false; + if (!bindCol(m_data[0].attribute_11)) return false; + if (!bindCol(m_data[0].attribute_12)) return false; + if (!bindCol(m_data[0].attribute_13)) return false; + if (!bindCol(m_data[0].attribute_14)) return false; + if (!bindCol(m_data[0].attribute_15)) return false; + if (!bindCol(m_data[0].attribute_16)) return false; + if (!bindCol(m_data[0].attribute_17)) return false; + if (!bindCol(m_data[0].attribute_18)) return false; + if (!bindCol(m_data[0].attribute_19)) return false; + if (!bindCol(m_data[0].attribute_20)) return false; + if (!bindCol(m_data[0].attribute_21)) return false; + if (!bindCol(m_data[0].attribute_22)) return false; + if (!bindCol(m_data[0].attribute_23)) return false; + if (!bindCol(m_data[0].attribute_24)) return false; + if (!bindCol(m_data[0].attribute_25)) return false; + if (!bindCol(m_data[0].attribute_26)) return false; + if (!bindCol(m_data[0].persisted_buffs)) return false; + if (!bindCol(m_data[0].ws_x)) return false; + if (!bindCol(m_data[0].ws_y)) return false; + if (!bindCol(m_data[0].ws_z)) return false; + return true; +} + +const std::vector & CreatureObjectQuerySelect::getData() const +{ + return m_data; +} + +void CreatureObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_creature_object; end;"; +} + +DB::Query::QueryMode CreatureObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +FactoryObjectQuery::FactoryObjectQuery() : + DatabaseProcessQuery(new FactoryObjectRow), + m_numItems(0) +{ +} + +bool FactoryObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool FactoryObjectQuery::addData(const DB::Row *_data) +{ + const FactoryObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int FactoryObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void FactoryObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void FactoryObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool FactoryObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool FactoryObjectQuery::bindColumns() +{ + return true; +} + +void FactoryObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_factory_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_factory_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_factory_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +FactoryObjectQuerySelect::FactoryObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool FactoryObjectQuerySelect::bindParameters () +{ + return true; +} + +bool FactoryObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & FactoryObjectQuerySelect::getData() const +{ + return m_data; +} + +void FactoryObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_factory_object; end;"; +} + +DB::Query::QueryMode FactoryObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +GuildObjectQuery::GuildObjectQuery() : + DatabaseProcessQuery(new GuildObjectRow), + m_numItems(0) +{ +} + +bool GuildObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool GuildObjectQuery::addData(const DB::Row *_data) +{ + const GuildObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int GuildObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void GuildObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void GuildObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool GuildObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool GuildObjectQuery::bindColumns() +{ + return true; +} + +void GuildObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_guild_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_guild_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_guild_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +GuildObjectQuerySelect::GuildObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool GuildObjectQuerySelect::bindParameters () +{ + return true; +} + +bool GuildObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & GuildObjectQuerySelect::getData() const +{ + return m_data; +} + +void GuildObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_guild_object; end;"; +} + +DB::Query::QueryMode GuildObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +HarvesterInstallationObjectQuery::HarvesterInstallationObjectQuery() : + DatabaseProcessQuery(new HarvesterInstallationObjectRow), + m_numItems(0) +{ +} + +bool HarvesterInstallationObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_installed_efficiencys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_extraction_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_current_extraction_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_hopper_amounts.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_hopper_resources.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_hopper_amounts.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_resource_types.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool HarvesterInstallationObjectQuery::addData(const DB::Row *_data) +{ + const HarvesterInstallationObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_installed_efficiencys.push_back(myData->installed_efficiency.isNull(), myData->installed_efficiency.getValue())) return false; + if (!m_max_extraction_rates.push_back(myData->max_extraction_rate.isNull(), myData->max_extraction_rate.getValue())) return false; + if (!m_current_extraction_rates.push_back(myData->current_extraction_rate.isNull(), myData->current_extraction_rate.getValue())) return false; + if (!m_max_hopper_amounts.push_back(myData->max_hopper_amount.isNull(), myData->max_hopper_amount.getValue())) return false; + if (!m_hopper_resources.push_back(myData->hopper_resource.getValueASCII())) return false; + if (!m_hopper_amounts.push_back(myData->hopper_amount.isNull(), myData->hopper_amount.getValue())) return false; + if (!m_resource_types.push_back(myData->resource_type.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int HarvesterInstallationObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void HarvesterInstallationObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_installed_efficiencys.clear(); + m_max_extraction_rates.clear(); + m_current_extraction_rates.clear(); + m_max_hopper_amounts.clear(); + m_hopper_resources.clear(); + m_hopper_amounts.clear(); + m_resource_types.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void HarvesterInstallationObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_installed_efficiencys.free(); + m_max_extraction_rates.free(); + m_current_extraction_rates.free(); + m_max_hopper_amounts.free(); + m_hopper_resources.free(); + m_hopper_amounts.free(); + m_resource_types.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool HarvesterInstallationObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_installed_efficiencys)) return false; + if (!bindParameter(m_max_extraction_rates)) return false; + if (!bindParameter(m_current_extraction_rates)) return false; + if (!bindParameter(m_max_hopper_amounts)) return false; + if (!bindParameter(m_hopper_resources)) return false; + if (!bindParameter(m_hopper_amounts)) return false; + if (!bindParameter(m_resource_types)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool HarvesterInstallationObjectQuery::bindColumns() +{ + return true; +} + +void HarvesterInstallationObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_harvester_inst_obj (:object_id, :installed_efficiency, :max_extraction_rate, :current_extraction_rate, :max_hopper_amount, :hopper_resource, :hopper_amount, :resource_type, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_harvester_inst_obj (:object_id, :installed_efficiency, :max_extraction_rate, :current_extraction_rate, :max_hopper_amount, :hopper_resource, :hopper_amount, :resource_type, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_harvester_inst_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +HarvesterInstallationObjectQuerySelect::HarvesterInstallationObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool HarvesterInstallationObjectQuerySelect::bindParameters () +{ + return true; +} + +bool HarvesterInstallationObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].installed_efficiency)) return false; + if (!bindCol(m_data[0].max_extraction_rate)) return false; + if (!bindCol(m_data[0].current_extraction_rate)) return false; + if (!bindCol(m_data[0].max_hopper_amount)) return false; + if (!bindCol(m_data[0].hopper_resource)) return false; + if (!bindCol(m_data[0].hopper_amount)) return false; + if (!bindCol(m_data[0].resource_type)) return false; + return true; +} + +const std::vector & HarvesterInstallationObjectQuerySelect::getData() const +{ + return m_data; +} + +void HarvesterInstallationObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_harvester_inst_object; end;"; +} + +DB::Query::QueryMode HarvesterInstallationObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +InstallationObjectQuery::InstallationObjectQuery() : + DatabaseProcessQuery(new InstallationObjectRow), + m_numItems(0) +{ +} + +bool InstallationObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_installation_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_activateds.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_tick_counts.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_activate_start_times.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_powers.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_power_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool InstallationObjectQuery::addData(const DB::Row *_data) +{ + const InstallationObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_installation_types.push_back(myData->installation_type.isNull(), myData->installation_type.getValue())) return false; + if (!m_activateds.push_back(myData->activated.getValueASCII())) return false; + if (!m_tick_counts.push_back(myData->tick_count.isNull(), myData->tick_count.getValue())) return false; + if (!m_activate_start_times.push_back(myData->activate_start_time.isNull(), myData->activate_start_time.getValue())) return false; + if (!m_powers.push_back(myData->power.isNull(), myData->power.getValue())) return false; + if (!m_power_rates.push_back(myData->power_rate.isNull(), myData->power_rate.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int InstallationObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void InstallationObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_installation_types.clear(); + m_activateds.clear(); + m_tick_counts.clear(); + m_activate_start_times.clear(); + m_powers.clear(); + m_power_rates.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void InstallationObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_installation_types.free(); + m_activateds.free(); + m_tick_counts.free(); + m_activate_start_times.free(); + m_powers.free(); + m_power_rates.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool InstallationObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_installation_types)) return false; + if (!bindParameter(m_activateds)) return false; + if (!bindParameter(m_tick_counts)) return false; + if (!bindParameter(m_activate_start_times)) return false; + if (!bindParameter(m_powers)) return false; + if (!bindParameter(m_power_rates)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool InstallationObjectQuery::bindColumns() +{ + return true; +} + +void InstallationObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_installation_obj (:object_id, :installation_type, :activated, :tick_count, :activate_start_time, :power, :power_rate, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_installation_obj (:object_id, :installation_type, :activated, :tick_count, :activate_start_time, :power, :power_rate, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_installation_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +InstallationObjectQuerySelect::InstallationObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool InstallationObjectQuerySelect::bindParameters () +{ + return true; +} + +bool InstallationObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].installation_type)) return false; + if (!bindCol(m_data[0].activated)) return false; + if (!bindCol(m_data[0].tick_count)) return false; + if (!bindCol(m_data[0].activate_start_time)) return false; + if (!bindCol(m_data[0].power)) return false; + if (!bindCol(m_data[0].power_rate)) return false; + return true; +} + +const std::vector & InstallationObjectQuerySelect::getData() const +{ + return m_data; +} + +void InstallationObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_installation_object; end;"; +} + +DB::Query::QueryMode InstallationObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +IntangibleObjectQuery::IntangibleObjectQuery() : + DatabaseProcessQuery(new IntangibleObjectRow), + m_numItems(0) +{ +} + +bool IntangibleObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_counts.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool IntangibleObjectQuery::addData(const DB::Row *_data) +{ + const IntangibleObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_counts.push_back(myData->count.isNull(), myData->count.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int IntangibleObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void IntangibleObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_counts.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void IntangibleObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_counts.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool IntangibleObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_counts)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool IntangibleObjectQuery::bindColumns() +{ + return true; +} + +void IntangibleObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_intangible_obj (:object_id, :count, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_intangible_obj (:object_id, :count, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_intangible_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +IntangibleObjectQuerySelect::IntangibleObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool IntangibleObjectQuerySelect::bindParameters () +{ + return true; +} + +bool IntangibleObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].count)) return false; + return true; +} + +const std::vector & IntangibleObjectQuerySelect::getData() const +{ + return m_data; +} + +void IntangibleObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_intangible_object; end;"; +} + +DB::Query::QueryMode IntangibleObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +ManufactureSchematicObjectQuery::ManufactureSchematicObjectQuery() : + DatabaseProcessQuery(new ManufactureSchematicObjectRow), + m_numItems(0) +{ +} + +bool ManufactureSchematicObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_creator_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_creator_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_items_per_containers.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_manufacture_times.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_draft_schematics.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool ManufactureSchematicObjectQuery::addData(const DB::Row *_data) +{ + const ManufactureSchematicObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_creator_ids.push_back(myData->creator_id.getValueASCII())) return false; + if (!m_creator_names.push_back(myData->creator_name.getValueASCII())) return false; + if (!m_items_per_containers.push_back(myData->items_per_container.isNull(), myData->items_per_container.getValue())) return false; + if (!m_manufacture_times.push_back(myData->manufacture_time.isNull(), myData->manufacture_time.getValue())) return false; + if (!m_draft_schematics.push_back(myData->draft_schematic.isNull(), myData->draft_schematic.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int ManufactureSchematicObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void ManufactureSchematicObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_creator_ids.clear(); + m_creator_names.clear(); + m_items_per_containers.clear(); + m_manufacture_times.clear(); + m_draft_schematics.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void ManufactureSchematicObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_creator_ids.free(); + m_creator_names.free(); + m_items_per_containers.free(); + m_manufacture_times.free(); + m_draft_schematics.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool ManufactureSchematicObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_creator_ids)) return false; + if (!bindParameter(m_creator_names)) return false; + if (!bindParameter(m_items_per_containers)) return false; + if (!bindParameter(m_manufacture_times)) return false; + if (!bindParameter(m_draft_schematics)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool ManufactureSchematicObjectQuery::bindColumns() +{ + return true; +} + +void ManufactureSchematicObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_manf_schematic_obj (:object_id, :creator_id, :creator_name, :items_per_container, :manufacture_time, :draft_schematic, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_manf_schematic_obj (:object_id, :creator_id, :creator_name, :items_per_container, :manufacture_time, :draft_schematic, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_manf_schematic_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +ManufactureSchematicObjectQuerySelect::ManufactureSchematicObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool ManufactureSchematicObjectQuerySelect::bindParameters () +{ + return true; +} + +bool ManufactureSchematicObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].creator_id)) return false; + if (!bindCol(m_data[0].creator_name)) return false; + if (!bindCol(m_data[0].items_per_container)) return false; + if (!bindCol(m_data[0].manufacture_time)) return false; + if (!bindCol(m_data[0].draft_schematic)) return false; + return true; +} + +const std::vector & ManufactureSchematicObjectQuerySelect::getData() const +{ + return m_data; +} + +void ManufactureSchematicObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_manf_schematic_object; end;"; +} + +DB::Query::QueryMode ManufactureSchematicObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +ManufactureInstallationObjectQuery::ManufactureInstallationObjectQuery() : + DatabaseProcessQuery(new ManufactureInstallationObjectRow), + m_numItems(0) +{ +} + +bool ManufactureInstallationObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool ManufactureInstallationObjectQuery::addData(const DB::Row *_data) +{ + const ManufactureInstallationObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int ManufactureInstallationObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void ManufactureInstallationObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void ManufactureInstallationObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool ManufactureInstallationObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool ManufactureInstallationObjectQuery::bindColumns() +{ + return true; +} + +void ManufactureInstallationObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_manufacture_inst_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_manufacture_inst_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_manufacture_inst_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +ManufactureInstallationObjectQuerySelect::ManufactureInstallationObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool ManufactureInstallationObjectQuerySelect::bindParameters () +{ + return true; +} + +bool ManufactureInstallationObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & ManufactureInstallationObjectQuerySelect::getData() const +{ + return m_data; +} + +void ManufactureInstallationObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_manufacture_inst_object; end;"; +} + +DB::Query::QueryMode ManufactureInstallationObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +MissionObjectQuery::MissionObjectQuery() : + DatabaseProcessQuery(new MissionObjectRow), + m_numItems(0) +{ +} + +bool MissionObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_difficultys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_end_xs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_end_ys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_end_zs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_end_cells.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_end_scenes.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_mission_creators.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_rewards.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_root_script_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_start_xs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_start_ys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_start_zs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_start_cells.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_start_scenes.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_description_tables.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_description_texts.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_title_tables.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_title_texts.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_mission_holder_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_statuss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_mission_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_target_appearances.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_target_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool MissionObjectQuery::addData(const DB::Row *_data) +{ + const MissionObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_difficultys.push_back(myData->difficulty.isNull(), myData->difficulty.getValue())) return false; + if (!m_end_xs.push_back(myData->end_x.isNull(), myData->end_x.getValue())) return false; + if (!m_end_ys.push_back(myData->end_y.isNull(), myData->end_y.getValue())) return false; + if (!m_end_zs.push_back(myData->end_z.isNull(), myData->end_z.getValue())) return false; + if (!m_end_cells.push_back(myData->end_cell.getValueASCII())) return false; + if (!m_end_scenes.push_back(myData->end_scene.isNull(), myData->end_scene.getValue())) return false; + if (!m_mission_creators.push_back(myData->mission_creator.getValueASCII())) return false; + if (!m_rewards.push_back(myData->reward.isNull(), myData->reward.getValue())) return false; + if (!m_root_script_names.push_back(myData->root_script_name.getValueASCII())) return false; + if (!m_start_xs.push_back(myData->start_x.isNull(), myData->start_x.getValue())) return false; + if (!m_start_ys.push_back(myData->start_y.isNull(), myData->start_y.getValue())) return false; + if (!m_start_zs.push_back(myData->start_z.isNull(), myData->start_z.getValue())) return false; + if (!m_start_cells.push_back(myData->start_cell.getValueASCII())) return false; + if (!m_start_scenes.push_back(myData->start_scene.isNull(), myData->start_scene.getValue())) return false; + if (!m_description_tables.push_back(myData->description_table.getValueASCII())) return false; + if (!m_description_texts.push_back(myData->description_text.getValueASCII())) return false; + if (!m_title_tables.push_back(myData->title_table.getValueASCII())) return false; + if (!m_title_texts.push_back(myData->title_text.getValueASCII())) return false; + if (!m_mission_holder_ids.push_back(myData->mission_holder_id.getValueASCII())) return false; + if (!m_statuss.push_back(myData->status.isNull(), myData->status.getValue())) return false; + if (!m_mission_types.push_back(myData->mission_type.isNull(), myData->mission_type.getValue())) return false; + if (!m_target_appearances.push_back(myData->target_appearance.isNull(), myData->target_appearance.getValue())) return false; + if (!m_target_names.push_back(myData->target_name.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int MissionObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void MissionObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_difficultys.clear(); + m_end_xs.clear(); + m_end_ys.clear(); + m_end_zs.clear(); + m_end_cells.clear(); + m_end_scenes.clear(); + m_mission_creators.clear(); + m_rewards.clear(); + m_root_script_names.clear(); + m_start_xs.clear(); + m_start_ys.clear(); + m_start_zs.clear(); + m_start_cells.clear(); + m_start_scenes.clear(); + m_description_tables.clear(); + m_description_texts.clear(); + m_title_tables.clear(); + m_title_texts.clear(); + m_mission_holder_ids.clear(); + m_statuss.clear(); + m_mission_types.clear(); + m_target_appearances.clear(); + m_target_names.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void MissionObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_difficultys.free(); + m_end_xs.free(); + m_end_ys.free(); + m_end_zs.free(); + m_end_cells.free(); + m_end_scenes.free(); + m_mission_creators.free(); + m_rewards.free(); + m_root_script_names.free(); + m_start_xs.free(); + m_start_ys.free(); + m_start_zs.free(); + m_start_cells.free(); + m_start_scenes.free(); + m_description_tables.free(); + m_description_texts.free(); + m_title_tables.free(); + m_title_texts.free(); + m_mission_holder_ids.free(); + m_statuss.free(); + m_mission_types.free(); + m_target_appearances.free(); + m_target_names.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool MissionObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_difficultys)) return false; + if (!bindParameter(m_end_xs)) return false; + if (!bindParameter(m_end_ys)) return false; + if (!bindParameter(m_end_zs)) return false; + if (!bindParameter(m_end_cells)) return false; + if (!bindParameter(m_end_scenes)) return false; + if (!bindParameter(m_mission_creators)) return false; + if (!bindParameter(m_rewards)) return false; + if (!bindParameter(m_root_script_names)) return false; + if (!bindParameter(m_start_xs)) return false; + if (!bindParameter(m_start_ys)) return false; + if (!bindParameter(m_start_zs)) return false; + if (!bindParameter(m_start_cells)) return false; + if (!bindParameter(m_start_scenes)) return false; + if (!bindParameter(m_description_tables)) return false; + if (!bindParameter(m_description_texts)) return false; + if (!bindParameter(m_title_tables)) return false; + if (!bindParameter(m_title_texts)) return false; + if (!bindParameter(m_mission_holder_ids)) return false; + if (!bindParameter(m_statuss)) return false; + if (!bindParameter(m_mission_types)) return false; + if (!bindParameter(m_target_appearances)) return false; + if (!bindParameter(m_target_names)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool MissionObjectQuery::bindColumns() +{ + return true; +} + +void MissionObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_mission_obj (:object_id, :difficulty, :end_x, :end_y, :end_z, :end_cell, :end_scene, :mission_creator, :reward, :root_script_name, :start_x, :start_y, :start_z, :start_cell, :start_scene, :description_table, :description_text, :title_table, :title_text, :mission_holder_id, :status, :mission_type, :target_appearance, :target_name, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_mission_obj (:object_id, :difficulty, :end_x, :end_y, :end_z, :end_cell, :end_scene, :mission_creator, :reward, :root_script_name, :start_x, :start_y, :start_z, :start_cell, :start_scene, :description_table, :description_text, :title_table, :title_text, :mission_holder_id, :status, :mission_type, :target_appearance, :target_name, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_mission_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +MissionObjectQuerySelect::MissionObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool MissionObjectQuerySelect::bindParameters () +{ + return true; +} + +bool MissionObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].difficulty)) return false; + if (!bindCol(m_data[0].end_x)) return false; + if (!bindCol(m_data[0].end_y)) return false; + if (!bindCol(m_data[0].end_z)) return false; + if (!bindCol(m_data[0].end_cell)) return false; + if (!bindCol(m_data[0].end_scene)) return false; + if (!bindCol(m_data[0].mission_creator)) return false; + if (!bindCol(m_data[0].reward)) return false; + if (!bindCol(m_data[0].root_script_name)) return false; + if (!bindCol(m_data[0].start_x)) return false; + if (!bindCol(m_data[0].start_y)) return false; + if (!bindCol(m_data[0].start_z)) return false; + if (!bindCol(m_data[0].start_cell)) return false; + if (!bindCol(m_data[0].start_scene)) return false; + if (!bindCol(m_data[0].description_table)) return false; + if (!bindCol(m_data[0].description_text)) return false; + if (!bindCol(m_data[0].title_table)) return false; + if (!bindCol(m_data[0].title_text)) return false; + if (!bindCol(m_data[0].mission_holder_id)) return false; + if (!bindCol(m_data[0].status)) return false; + if (!bindCol(m_data[0].mission_type)) return false; + if (!bindCol(m_data[0].target_appearance)) return false; + if (!bindCol(m_data[0].target_name)) return false; + return true; +} + +const std::vector & MissionObjectQuerySelect::getData() const +{ + return m_data; +} + +void MissionObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_mission_object; end;"; +} + +DB::Query::QueryMode MissionObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +PlanetObjectQuery::PlanetObjectQuery() : + DatabaseProcessQuery(new PlanetObjectRow), + m_numItems(0) +{ +} + +bool PlanetObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_planet_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool PlanetObjectQuery::addData(const DB::Row *_data) +{ + const PlanetObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_planet_names.push_back(myData->planet_name.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int PlanetObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void PlanetObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_planet_names.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void PlanetObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_planet_names.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool PlanetObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_planet_names)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool PlanetObjectQuery::bindColumns() +{ + return true; +} + +void PlanetObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_planet_obj (:object_id, :planet_name, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_planet_obj (:object_id, :planet_name, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_planet_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +PlanetObjectQuerySelect::PlanetObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool PlanetObjectQuerySelect::bindParameters () +{ + return true; +} + +bool PlanetObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].planet_name)) return false; + return true; +} + +const std::vector & PlanetObjectQuerySelect::getData() const +{ + return m_data; +} + +void PlanetObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_planet_object; end;"; +} + +DB::Query::QueryMode PlanetObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +PlayerObjectQuery::PlayerObjectQuery() : + DatabaseProcessQuery(new PlayerObjectRow), + m_numItems(0) +{ +} + +bool PlayerObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_station_ids.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_house_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_account_num_lotss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_account_is_outcasts.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_account_cheater_levels.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_account_max_lots_adjustments.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_personal_profile_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_character_profile_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_skill_titles.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_born_dates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_played_times.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_force_regen_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_force_powers.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_force_powers.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_active_questss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_completed_questss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_current_quests.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_questss.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_role_icon_choices.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_quests2s.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_quests3s.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_quests4s.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_skill_templates.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_working_skills.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_current_gcw_pointss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_current_gcw_ratings.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_current_pvp_killss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_lifetime_gcw_pointss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_gcw_imperial_ratings.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_gcw_rebel_ratings.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_lifetime_pvp_killss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_next_gcw_rating_calc_times.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_collectionss.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_show_backpacks.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_show_helmets.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_collections2s.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool PlayerObjectQuery::addData(const DB::Row *_data) +{ + const PlayerObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_station_ids.push_back(myData->station_id.isNull(), myData->station_id.getValue())) return false; + if (!m_house_ids.push_back(myData->house_id.getValueASCII())) return false; + if (!m_account_num_lotss.push_back(myData->account_num_lots.isNull(), myData->account_num_lots.getValue())) return false; + if (!m_account_is_outcasts.push_back(myData->account_is_outcast.getValueASCII())) return false; + if (!m_account_cheater_levels.push_back(myData->account_cheater_level.isNull(), myData->account_cheater_level.getValue())) return false; + if (!m_account_max_lots_adjustments.push_back(myData->account_max_lots_adjustment.isNull(), myData->account_max_lots_adjustment.getValue())) return false; + if (!m_personal_profile_ids.push_back(myData->personal_profile_id.getValueASCII())) return false; + if (!m_character_profile_ids.push_back(myData->character_profile_id.getValueASCII())) return false; + if (!m_skill_titles.push_back(myData->skill_title.getValueASCII())) return false; + if (!m_born_dates.push_back(myData->born_date.isNull(), myData->born_date.getValue())) return false; + if (!m_played_times.push_back(myData->played_time.isNull(), myData->played_time.getValue())) return false; + if (!m_force_regen_rates.push_back(myData->force_regen_rate.isNull(), myData->force_regen_rate.getValue())) return false; + if (!m_force_powers.push_back(myData->force_power.isNull(), myData->force_power.getValue())) return false; + if (!m_max_force_powers.push_back(myData->max_force_power.isNull(), myData->max_force_power.getValue())) return false; + if (!m_active_questss.push_back(myData->active_quests.getValueASCII())) return false; + if (!m_completed_questss.push_back(myData->completed_quests.getValueASCII())) return false; + if (!m_current_quests.push_back(myData->current_quest.isNull(), myData->current_quest.getValue())) return false; + if (!m_questss.push_back(myData->quests.getValueASCII())) return false; + if (!m_role_icon_choices.push_back(myData->role_icon_choice.isNull(), myData->role_icon_choice.getValue())) return false; + if (!m_quests2s.push_back(myData->quests2.getValueASCII())) return false; + if (!m_quests3s.push_back(myData->quests3.getValueASCII())) return false; + if (!m_quests4s.push_back(myData->quests4.getValueASCII())) return false; + if (!m_skill_templates.push_back(myData->skill_template.getValueASCII())) return false; + if (!m_working_skills.push_back(myData->working_skill.getValueASCII())) return false; + if (!m_current_gcw_pointss.push_back(myData->current_gcw_points.isNull(), myData->current_gcw_points.getValue())) return false; + if (!m_current_gcw_ratings.push_back(myData->current_gcw_rating.isNull(), myData->current_gcw_rating.getValue())) return false; + if (!m_current_pvp_killss.push_back(myData->current_pvp_kills.isNull(), myData->current_pvp_kills.getValue())) return false; + if (!m_lifetime_gcw_pointss.push_back(myData->lifetime_gcw_points.isNull(), myData->lifetime_gcw_points.getValue())) return false; + if (!m_max_gcw_imperial_ratings.push_back(myData->max_gcw_imperial_rating.isNull(), myData->max_gcw_imperial_rating.getValue())) return false; + if (!m_max_gcw_rebel_ratings.push_back(myData->max_gcw_rebel_rating.isNull(), myData->max_gcw_rebel_rating.getValue())) return false; + if (!m_lifetime_pvp_killss.push_back(myData->lifetime_pvp_kills.isNull(), myData->lifetime_pvp_kills.getValue())) return false; + if (!m_next_gcw_rating_calc_times.push_back(myData->next_gcw_rating_calc_time.isNull(), myData->next_gcw_rating_calc_time.getValue())) return false; + if (!m_collectionss.push_back(myData->collections.getValueASCII())) return false; + if (!m_show_backpacks.push_back(myData->show_backpack.getValueASCII())) return false; + if (!m_show_helmets.push_back(myData->show_helmet.getValueASCII())) return false; + if (!m_collections2s.push_back(myData->collections2.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int PlayerObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void PlayerObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_station_ids.clear(); + m_house_ids.clear(); + m_account_num_lotss.clear(); + m_account_is_outcasts.clear(); + m_account_cheater_levels.clear(); + m_account_max_lots_adjustments.clear(); + m_personal_profile_ids.clear(); + m_character_profile_ids.clear(); + m_skill_titles.clear(); + m_born_dates.clear(); + m_played_times.clear(); + m_force_regen_rates.clear(); + m_force_powers.clear(); + m_max_force_powers.clear(); + m_active_questss.clear(); + m_completed_questss.clear(); + m_current_quests.clear(); + m_questss.clear(); + m_role_icon_choices.clear(); + m_quests2s.clear(); + m_quests3s.clear(); + m_quests4s.clear(); + m_skill_templates.clear(); + m_working_skills.clear(); + m_current_gcw_pointss.clear(); + m_current_gcw_ratings.clear(); + m_current_pvp_killss.clear(); + m_lifetime_gcw_pointss.clear(); + m_max_gcw_imperial_ratings.clear(); + m_max_gcw_rebel_ratings.clear(); + m_lifetime_pvp_killss.clear(); + m_next_gcw_rating_calc_times.clear(); + m_collectionss.clear(); + m_show_backpacks.clear(); + m_show_helmets.clear(); + m_collections2s.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void PlayerObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_station_ids.free(); + m_house_ids.free(); + m_account_num_lotss.free(); + m_account_is_outcasts.free(); + m_account_cheater_levels.free(); + m_account_max_lots_adjustments.free(); + m_personal_profile_ids.free(); + m_character_profile_ids.free(); + m_skill_titles.free(); + m_born_dates.free(); + m_played_times.free(); + m_force_regen_rates.free(); + m_force_powers.free(); + m_max_force_powers.free(); + m_active_questss.free(); + m_completed_questss.free(); + m_current_quests.free(); + m_questss.free(); + m_role_icon_choices.free(); + m_quests2s.free(); + m_quests3s.free(); + m_quests4s.free(); + m_skill_templates.free(); + m_working_skills.free(); + m_current_gcw_pointss.free(); + m_current_gcw_ratings.free(); + m_current_pvp_killss.free(); + m_lifetime_gcw_pointss.free(); + m_max_gcw_imperial_ratings.free(); + m_max_gcw_rebel_ratings.free(); + m_lifetime_pvp_killss.free(); + m_next_gcw_rating_calc_times.free(); + m_collectionss.free(); + m_show_backpacks.free(); + m_show_helmets.free(); + m_collections2s.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool PlayerObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_station_ids)) return false; + if (!bindParameter(m_house_ids)) return false; + if (!bindParameter(m_account_num_lotss)) return false; + if (!bindParameter(m_account_is_outcasts)) return false; + if (!bindParameter(m_account_cheater_levels)) return false; + if (!bindParameter(m_account_max_lots_adjustments)) return false; + if (!bindParameter(m_personal_profile_ids)) return false; + if (!bindParameter(m_character_profile_ids)) return false; + if (!bindParameter(m_skill_titles)) return false; + if (!bindParameter(m_born_dates)) return false; + if (!bindParameter(m_played_times)) return false; + if (!bindParameter(m_force_regen_rates)) return false; + if (!bindParameter(m_force_powers)) return false; + if (!bindParameter(m_max_force_powers)) return false; + if (!bindParameter(m_active_questss)) return false; + if (!bindParameter(m_completed_questss)) return false; + if (!bindParameter(m_current_quests)) return false; + if (!bindParameter(m_questss)) return false; + if (!bindParameter(m_role_icon_choices)) return false; + if (!bindParameter(m_quests2s)) return false; + if (!bindParameter(m_quests3s)) return false; + if (!bindParameter(m_quests4s)) return false; + if (!bindParameter(m_skill_templates)) return false; + if (!bindParameter(m_working_skills)) return false; + if (!bindParameter(m_current_gcw_pointss)) return false; + if (!bindParameter(m_current_gcw_ratings)) return false; + if (!bindParameter(m_current_pvp_killss)) return false; + if (!bindParameter(m_lifetime_gcw_pointss)) return false; + if (!bindParameter(m_max_gcw_imperial_ratings)) return false; + if (!bindParameter(m_max_gcw_rebel_ratings)) return false; + if (!bindParameter(m_lifetime_pvp_killss)) return false; + if (!bindParameter(m_next_gcw_rating_calc_times)) return false; + if (!bindParameter(m_collectionss)) return false; + if (!bindParameter(m_show_backpacks)) return false; + if (!bindParameter(m_show_helmets)) return false; + if (!bindParameter(m_collections2s)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool PlayerObjectQuery::bindColumns() +{ + return true; +} + +void PlayerObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_player_obj (:object_id, :station_id, :house_id, :account_num_lots, :account_is_outcast, :account_cheater_level, :account_max_lots_adjustment, :personal_profile_id, :character_profile_id, :skill_title, :born_date, :played_time, :force_regen_rate, :force_power, :max_force_power, :active_quests, :completed_quests, :current_quest, :quests, :role_icon_choice, :quests2, :quests3, :quests4, :skill_template, :working_skill, :current_gcw_points, :current_gcw_rating, :current_pvp_kills, :lifetime_gcw_points, :max_gcw_imperial_rating, :max_gcw_rebel_rating, :lifetime_pvp_kills, :next_gcw_rating_calc_time, :collections, :show_backpack, :show_helmet, :collections2, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_player_obj (:object_id, :station_id, :house_id, :account_num_lots, :account_is_outcast, :account_cheater_level, :account_max_lots_adjustment, :personal_profile_id, :character_profile_id, :skill_title, :born_date, :played_time, :force_regen_rate, :force_power, :max_force_power, :active_quests, :completed_quests, :current_quest, :quests, :role_icon_choice, :quests2, :quests3, :quests4, :skill_template, :working_skill, :current_gcw_points, :current_gcw_rating, :current_pvp_kills, :lifetime_gcw_points, :max_gcw_imperial_rating, :max_gcw_rebel_rating, :lifetime_pvp_kills, :next_gcw_rating_calc_time, :collections, :show_backpack, :show_helmet, :collections2, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_player_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +PlayerObjectQuerySelect::PlayerObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool PlayerObjectQuerySelect::bindParameters () +{ + return true; +} + +bool PlayerObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].station_id)) return false; + if (!bindCol(m_data[0].house_id)) return false; + if (!bindCol(m_data[0].account_num_lots)) return false; + if (!bindCol(m_data[0].account_is_outcast)) return false; + if (!bindCol(m_data[0].account_cheater_level)) return false; + if (!bindCol(m_data[0].account_max_lots_adjustment)) return false; + if (!bindCol(m_data[0].personal_profile_id)) return false; + if (!bindCol(m_data[0].character_profile_id)) return false; + if (!bindCol(m_data[0].skill_title)) return false; + if (!bindCol(m_data[0].born_date)) return false; + if (!bindCol(m_data[0].played_time)) return false; + if (!bindCol(m_data[0].force_regen_rate)) return false; + if (!bindCol(m_data[0].force_power)) return false; + if (!bindCol(m_data[0].max_force_power)) return false; + if (!bindCol(m_data[0].active_quests)) return false; + if (!bindCol(m_data[0].completed_quests)) return false; + if (!bindCol(m_data[0].current_quest)) return false; + if (!bindCol(m_data[0].quests)) return false; + if (!bindCol(m_data[0].role_icon_choice)) return false; + if (!bindCol(m_data[0].quests2)) return false; + if (!bindCol(m_data[0].quests3)) return false; + if (!bindCol(m_data[0].quests4)) return false; + if (!bindCol(m_data[0].skill_template)) return false; + if (!bindCol(m_data[0].working_skill)) return false; + if (!bindCol(m_data[0].current_gcw_points)) return false; + if (!bindCol(m_data[0].current_gcw_rating)) return false; + if (!bindCol(m_data[0].current_pvp_kills)) return false; + if (!bindCol(m_data[0].lifetime_gcw_points)) return false; + if (!bindCol(m_data[0].max_gcw_imperial_rating)) return false; + if (!bindCol(m_data[0].max_gcw_rebel_rating)) return false; + if (!bindCol(m_data[0].lifetime_pvp_kills)) return false; + if (!bindCol(m_data[0].next_gcw_rating_calc_time)) return false; + if (!bindCol(m_data[0].collections)) return false; + if (!bindCol(m_data[0].show_backpack)) return false; + if (!bindCol(m_data[0].show_helmet)) return false; + if (!bindCol(m_data[0].collections2)) return false; + return true; +} + +const std::vector & PlayerObjectQuerySelect::getData() const +{ + return m_data; +} + +void PlayerObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_player_object; end;"; +} + +DB::Query::QueryMode PlayerObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +PlayerQuestObjectQuery::PlayerQuestObjectQuery() : + DatabaseProcessQuery(new PlayerQuestObjectRow), + m_numItems(0) +{ +} + +bool PlayerQuestObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_titles.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_descriptions.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_creators.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_total_taskss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_difficultys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_task_title1s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description1s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title2s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description2s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title3s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description3s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title4s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description4s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title5s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description5s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title6s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description6s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title7s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description7s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title8s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description8s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title9s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description9s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title10s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description10s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title11s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description11s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_title12s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_task_description12s.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool PlayerQuestObjectQuery::addData(const DB::Row *_data) +{ + const PlayerQuestObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_titles.push_back(myData->title.getValueASCII())) return false; + if (!m_descriptions.push_back(myData->description.getValueASCII())) return false; + if (!m_creators.push_back(myData->creator.getValueASCII())) return false; + if (!m_total_taskss.push_back(myData->total_tasks.isNull(), myData->total_tasks.getValue())) return false; + if (!m_difficultys.push_back(myData->difficulty.isNull(), myData->difficulty.getValue())) return false; + if (!m_task_title1s.push_back(myData->task_title1.getValueASCII())) return false; + if (!m_task_description1s.push_back(myData->task_description1.getValueASCII())) return false; + if (!m_task_title2s.push_back(myData->task_title2.getValueASCII())) return false; + if (!m_task_description2s.push_back(myData->task_description2.getValueASCII())) return false; + if (!m_task_title3s.push_back(myData->task_title3.getValueASCII())) return false; + if (!m_task_description3s.push_back(myData->task_description3.getValueASCII())) return false; + if (!m_task_title4s.push_back(myData->task_title4.getValueASCII())) return false; + if (!m_task_description4s.push_back(myData->task_description4.getValueASCII())) return false; + if (!m_task_title5s.push_back(myData->task_title5.getValueASCII())) return false; + if (!m_task_description5s.push_back(myData->task_description5.getValueASCII())) return false; + if (!m_task_title6s.push_back(myData->task_title6.getValueASCII())) return false; + if (!m_task_description6s.push_back(myData->task_description6.getValueASCII())) return false; + if (!m_task_title7s.push_back(myData->task_title7.getValueASCII())) return false; + if (!m_task_description7s.push_back(myData->task_description7.getValueASCII())) return false; + if (!m_task_title8s.push_back(myData->task_title8.getValueASCII())) return false; + if (!m_task_description8s.push_back(myData->task_description8.getValueASCII())) return false; + if (!m_task_title9s.push_back(myData->task_title9.getValueASCII())) return false; + if (!m_task_description9s.push_back(myData->task_description9.getValueASCII())) return false; + if (!m_task_title10s.push_back(myData->task_title10.getValueASCII())) return false; + if (!m_task_description10s.push_back(myData->task_description10.getValueASCII())) return false; + if (!m_task_title11s.push_back(myData->task_title11.getValueASCII())) return false; + if (!m_task_description11s.push_back(myData->task_description11.getValueASCII())) return false; + if (!m_task_title12s.push_back(myData->task_title12.getValueASCII())) return false; + if (!m_task_description12s.push_back(myData->task_description12.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int PlayerQuestObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void PlayerQuestObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_titles.clear(); + m_descriptions.clear(); + m_creators.clear(); + m_total_taskss.clear(); + m_difficultys.clear(); + m_task_title1s.clear(); + m_task_description1s.clear(); + m_task_title2s.clear(); + m_task_description2s.clear(); + m_task_title3s.clear(); + m_task_description3s.clear(); + m_task_title4s.clear(); + m_task_description4s.clear(); + m_task_title5s.clear(); + m_task_description5s.clear(); + m_task_title6s.clear(); + m_task_description6s.clear(); + m_task_title7s.clear(); + m_task_description7s.clear(); + m_task_title8s.clear(); + m_task_description8s.clear(); + m_task_title9s.clear(); + m_task_description9s.clear(); + m_task_title10s.clear(); + m_task_description10s.clear(); + m_task_title11s.clear(); + m_task_description11s.clear(); + m_task_title12s.clear(); + m_task_description12s.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void PlayerQuestObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_titles.free(); + m_descriptions.free(); + m_creators.free(); + m_total_taskss.free(); + m_difficultys.free(); + m_task_title1s.free(); + m_task_description1s.free(); + m_task_title2s.free(); + m_task_description2s.free(); + m_task_title3s.free(); + m_task_description3s.free(); + m_task_title4s.free(); + m_task_description4s.free(); + m_task_title5s.free(); + m_task_description5s.free(); + m_task_title6s.free(); + m_task_description6s.free(); + m_task_title7s.free(); + m_task_description7s.free(); + m_task_title8s.free(); + m_task_description8s.free(); + m_task_title9s.free(); + m_task_description9s.free(); + m_task_title10s.free(); + m_task_description10s.free(); + m_task_title11s.free(); + m_task_description11s.free(); + m_task_title12s.free(); + m_task_description12s.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool PlayerQuestObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_titles)) return false; + if (!bindParameter(m_descriptions)) return false; + if (!bindParameter(m_creators)) return false; + if (!bindParameter(m_total_taskss)) return false; + if (!bindParameter(m_difficultys)) return false; + if (!bindParameter(m_task_title1s)) return false; + if (!bindParameter(m_task_description1s)) return false; + if (!bindParameter(m_task_title2s)) return false; + if (!bindParameter(m_task_description2s)) return false; + if (!bindParameter(m_task_title3s)) return false; + if (!bindParameter(m_task_description3s)) return false; + if (!bindParameter(m_task_title4s)) return false; + if (!bindParameter(m_task_description4s)) return false; + if (!bindParameter(m_task_title5s)) return false; + if (!bindParameter(m_task_description5s)) return false; + if (!bindParameter(m_task_title6s)) return false; + if (!bindParameter(m_task_description6s)) return false; + if (!bindParameter(m_task_title7s)) return false; + if (!bindParameter(m_task_description7s)) return false; + if (!bindParameter(m_task_title8s)) return false; + if (!bindParameter(m_task_description8s)) return false; + if (!bindParameter(m_task_title9s)) return false; + if (!bindParameter(m_task_description9s)) return false; + if (!bindParameter(m_task_title10s)) return false; + if (!bindParameter(m_task_description10s)) return false; + if (!bindParameter(m_task_title11s)) return false; + if (!bindParameter(m_task_description11s)) return false; + if (!bindParameter(m_task_title12s)) return false; + if (!bindParameter(m_task_description12s)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool PlayerQuestObjectQuery::bindColumns() +{ + return true; +} + +void PlayerQuestObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_player_quest_obj (:object_id, :title, :description, :creator, :total_tasks, :difficulty, :task_title1, :task_description1, :task_title2, :task_description2, :task_title3, :task_description3, :task_title4, :task_description4, :task_title5, :task_description5, :task_title6, :task_description6, :task_title7, :task_description7, :task_title8, :task_description8, :task_title9, :task_description9, :task_title10, :task_description10, :task_title11, :task_description11, :task_title12, :task_description12, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_player_quest_obj (:object_id, :title, :description, :creator, :total_tasks, :difficulty, :task_title1, :task_description1, :task_title2, :task_description2, :task_title3, :task_description3, :task_title4, :task_description4, :task_title5, :task_description5, :task_title6, :task_description6, :task_title7, :task_description7, :task_title8, :task_description8, :task_title9, :task_description9, :task_title10, :task_description10, :task_title11, :task_description11, :task_title12, :task_description12, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_player_quest_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +PlayerQuestObjectQuerySelect::PlayerQuestObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool PlayerQuestObjectQuerySelect::bindParameters () +{ + return true; +} + +bool PlayerQuestObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].title)) return false; + if (!bindCol(m_data[0].description)) return false; + if (!bindCol(m_data[0].creator)) return false; + if (!bindCol(m_data[0].total_tasks)) return false; + if (!bindCol(m_data[0].difficulty)) return false; + if (!bindCol(m_data[0].task_title1)) return false; + if (!bindCol(m_data[0].task_description1)) return false; + if (!bindCol(m_data[0].task_title2)) return false; + if (!bindCol(m_data[0].task_description2)) return false; + if (!bindCol(m_data[0].task_title3)) return false; + if (!bindCol(m_data[0].task_description3)) return false; + if (!bindCol(m_data[0].task_title4)) return false; + if (!bindCol(m_data[0].task_description4)) return false; + if (!bindCol(m_data[0].task_title5)) return false; + if (!bindCol(m_data[0].task_description5)) return false; + if (!bindCol(m_data[0].task_title6)) return false; + if (!bindCol(m_data[0].task_description6)) return false; + if (!bindCol(m_data[0].task_title7)) return false; + if (!bindCol(m_data[0].task_description7)) return false; + if (!bindCol(m_data[0].task_title8)) return false; + if (!bindCol(m_data[0].task_description8)) return false; + if (!bindCol(m_data[0].task_title9)) return false; + if (!bindCol(m_data[0].task_description9)) return false; + if (!bindCol(m_data[0].task_title10)) return false; + if (!bindCol(m_data[0].task_description10)) return false; + if (!bindCol(m_data[0].task_title11)) return false; + if (!bindCol(m_data[0].task_description11)) return false; + if (!bindCol(m_data[0].task_title12)) return false; + if (!bindCol(m_data[0].task_description12)) return false; + return true; +} + +const std::vector & PlayerQuestObjectQuerySelect::getData() const +{ + return m_data; +} + +void PlayerQuestObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_player_quest_object; end;"; +} + +DB::Query::QueryMode PlayerQuestObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +ResourceContainerObjectQuery::ResourceContainerObjectQuery() : + DatabaseProcessQuery(new ResourceContainerObjectRow), + m_numItems(0) +{ +} + +bool ResourceContainerObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_resource_types.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_quantitys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_sources.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool ResourceContainerObjectQuery::addData(const DB::Row *_data) +{ + const ResourceContainerObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_resource_types.push_back(myData->resource_type.getValueASCII())) return false; + if (!m_quantitys.push_back(myData->quantity.isNull(), myData->quantity.getValue())) return false; + if (!m_sources.push_back(myData->source.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int ResourceContainerObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void ResourceContainerObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_resource_types.clear(); + m_quantitys.clear(); + m_sources.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void ResourceContainerObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_resource_types.free(); + m_quantitys.free(); + m_sources.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool ResourceContainerObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_resource_types)) return false; + if (!bindParameter(m_quantitys)) return false; + if (!bindParameter(m_sources)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool ResourceContainerObjectQuery::bindColumns() +{ + return true; +} + +void ResourceContainerObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_resource_container_obj (:object_id, :resource_type, :quantity, :source, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_resource_container_obj (:object_id, :resource_type, :quantity, :source, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_resource_container_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +ResourceContainerObjectQuerySelect::ResourceContainerObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool ResourceContainerObjectQuerySelect::bindParameters () +{ + return true; +} + +bool ResourceContainerObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].resource_type)) return false; + if (!bindCol(m_data[0].quantity)) return false; + if (!bindCol(m_data[0].source)) return false; + return true; +} + +const std::vector & ResourceContainerObjectQuerySelect::getData() const +{ + return m_data; +} + +void ResourceContainerObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_resource_container_object; end;"; +} + +DB::Query::QueryMode ResourceContainerObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +ShipObjectQuery::ShipObjectQuery() : + DatabaseProcessQuery(new ShipObjectRow), + m_numItems(0) +{ +} + +bool ShipObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_slide_dampeners.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_current_chassis_hit_pointss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_maximum_chassis_hit_pointss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_chassis_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_cmp_armor_hp_maximums.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_armor_hp_currents.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_efficiency_generals.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_efficiency_engs.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_eng_maintenances.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_masss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_crcs.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_hp_currents.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_hp_maximums.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_flagss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cmp_namess.create(session, "VAOFLONGSTRING", DatabaseProcess::getInstance().getSchema(), 4000)) return false; + if (!m_weapon_damage_maximums.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_damage_minimums.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_effectiveness_shieldss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_effectiveness_armors.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_eng_per_shots.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_refire_rates.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_ammo_currents.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_ammo_maximums.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_weapon_ammo_types.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_shield_hp_front_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_shield_hp_back_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_shield_recharge_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_capacitor_eng_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_capacitor_eng_recharge_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_acc_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_deceleration_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_pitch_acc_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_yaw_acc_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_roll_acc_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_pitch_rate_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_yaw_rate_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_roll_rate_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_engine_speed_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_reactor_eng_generation_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_booster_eng_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_booster_eng_recharge_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_booster_eng_consumption_rates.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_booster_accs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_booster_speed_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_droid_if_cmd_speeds.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_installed_dcds.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_chassis_cmp_mass_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_cmp_creatorss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_cargo_hold_contents_maximums.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_cargo_hold_contents_currents.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_cargo_hold_contentss.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool ShipObjectQuery::addData(const DB::Row *_data) +{ + const ShipObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_slide_dampeners.push_back(myData->slide_dampener.isNull(), myData->slide_dampener.getValue())) return false; + if (!m_current_chassis_hit_pointss.push_back(myData->current_chassis_hit_points.isNull(), myData->current_chassis_hit_points.getValue())) return false; + if (!m_maximum_chassis_hit_pointss.push_back(myData->maximum_chassis_hit_points.isNull(), myData->maximum_chassis_hit_points.getValue())) return false; + if (!m_chassis_types.push_back(myData->chassis_type.isNull(), myData->chassis_type.getValue())) return false; + if (!m_cmp_armor_hp_maximums.push_back(myData->cmp_armor_hp_maximum.getValueASCII())) return false; + if (!m_cmp_armor_hp_currents.push_back(myData->cmp_armor_hp_current.getValueASCII())) return false; + if (!m_cmp_efficiency_generals.push_back(myData->cmp_efficiency_general.getValueASCII())) return false; + if (!m_cmp_efficiency_engs.push_back(myData->cmp_efficiency_eng.getValueASCII())) return false; + if (!m_cmp_eng_maintenances.push_back(myData->cmp_eng_maintenance.getValueASCII())) return false; + if (!m_cmp_masss.push_back(myData->cmp_mass.getValueASCII())) return false; + if (!m_cmp_crcs.push_back(myData->cmp_crc.getValueASCII())) return false; + if (!m_cmp_hp_currents.push_back(myData->cmp_hp_current.getValueASCII())) return false; + if (!m_cmp_hp_maximums.push_back(myData->cmp_hp_maximum.getValueASCII())) return false; + if (!m_cmp_flagss.push_back(myData->cmp_flags.getValueASCII())) return false; + if (!m_cmp_namess.push_back(myData->cmp_names.getValueASCII())) return false; + if (!m_weapon_damage_maximums.push_back(myData->weapon_damage_maximum.getValueASCII())) return false; + if (!m_weapon_damage_minimums.push_back(myData->weapon_damage_minimum.getValueASCII())) return false; + if (!m_weapon_effectiveness_shieldss.push_back(myData->weapon_effectiveness_shields.getValueASCII())) return false; + if (!m_weapon_effectiveness_armors.push_back(myData->weapon_effectiveness_armor.getValueASCII())) return false; + if (!m_weapon_eng_per_shots.push_back(myData->weapon_eng_per_shot.getValueASCII())) return false; + if (!m_weapon_refire_rates.push_back(myData->weapon_refire_rate.getValueASCII())) return false; + if (!m_weapon_ammo_currents.push_back(myData->weapon_ammo_current.getValueASCII())) return false; + if (!m_weapon_ammo_maximums.push_back(myData->weapon_ammo_maximum.getValueASCII())) return false; + if (!m_weapon_ammo_types.push_back(myData->weapon_ammo_type.getValueASCII())) return false; + if (!m_shield_hp_front_maximums.push_back(myData->shield_hp_front_maximum.isNull(), myData->shield_hp_front_maximum.getValue())) return false; + if (!m_shield_hp_back_maximums.push_back(myData->shield_hp_back_maximum.isNull(), myData->shield_hp_back_maximum.getValue())) return false; + if (!m_shield_recharge_rates.push_back(myData->shield_recharge_rate.isNull(), myData->shield_recharge_rate.getValue())) return false; + if (!m_capacitor_eng_maximums.push_back(myData->capacitor_eng_maximum.isNull(), myData->capacitor_eng_maximum.getValue())) return false; + if (!m_capacitor_eng_recharge_rates.push_back(myData->capacitor_eng_recharge_rate.isNull(), myData->capacitor_eng_recharge_rate.getValue())) return false; + if (!m_engine_acc_rates.push_back(myData->engine_acc_rate.isNull(), myData->engine_acc_rate.getValue())) return false; + if (!m_engine_deceleration_rates.push_back(myData->engine_deceleration_rate.isNull(), myData->engine_deceleration_rate.getValue())) return false; + if (!m_engine_pitch_acc_rates.push_back(myData->engine_pitch_acc_rate.isNull(), myData->engine_pitch_acc_rate.getValue())) return false; + if (!m_engine_yaw_acc_rates.push_back(myData->engine_yaw_acc_rate.isNull(), myData->engine_yaw_acc_rate.getValue())) return false; + if (!m_engine_roll_acc_rates.push_back(myData->engine_roll_acc_rate.isNull(), myData->engine_roll_acc_rate.getValue())) return false; + if (!m_engine_pitch_rate_maximums.push_back(myData->engine_pitch_rate_maximum.isNull(), myData->engine_pitch_rate_maximum.getValue())) return false; + if (!m_engine_yaw_rate_maximums.push_back(myData->engine_yaw_rate_maximum.isNull(), myData->engine_yaw_rate_maximum.getValue())) return false; + if (!m_engine_roll_rate_maximums.push_back(myData->engine_roll_rate_maximum.isNull(), myData->engine_roll_rate_maximum.getValue())) return false; + if (!m_engine_speed_maximums.push_back(myData->engine_speed_maximum.isNull(), myData->engine_speed_maximum.getValue())) return false; + if (!m_reactor_eng_generation_rates.push_back(myData->reactor_eng_generation_rate.isNull(), myData->reactor_eng_generation_rate.getValue())) return false; + if (!m_booster_eng_maximums.push_back(myData->booster_eng_maximum.isNull(), myData->booster_eng_maximum.getValue())) return false; + if (!m_booster_eng_recharge_rates.push_back(myData->booster_eng_recharge_rate.isNull(), myData->booster_eng_recharge_rate.getValue())) return false; + if (!m_booster_eng_consumption_rates.push_back(myData->booster_eng_consumption_rate.isNull(), myData->booster_eng_consumption_rate.getValue())) return false; + if (!m_booster_accs.push_back(myData->booster_acc.isNull(), myData->booster_acc.getValue())) return false; + if (!m_booster_speed_maximums.push_back(myData->booster_speed_maximum.isNull(), myData->booster_speed_maximum.getValue())) return false; + if (!m_droid_if_cmd_speeds.push_back(myData->droid_if_cmd_speed.isNull(), myData->droid_if_cmd_speed.getValue())) return false; + if (!m_installed_dcds.push_back(myData->installed_dcd.getValueASCII())) return false; + if (!m_chassis_cmp_mass_maximums.push_back(myData->chassis_cmp_mass_maximum.isNull(), myData->chassis_cmp_mass_maximum.getValue())) return false; + if (!m_cmp_creatorss.push_back(myData->cmp_creators.getValueASCII())) return false; + if (!m_cargo_hold_contents_maximums.push_back(myData->cargo_hold_contents_maximum.isNull(), myData->cargo_hold_contents_maximum.getValue())) return false; + if (!m_cargo_hold_contents_currents.push_back(myData->cargo_hold_contents_current.isNull(), myData->cargo_hold_contents_current.getValue())) return false; + if (!m_cargo_hold_contentss.push_back(myData->cargo_hold_contents.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int ShipObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void ShipObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_slide_dampeners.clear(); + m_current_chassis_hit_pointss.clear(); + m_maximum_chassis_hit_pointss.clear(); + m_chassis_types.clear(); + m_cmp_armor_hp_maximums.clear(); + m_cmp_armor_hp_currents.clear(); + m_cmp_efficiency_generals.clear(); + m_cmp_efficiency_engs.clear(); + m_cmp_eng_maintenances.clear(); + m_cmp_masss.clear(); + m_cmp_crcs.clear(); + m_cmp_hp_currents.clear(); + m_cmp_hp_maximums.clear(); + m_cmp_flagss.clear(); + m_cmp_namess.clear(); + m_weapon_damage_maximums.clear(); + m_weapon_damage_minimums.clear(); + m_weapon_effectiveness_shieldss.clear(); + m_weapon_effectiveness_armors.clear(); + m_weapon_eng_per_shots.clear(); + m_weapon_refire_rates.clear(); + m_weapon_ammo_currents.clear(); + m_weapon_ammo_maximums.clear(); + m_weapon_ammo_types.clear(); + m_shield_hp_front_maximums.clear(); + m_shield_hp_back_maximums.clear(); + m_shield_recharge_rates.clear(); + m_capacitor_eng_maximums.clear(); + m_capacitor_eng_recharge_rates.clear(); + m_engine_acc_rates.clear(); + m_engine_deceleration_rates.clear(); + m_engine_pitch_acc_rates.clear(); + m_engine_yaw_acc_rates.clear(); + m_engine_roll_acc_rates.clear(); + m_engine_pitch_rate_maximums.clear(); + m_engine_yaw_rate_maximums.clear(); + m_engine_roll_rate_maximums.clear(); + m_engine_speed_maximums.clear(); + m_reactor_eng_generation_rates.clear(); + m_booster_eng_maximums.clear(); + m_booster_eng_recharge_rates.clear(); + m_booster_eng_consumption_rates.clear(); + m_booster_accs.clear(); + m_booster_speed_maximums.clear(); + m_droid_if_cmd_speeds.clear(); + m_installed_dcds.clear(); + m_chassis_cmp_mass_maximums.clear(); + m_cmp_creatorss.clear(); + m_cargo_hold_contents_maximums.clear(); + m_cargo_hold_contents_currents.clear(); + m_cargo_hold_contentss.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void ShipObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_slide_dampeners.free(); + m_current_chassis_hit_pointss.free(); + m_maximum_chassis_hit_pointss.free(); + m_chassis_types.free(); + m_cmp_armor_hp_maximums.free(); + m_cmp_armor_hp_currents.free(); + m_cmp_efficiency_generals.free(); + m_cmp_efficiency_engs.free(); + m_cmp_eng_maintenances.free(); + m_cmp_masss.free(); + m_cmp_crcs.free(); + m_cmp_hp_currents.free(); + m_cmp_hp_maximums.free(); + m_cmp_flagss.free(); + m_cmp_namess.free(); + m_weapon_damage_maximums.free(); + m_weapon_damage_minimums.free(); + m_weapon_effectiveness_shieldss.free(); + m_weapon_effectiveness_armors.free(); + m_weapon_eng_per_shots.free(); + m_weapon_refire_rates.free(); + m_weapon_ammo_currents.free(); + m_weapon_ammo_maximums.free(); + m_weapon_ammo_types.free(); + m_shield_hp_front_maximums.free(); + m_shield_hp_back_maximums.free(); + m_shield_recharge_rates.free(); + m_capacitor_eng_maximums.free(); + m_capacitor_eng_recharge_rates.free(); + m_engine_acc_rates.free(); + m_engine_deceleration_rates.free(); + m_engine_pitch_acc_rates.free(); + m_engine_yaw_acc_rates.free(); + m_engine_roll_acc_rates.free(); + m_engine_pitch_rate_maximums.free(); + m_engine_yaw_rate_maximums.free(); + m_engine_roll_rate_maximums.free(); + m_engine_speed_maximums.free(); + m_reactor_eng_generation_rates.free(); + m_booster_eng_maximums.free(); + m_booster_eng_recharge_rates.free(); + m_booster_eng_consumption_rates.free(); + m_booster_accs.free(); + m_booster_speed_maximums.free(); + m_droid_if_cmd_speeds.free(); + m_installed_dcds.free(); + m_chassis_cmp_mass_maximums.free(); + m_cmp_creatorss.free(); + m_cargo_hold_contents_maximums.free(); + m_cargo_hold_contents_currents.free(); + m_cargo_hold_contentss.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool ShipObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_slide_dampeners)) return false; + if (!bindParameter(m_current_chassis_hit_pointss)) return false; + if (!bindParameter(m_maximum_chassis_hit_pointss)) return false; + if (!bindParameter(m_chassis_types)) return false; + if (!bindParameter(m_cmp_armor_hp_maximums)) return false; + if (!bindParameter(m_cmp_armor_hp_currents)) return false; + if (!bindParameter(m_cmp_efficiency_generals)) return false; + if (!bindParameter(m_cmp_efficiency_engs)) return false; + if (!bindParameter(m_cmp_eng_maintenances)) return false; + if (!bindParameter(m_cmp_masss)) return false; + if (!bindParameter(m_cmp_crcs)) return false; + if (!bindParameter(m_cmp_hp_currents)) return false; + if (!bindParameter(m_cmp_hp_maximums)) return false; + if (!bindParameter(m_cmp_flagss)) return false; + if (!bindParameter(m_cmp_namess)) return false; + if (!bindParameter(m_weapon_damage_maximums)) return false; + if (!bindParameter(m_weapon_damage_minimums)) return false; + if (!bindParameter(m_weapon_effectiveness_shieldss)) return false; + if (!bindParameter(m_weapon_effectiveness_armors)) return false; + if (!bindParameter(m_weapon_eng_per_shots)) return false; + if (!bindParameter(m_weapon_refire_rates)) return false; + if (!bindParameter(m_weapon_ammo_currents)) return false; + if (!bindParameter(m_weapon_ammo_maximums)) return false; + if (!bindParameter(m_weapon_ammo_types)) return false; + if (!bindParameter(m_shield_hp_front_maximums)) return false; + if (!bindParameter(m_shield_hp_back_maximums)) return false; + if (!bindParameter(m_shield_recharge_rates)) return false; + if (!bindParameter(m_capacitor_eng_maximums)) return false; + if (!bindParameter(m_capacitor_eng_recharge_rates)) return false; + if (!bindParameter(m_engine_acc_rates)) return false; + if (!bindParameter(m_engine_deceleration_rates)) return false; + if (!bindParameter(m_engine_pitch_acc_rates)) return false; + if (!bindParameter(m_engine_yaw_acc_rates)) return false; + if (!bindParameter(m_engine_roll_acc_rates)) return false; + if (!bindParameter(m_engine_pitch_rate_maximums)) return false; + if (!bindParameter(m_engine_yaw_rate_maximums)) return false; + if (!bindParameter(m_engine_roll_rate_maximums)) return false; + if (!bindParameter(m_engine_speed_maximums)) return false; + if (!bindParameter(m_reactor_eng_generation_rates)) return false; + if (!bindParameter(m_booster_eng_maximums)) return false; + if (!bindParameter(m_booster_eng_recharge_rates)) return false; + if (!bindParameter(m_booster_eng_consumption_rates)) return false; + if (!bindParameter(m_booster_accs)) return false; + if (!bindParameter(m_booster_speed_maximums)) return false; + if (!bindParameter(m_droid_if_cmd_speeds)) return false; + if (!bindParameter(m_installed_dcds)) return false; + if (!bindParameter(m_chassis_cmp_mass_maximums)) return false; + if (!bindParameter(m_cmp_creatorss)) return false; + if (!bindParameter(m_cargo_hold_contents_maximums)) return false; + if (!bindParameter(m_cargo_hold_contents_currents)) return false; + if (!bindParameter(m_cargo_hold_contentss)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool ShipObjectQuery::bindColumns() +{ + return true; +} + +void ShipObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_ship_obj (:object_id, :slide_dampener, :current_chassis_hit_points, :maximum_chassis_hit_points, :chassis_type, :cmp_armor_hp_maximum, :cmp_armor_hp_current, :cmp_efficiency_general, :cmp_efficiency_eng, :cmp_eng_maintenance, :cmp_mass, :cmp_crc, :cmp_hp_current, :cmp_hp_maximum, :cmp_flags, :cmp_names, :weapon_damage_maximum, :weapon_damage_minimum, :weapon_effectiveness_shields, :weapon_effectiveness_armor, :weapon_eng_per_shot, :weapon_refire_rate, :weapon_ammo_current, :weapon_ammo_maximum, :weapon_ammo_type, :shield_hp_front_maximum, :shield_hp_back_maximum, :shield_recharge_rate, :capacitor_eng_maximum, :capacitor_eng_recharge_rate, :engine_acc_rate, :engine_deceleration_rate, :engine_pitch_acc_rate, :engine_yaw_acc_rate, :engine_roll_acc_rate, :engine_pitch_rate_maximum, :engine_yaw_rate_maximum, :engine_roll_rate_maximum, :engine_speed_maximum, :reactor_eng_generation_rate, :booster_eng_maximum, :booster_eng_recharge_rate, :booster_eng_consumption_rate, :booster_acc, :booster_speed_maximum, :droid_if_cmd_speed, :installed_dcd, :chassis_cmp_mass_maximum, :cmp_creators, :cargo_hold_contents_maximum, :cargo_hold_contents_current, :cargo_hold_contents, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_ship_obj (:object_id, :slide_dampener, :current_chassis_hit_points, :maximum_chassis_hit_points, :chassis_type, :cmp_armor_hp_maximum, :cmp_armor_hp_current, :cmp_efficiency_general, :cmp_efficiency_eng, :cmp_eng_maintenance, :cmp_mass, :cmp_crc, :cmp_hp_current, :cmp_hp_maximum, :cmp_flags, :cmp_names, :weapon_damage_maximum, :weapon_damage_minimum, :weapon_effectiveness_shields, :weapon_effectiveness_armor, :weapon_eng_per_shot, :weapon_refire_rate, :weapon_ammo_current, :weapon_ammo_maximum, :weapon_ammo_type, :shield_hp_front_maximum, :shield_hp_back_maximum, :shield_recharge_rate, :capacitor_eng_maximum, :capacitor_eng_recharge_rate, :engine_acc_rate, :engine_deceleration_rate, :engine_pitch_acc_rate, :engine_yaw_acc_rate, :engine_roll_acc_rate, :engine_pitch_rate_maximum, :engine_yaw_rate_maximum, :engine_roll_rate_maximum, :engine_speed_maximum, :reactor_eng_generation_rate, :booster_eng_maximum, :booster_eng_recharge_rate, :booster_eng_consumption_rate, :booster_acc, :booster_speed_maximum, :droid_if_cmd_speed, :installed_dcd, :chassis_cmp_mass_maximum, :cmp_creators, :cargo_hold_contents_maximum, :cargo_hold_contents_current, :cargo_hold_contents, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_ship_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +ShipObjectQuerySelect::ShipObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool ShipObjectQuerySelect::bindParameters () +{ + return true; +} + +bool ShipObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].slide_dampener)) return false; + if (!bindCol(m_data[0].current_chassis_hit_points)) return false; + if (!bindCol(m_data[0].maximum_chassis_hit_points)) return false; + if (!bindCol(m_data[0].chassis_type)) return false; + if (!bindCol(m_data[0].cmp_armor_hp_maximum)) return false; + if (!bindCol(m_data[0].cmp_armor_hp_current)) return false; + if (!bindCol(m_data[0].cmp_efficiency_general)) return false; + if (!bindCol(m_data[0].cmp_efficiency_eng)) return false; + if (!bindCol(m_data[0].cmp_eng_maintenance)) return false; + if (!bindCol(m_data[0].cmp_mass)) return false; + if (!bindCol(m_data[0].cmp_crc)) return false; + if (!bindCol(m_data[0].cmp_hp_current)) return false; + if (!bindCol(m_data[0].cmp_hp_maximum)) return false; + if (!bindCol(m_data[0].cmp_flags)) return false; + if (!bindCol(m_data[0].cmp_names)) return false; + if (!bindCol(m_data[0].weapon_damage_maximum)) return false; + if (!bindCol(m_data[0].weapon_damage_minimum)) return false; + if (!bindCol(m_data[0].weapon_effectiveness_shields)) return false; + if (!bindCol(m_data[0].weapon_effectiveness_armor)) return false; + if (!bindCol(m_data[0].weapon_eng_per_shot)) return false; + if (!bindCol(m_data[0].weapon_refire_rate)) return false; + if (!bindCol(m_data[0].weapon_ammo_current)) return false; + if (!bindCol(m_data[0].weapon_ammo_maximum)) return false; + if (!bindCol(m_data[0].weapon_ammo_type)) return false; + if (!bindCol(m_data[0].shield_hp_front_maximum)) return false; + if (!bindCol(m_data[0].shield_hp_back_maximum)) return false; + if (!bindCol(m_data[0].shield_recharge_rate)) return false; + if (!bindCol(m_data[0].capacitor_eng_maximum)) return false; + if (!bindCol(m_data[0].capacitor_eng_recharge_rate)) return false; + if (!bindCol(m_data[0].engine_acc_rate)) return false; + if (!bindCol(m_data[0].engine_deceleration_rate)) return false; + if (!bindCol(m_data[0].engine_pitch_acc_rate)) return false; + if (!bindCol(m_data[0].engine_yaw_acc_rate)) return false; + if (!bindCol(m_data[0].engine_roll_acc_rate)) return false; + if (!bindCol(m_data[0].engine_pitch_rate_maximum)) return false; + if (!bindCol(m_data[0].engine_yaw_rate_maximum)) return false; + if (!bindCol(m_data[0].engine_roll_rate_maximum)) return false; + if (!bindCol(m_data[0].engine_speed_maximum)) return false; + if (!bindCol(m_data[0].reactor_eng_generation_rate)) return false; + if (!bindCol(m_data[0].booster_eng_maximum)) return false; + if (!bindCol(m_data[0].booster_eng_recharge_rate)) return false; + if (!bindCol(m_data[0].booster_eng_consumption_rate)) return false; + if (!bindCol(m_data[0].booster_acc)) return false; + if (!bindCol(m_data[0].booster_speed_maximum)) return false; + if (!bindCol(m_data[0].droid_if_cmd_speed)) return false; + if (!bindCol(m_data[0].installed_dcd)) return false; + if (!bindCol(m_data[0].chassis_cmp_mass_maximum)) return false; + if (!bindCol(m_data[0].cmp_creators)) return false; + if (!bindCol(m_data[0].cargo_hold_contents_maximum)) return false; + if (!bindCol(m_data[0].cargo_hold_contents_current)) return false; + if (!bindCol(m_data[0].cargo_hold_contents)) return false; + return true; +} + +const std::vector & ShipObjectQuerySelect::getData() const +{ + return m_data; +} + +void ShipObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_ship_object; end;"; +} + +DB::Query::QueryMode ShipObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +StaticObjectQuery::StaticObjectQuery() : + DatabaseProcessQuery(new StaticObjectRow), + m_numItems(0) +{ +} + +bool StaticObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool StaticObjectQuery::addData(const DB::Row *_data) +{ + const StaticObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int StaticObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void StaticObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void StaticObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool StaticObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool StaticObjectQuery::bindColumns() +{ + return true; +} + +void StaticObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_static_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_static_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_static_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +StaticObjectQuerySelect::StaticObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool StaticObjectQuerySelect::bindParameters () +{ + return true; +} + +bool StaticObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & StaticObjectQuerySelect::getData() const +{ + return m_data; +} + +void StaticObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_static_object; end;"; +} + +DB::Query::QueryMode StaticObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +TangibleObjectQuery::TangibleObjectQuery() : + DatabaseProcessQuery(new TangibleObjectRow), + m_numItems(0) +{ +} + +bool TangibleObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_max_hit_pointss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_owner_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_visibles.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_appearance_datas.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_interest_radiuss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_pvp_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_pvp_factions.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_damage_takens.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_custom_appearances.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_counts.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_conditions.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_creator_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_source_draft_schematics.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool TangibleObjectQuery::addData(const DB::Row *_data) +{ + const TangibleObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_max_hit_pointss.push_back(myData->max_hit_points.isNull(), myData->max_hit_points.getValue())) return false; + if (!m_owner_ids.push_back(myData->owner_id.getValueASCII())) return false; + if (!m_visibles.push_back(myData->visible.getValueASCII())) return false; + if (!m_appearance_datas.push_back(myData->appearance_data.getValueASCII())) return false; + if (!m_interest_radiuss.push_back(myData->interest_radius.isNull(), myData->interest_radius.getValue())) return false; + if (!m_pvp_types.push_back(myData->pvp_type.isNull(), myData->pvp_type.getValue())) return false; + if (!m_pvp_factions.push_back(myData->pvp_faction.isNull(), myData->pvp_faction.getValue())) return false; + if (!m_damage_takens.push_back(myData->damage_taken.isNull(), myData->damage_taken.getValue())) return false; + if (!m_custom_appearances.push_back(myData->custom_appearance.getValueASCII())) return false; + if (!m_counts.push_back(myData->count.isNull(), myData->count.getValue())) return false; + if (!m_conditions.push_back(myData->condition.isNull(), myData->condition.getValue())) return false; + if (!m_creator_ids.push_back(myData->creator_id.getValueASCII())) return false; + if (!m_source_draft_schematics.push_back(myData->source_draft_schematic.isNull(), myData->source_draft_schematic.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int TangibleObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void TangibleObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_max_hit_pointss.clear(); + m_owner_ids.clear(); + m_visibles.clear(); + m_appearance_datas.clear(); + m_interest_radiuss.clear(); + m_pvp_types.clear(); + m_pvp_factions.clear(); + m_damage_takens.clear(); + m_custom_appearances.clear(); + m_counts.clear(); + m_conditions.clear(); + m_creator_ids.clear(); + m_source_draft_schematics.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void TangibleObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_max_hit_pointss.free(); + m_owner_ids.free(); + m_visibles.free(); + m_appearance_datas.free(); + m_interest_radiuss.free(); + m_pvp_types.free(); + m_pvp_factions.free(); + m_damage_takens.free(); + m_custom_appearances.free(); + m_counts.free(); + m_conditions.free(); + m_creator_ids.free(); + m_source_draft_schematics.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool TangibleObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_max_hit_pointss)) return false; + if (!bindParameter(m_owner_ids)) return false; + if (!bindParameter(m_visibles)) return false; + if (!bindParameter(m_appearance_datas)) return false; + if (!bindParameter(m_interest_radiuss)) return false; + if (!bindParameter(m_pvp_types)) return false; + if (!bindParameter(m_pvp_factions)) return false; + if (!bindParameter(m_damage_takens)) return false; + if (!bindParameter(m_custom_appearances)) return false; + if (!bindParameter(m_counts)) return false; + if (!bindParameter(m_conditions)) return false; + if (!bindParameter(m_creator_ids)) return false; + if (!bindParameter(m_source_draft_schematics)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool TangibleObjectQuery::bindColumns() +{ + return true; +} + +void TangibleObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_tangible_obj (:object_id, :max_hit_points, :owner_id, :visible, :appearance_data, :interest_radius, :pvp_type, :pvp_faction, :damage_taken, :custom_appearance, :count, :condition, :creator_id, :source_draft_schematic, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_tangible_obj (:object_id, :max_hit_points, :owner_id, :visible, :appearance_data, :interest_radius, :pvp_type, :pvp_faction, :damage_taken, :custom_appearance, :count, :condition, :creator_id, :source_draft_schematic, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_tangible_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +TangibleObjectQuerySelect::TangibleObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool TangibleObjectQuerySelect::bindParameters () +{ + return true; +} + +bool TangibleObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].max_hit_points)) return false; + if (!bindCol(m_data[0].owner_id)) return false; + if (!bindCol(m_data[0].visible)) return false; + if (!bindCol(m_data[0].appearance_data)) return false; + if (!bindCol(m_data[0].interest_radius)) return false; + if (!bindCol(m_data[0].pvp_type)) return false; + if (!bindCol(m_data[0].pvp_faction)) return false; + if (!bindCol(m_data[0].damage_taken)) return false; + if (!bindCol(m_data[0].custom_appearance)) return false; + if (!bindCol(m_data[0].count)) return false; + if (!bindCol(m_data[0].condition)) return false; + if (!bindCol(m_data[0].creator_id)) return false; + if (!bindCol(m_data[0].source_draft_schematic)) return false; + return true; +} + +const std::vector & TangibleObjectQuerySelect::getData() const +{ + return m_data; +} + +void TangibleObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_tangible_object; end;"; +} + +DB::Query::QueryMode TangibleObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +TokenObjectQuery::TokenObjectQuery() : + DatabaseProcessQuery(new TokenObjectRow), + m_numItems(0) +{ +} + +bool TokenObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_references.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_target_server_template_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_target_shared_template_names.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_waypoints.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool TokenObjectQuery::addData(const DB::Row *_data) +{ + const TokenObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_references.push_back(myData->reference.getValueASCII())) return false; + if (!m_target_server_template_names.push_back(myData->target_server_template_name.getValueASCII())) return false; + if (!m_target_shared_template_names.push_back(myData->target_shared_template_name.getValueASCII())) return false; + if (!m_waypoints.push_back(myData->waypoint.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int TokenObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void TokenObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_references.clear(); + m_target_server_template_names.clear(); + m_target_shared_template_names.clear(); + m_waypoints.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void TokenObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_references.free(); + m_target_server_template_names.free(); + m_target_shared_template_names.free(); + m_waypoints.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool TokenObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_references)) return false; + if (!bindParameter(m_target_server_template_names)) return false; + if (!bindParameter(m_target_shared_template_names)) return false; + if (!bindParameter(m_waypoints)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool TokenObjectQuery::bindColumns() +{ + return true; +} + +void TokenObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_token_obj (:object_id, :reference, :target_server_template_name, :target_shared_template_name, :waypoint, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_token_obj (:object_id, :reference, :target_server_template_name, :target_shared_template_name, :waypoint, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_token_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +TokenObjectQuerySelect::TokenObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool TokenObjectQuerySelect::bindParameters () +{ + return true; +} + +bool TokenObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].reference)) return false; + if (!bindCol(m_data[0].target_server_template_name)) return false; + if (!bindCol(m_data[0].target_shared_template_name)) return false; + if (!bindCol(m_data[0].waypoint)) return false; + return true; +} + +const std::vector & TokenObjectQuerySelect::getData() const +{ + return m_data; +} + +void TokenObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_token_object; end;"; +} + +DB::Query::QueryMode TokenObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +UniverseObjectQuery::UniverseObjectQuery() : + DatabaseProcessQuery(new UniverseObjectRow), + m_numItems(0) +{ +} + +bool UniverseObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool UniverseObjectQuery::addData(const DB::Row *_data) +{ + const UniverseObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int UniverseObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void UniverseObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void UniverseObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool UniverseObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool UniverseObjectQuery::bindColumns() +{ + return true; +} + +void UniverseObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_universe_obj (:object_id, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_universe_obj (:object_id, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_universe_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +UniverseObjectQuerySelect::UniverseObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool UniverseObjectQuerySelect::bindParameters () +{ + return true; +} + +bool UniverseObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + return true; +} + +const std::vector & UniverseObjectQuerySelect::getData() const +{ + return m_data; +} + +void UniverseObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_universe_object; end;"; +} + +DB::Query::QueryMode UniverseObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +VehicleObjectQuery::VehicleObjectQuery() : + DatabaseProcessQuery(new VehicleObjectRow), + m_numItems(0) +{ +} + +bool VehicleObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_boguss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool VehicleObjectQuery::addData(const DB::Row *_data) +{ + const VehicleObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_boguss.push_back(myData->bogus.isNull(), myData->bogus.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int VehicleObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void VehicleObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_boguss.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void VehicleObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_boguss.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool VehicleObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_boguss)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool VehicleObjectQuery::bindColumns() +{ + return true; +} + +void VehicleObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_vehicle_obj (:object_id, :bogus, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_vehicle_obj (:object_id, :bogus, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_vehicle_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +VehicleObjectQuerySelect::VehicleObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool VehicleObjectQuerySelect::bindParameters () +{ + return true; +} + +bool VehicleObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].bogus)) return false; + return true; +} + +const std::vector & VehicleObjectQuerySelect::getData() const +{ + return m_data; +} + +void VehicleObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_vehicle_object; end;"; +} + +DB::Query::QueryMode VehicleObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} + +WeaponObjectQuery::WeaponObjectQuery() : + DatabaseProcessQuery(new WeaponObjectRow), + m_numItems(0) +{ +} + +bool WeaponObjectQuery::setupData(DB::Session *session) +{ + + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(), 1000)) return false; + if (!m_min_damages.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_damages.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_damage_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_elemental_types.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_elemental_values.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attack_speeds.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_wound_chances.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_accuracys.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_attack_costs.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_damage_radiuss.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_min_ranges.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + if (!m_max_ranges.create(session, "VAOFNUMBER", DatabaseProcess::getInstance().getSchema())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.create(session, "VAOFSTRING", DatabaseProcess::getInstance().getSchema(),1000)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; +} + +bool WeaponObjectQuery::addData(const DB::Row *_data) +{ + const WeaponObjectBufferRow *myData=safe_cast(_data); + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + if (!m_min_damages.push_back(myData->min_damage.isNull(), myData->min_damage.getValue())) return false; + if (!m_max_damages.push_back(myData->max_damage.isNull(), myData->max_damage.getValue())) return false; + if (!m_damage_types.push_back(myData->damage_type.isNull(), myData->damage_type.getValue())) return false; + if (!m_elemental_types.push_back(myData->elemental_type.isNull(), myData->elemental_type.getValue())) return false; + if (!m_elemental_values.push_back(myData->elemental_value.isNull(), myData->elemental_value.getValue())) return false; + if (!m_attack_speeds.push_back(myData->attack_speed.isNull(), myData->attack_speed.getValue())) return false; + if (!m_wound_chances.push_back(myData->wound_chance.isNull(), myData->wound_chance.getValue())) return false; + if (!m_accuracys.push_back(myData->accuracy.isNull(), myData->accuracy.getValue())) return false; + if (!m_attack_costs.push_back(myData->attack_cost.isNull(), myData->attack_cost.getValue())) return false; + if (!m_damage_radiuss.push_back(myData->damage_radius.isNull(), myData->damage_radius.getValue())) return false; + if (!m_min_ranges.push_back(myData->min_range.isNull(), myData->min_range.getValue())) return false; + if (!m_max_ranges.push_back(myData->max_range.isNull(), myData->max_range.getValue())) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!m_object_ids.push_back(myData->object_id.getValueASCII())) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=m_numItems.getValue() + 1; + return true; +} + +int WeaponObjectQuery::getNumItems() const +{ + return m_numItems.getValue(); +} + +void WeaponObjectQuery::clearData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.clear(); + m_min_damages.clear(); + m_max_damages.clear(); + m_damage_types.clear(); + m_elemental_types.clear(); + m_elemental_values.clear(); + m_attack_speeds.clear(); + m_wound_chances.clear(); + m_accuracys.clear(); + m_attack_costs.clear(); + m_damage_radiuss.clear(); + m_min_ranges.clear(); + m_max_ranges.clear(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.clear(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + + m_numItems=0; +} + +void WeaponObjectQuery::freeData() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + m_object_ids.free(); + m_min_damages.free(); + m_max_damages.free(); + m_damage_types.free(); + m_elemental_types.free(); + m_elemental_values.free(); + m_attack_speeds.free(); + m_wound_chances.free(); + m_accuracys.free(); + m_attack_costs.free(); + m_damage_radiuss.free(); + m_min_ranges.free(); + m_max_ranges.free(); + break; + + case mode_SELECT: + break; + + case mode_DELETE: + m_object_ids.free(); + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +bool WeaponObjectQuery::bindParameters() +{ + switch(mode) + { + case mode_UPDATE: + case mode_INSERT: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_min_damages)) return false; + if (!bindParameter(m_max_damages)) return false; + if (!bindParameter(m_damage_types)) return false; + if (!bindParameter(m_elemental_types)) return false; + if (!bindParameter(m_elemental_values)) return false; + if (!bindParameter(m_attack_speeds)) return false; + if (!bindParameter(m_wound_chances)) return false; + if (!bindParameter(m_accuracys)) return false; + if (!bindParameter(m_attack_costs)) return false; + if (!bindParameter(m_damage_radiuss)) return false; + if (!bindParameter(m_min_ranges)) return false; + if (!bindParameter(m_max_ranges)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + if (!bindParameter(m_object_ids)) return false; + if (!bindParameter(m_numItems)) return false; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + return true; + +} + +bool WeaponObjectQuery::bindColumns() +{ + return true; +} + +void WeaponObjectQuery::getSQL(std::string &sql) +{ + switch(mode) + { + case mode_UPDATE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.save_weapon_obj (:object_id, :min_damage, :max_damage, :damage_type, :elemental_type, :elemental_value, :attack_speed, :wound_chance, :accuracy, :attack_cost, :damage_radius, :min_range, :max_range, :chunk_size); end;"; + break; + + case mode_INSERT: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.add_weapon_obj (:object_id, :min_damage, :max_damage, :damage_type, :elemental_type, :elemental_value, :attack_speed, :wound_chance, :accuracy, :attack_cost, :damage_radius, :min_range, :max_range, :chunk_size); end;"; + break; + + case mode_SELECT: + break; + + case mode_DELETE: + sql=std::string("begin ")+DatabaseProcess::getInstance().getSchemaQualifier()+"persister.remove_weapon_obj (:object_id, :chunk_size ); end;"; + break; + + default: + DEBUG_FATAL(true,("Bad query mode.")); + } + +} + +WeaponObjectQuerySelect::WeaponObjectQuerySelect(const std::string &schema) : + m_data(ms_fetchBatchSize), + m_schema(schema) +{ +} + +bool WeaponObjectQuerySelect::bindParameters () +{ + return true; +} + +bool WeaponObjectQuerySelect::bindColumns() +{ + size_t skipSize = reinterpret_cast(&(m_data[1])) - reinterpret_cast(&(m_data[0])); + setColArrayMode(skipSize, ms_fetchBatchSize); + + if (!bindCol(m_data[0].object_id)) return false; + if (!bindCol(m_data[0].min_damage)) return false; + if (!bindCol(m_data[0].max_damage)) return false; + if (!bindCol(m_data[0].damage_type)) return false; + if (!bindCol(m_data[0].elemental_type)) return false; + if (!bindCol(m_data[0].elemental_value)) return false; + if (!bindCol(m_data[0].attack_speed)) return false; + if (!bindCol(m_data[0].wound_chance)) return false; + if (!bindCol(m_data[0].accuracy)) return false; + if (!bindCol(m_data[0].attack_cost)) return false; + if (!bindCol(m_data[0].damage_radius)) return false; + if (!bindCol(m_data[0].min_range)) return false; + if (!bindCol(m_data[0].max_range)) return false; + return true; +} + +const std::vector & WeaponObjectQuerySelect::getData() const +{ + return m_data; +} + +void WeaponObjectQuerySelect::getSQL(std::string &sql) +{ + sql=std::string("begin :result := ")+m_schema+"loader.load_weapon_object; end;"; +} + +DB::Query::QueryMode WeaponObjectQuerySelect::getExecutionMode() const +{ + return MODE_PLSQL_REFCURSOR; +} //!!!END GENERATED QUERYDEFINITIONS diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template index 600219311..327283d0e 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template @@ -24,6 +24,1347 @@ namespace DBQuery { //!!!BEGIN GENERATED QUERYDECLARATIONS +class BattlefieldMarkerObjectQuery : public DatabaseProcessQuery +{ + BattlefieldMarkerObjectQuery(const BattlefieldMarkerObjectQuery&); + BattlefieldMarkerObjectQuery& operator= (const BattlefieldMarkerObjectQuery&); +public: + BattlefieldMarkerObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_region_names; + DB::BindableLong m_numItems; +}; + +class BattlefieldMarkerObjectQuerySelect : public DB::Query +{ +public: + BattlefieldMarkerObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + BattlefieldMarkerObjectQuerySelect (const BattlefieldMarkerObjectQuerySelect&); + BattlefieldMarkerObjectQuerySelect& operator= (const BattlefieldMarkerObjectQuerySelect&); +}; + +class BuildingObjectQuery : public DatabaseProcessQuery +{ + BuildingObjectQuery(const BuildingObjectQuery&); + BuildingObjectQuery& operator= (const BuildingObjectQuery&); +public: + BuildingObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_maintenance_costs; + DB::BindableVarrayNumber m_time_last_checkeds; + DB::BindableVarrayString m_is_publics; + DB::BindableVarrayNumber m_city_ids; + DB::BindableLong m_numItems; +}; + +class BuildingObjectQuerySelect : public DB::Query +{ +public: + BuildingObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + BuildingObjectQuerySelect (const BuildingObjectQuerySelect&); + BuildingObjectQuerySelect& operator= (const BuildingObjectQuerySelect&); +}; + +class CellObjectQuery : public DatabaseProcessQuery +{ + CellObjectQuery(const CellObjectQuery&); + CellObjectQuery& operator= (const CellObjectQuery&); +public: + CellObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_cell_numbers; + DB::BindableVarrayString m_is_publics; + DB::BindableLong m_numItems; +}; + +class CellObjectQuerySelect : public DB::Query +{ +public: + CellObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + CellObjectQuerySelect (const CellObjectQuerySelect&); + CellObjectQuerySelect& operator= (const CellObjectQuerySelect&); +}; + +class CityObjectQuery : public DatabaseProcessQuery +{ + CityObjectQuery(const CityObjectQuery&); + CityObjectQuery& operator= (const CityObjectQuery&); +public: + CityObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class CityObjectQuerySelect : public DB::Query +{ +public: + CityObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + CityObjectQuerySelect (const CityObjectQuerySelect&); + CityObjectQuerySelect& operator= (const CityObjectQuerySelect&); +}; + +class CreatureObjectQuery : public DatabaseProcessQuery +{ + CreatureObjectQuery(const CreatureObjectQuery&); + CreatureObjectQuery& operator= (const CreatureObjectQuery&); +public: + CreatureObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_scale_factors; + DB::BindableVarrayNumber m_statess; + DB::BindableVarrayNumber m_postures; + DB::BindableVarrayNumber m_shock_woundss; + DB::BindableVarrayString m_master_ids; + DB::BindableVarrayNumber m_ranks; + DB::BindableVarrayNumber m_base_walk_speeds; + DB::BindableVarrayNumber m_base_run_speeds; + DB::BindableVarrayNumber m_attribute_0s; + DB::BindableVarrayNumber m_attribute_1s; + DB::BindableVarrayNumber m_attribute_2s; + DB::BindableVarrayNumber m_attribute_3s; + DB::BindableVarrayNumber m_attribute_4s; + DB::BindableVarrayNumber m_attribute_5s; + DB::BindableVarrayNumber m_attribute_6s; + DB::BindableVarrayNumber m_attribute_7s; + DB::BindableVarrayNumber m_attribute_8s; + DB::BindableVarrayNumber m_attribute_9s; + DB::BindableVarrayNumber m_attribute_10s; + DB::BindableVarrayNumber m_attribute_11s; + DB::BindableVarrayNumber m_attribute_12s; + DB::BindableVarrayNumber m_attribute_13s; + DB::BindableVarrayNumber m_attribute_14s; + DB::BindableVarrayNumber m_attribute_15s; + DB::BindableVarrayNumber m_attribute_16s; + DB::BindableVarrayNumber m_attribute_17s; + DB::BindableVarrayNumber m_attribute_18s; + DB::BindableVarrayNumber m_attribute_19s; + DB::BindableVarrayNumber m_attribute_20s; + DB::BindableVarrayNumber m_attribute_21s; + DB::BindableVarrayNumber m_attribute_22s; + DB::BindableVarrayNumber m_attribute_23s; + DB::BindableVarrayNumber m_attribute_24s; + DB::BindableVarrayNumber m_attribute_25s; + DB::BindableVarrayNumber m_attribute_26s; + DB::BindableVarrayString m_persisted_buffss; + DB::BindableVarrayNumber m_ws_xs; + DB::BindableVarrayNumber m_ws_ys; + DB::BindableVarrayNumber m_ws_zs; + DB::BindableLong m_numItems; +}; + +class CreatureObjectQuerySelect : public DB::Query +{ +public: + CreatureObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + CreatureObjectQuerySelect (const CreatureObjectQuerySelect&); + CreatureObjectQuerySelect& operator= (const CreatureObjectQuerySelect&); +}; + +class FactoryObjectQuery : public DatabaseProcessQuery +{ + FactoryObjectQuery(const FactoryObjectQuery&); + FactoryObjectQuery& operator= (const FactoryObjectQuery&); +public: + FactoryObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class FactoryObjectQuerySelect : public DB::Query +{ +public: + FactoryObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + FactoryObjectQuerySelect (const FactoryObjectQuerySelect&); + FactoryObjectQuerySelect& operator= (const FactoryObjectQuerySelect&); +}; + +class GuildObjectQuery : public DatabaseProcessQuery +{ + GuildObjectQuery(const GuildObjectQuery&); + GuildObjectQuery& operator= (const GuildObjectQuery&); +public: + GuildObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class GuildObjectQuerySelect : public DB::Query +{ +public: + GuildObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + GuildObjectQuerySelect (const GuildObjectQuerySelect&); + GuildObjectQuerySelect& operator= (const GuildObjectQuerySelect&); +}; + +class HarvesterInstallationObjectQuery : public DatabaseProcessQuery +{ + HarvesterInstallationObjectQuery(const HarvesterInstallationObjectQuery&); + HarvesterInstallationObjectQuery& operator= (const HarvesterInstallationObjectQuery&); +public: + HarvesterInstallationObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_installed_efficiencys; + DB::BindableVarrayNumber m_max_extraction_rates; + DB::BindableVarrayNumber m_current_extraction_rates; + DB::BindableVarrayNumber m_max_hopper_amounts; + DB::BindableVarrayString m_hopper_resources; + DB::BindableVarrayNumber m_hopper_amounts; + DB::BindableVarrayString m_resource_types; + DB::BindableLong m_numItems; +}; + +class HarvesterInstallationObjectQuerySelect : public DB::Query +{ +public: + HarvesterInstallationObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + HarvesterInstallationObjectQuerySelect (const HarvesterInstallationObjectQuerySelect&); + HarvesterInstallationObjectQuerySelect& operator= (const HarvesterInstallationObjectQuerySelect&); +}; + +class InstallationObjectQuery : public DatabaseProcessQuery +{ + InstallationObjectQuery(const InstallationObjectQuery&); + InstallationObjectQuery& operator= (const InstallationObjectQuery&); +public: + InstallationObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_installation_types; + DB::BindableVarrayString m_activateds; + DB::BindableVarrayNumber m_tick_counts; + DB::BindableVarrayNumber m_activate_start_times; + DB::BindableVarrayNumber m_powers; + DB::BindableVarrayNumber m_power_rates; + DB::BindableLong m_numItems; +}; + +class InstallationObjectQuerySelect : public DB::Query +{ +public: + InstallationObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + InstallationObjectQuerySelect (const InstallationObjectQuerySelect&); + InstallationObjectQuerySelect& operator= (const InstallationObjectQuerySelect&); +}; + +class IntangibleObjectQuery : public DatabaseProcessQuery +{ + IntangibleObjectQuery(const IntangibleObjectQuery&); + IntangibleObjectQuery& operator= (const IntangibleObjectQuery&); +public: + IntangibleObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_counts; + DB::BindableLong m_numItems; +}; + +class IntangibleObjectQuerySelect : public DB::Query +{ +public: + IntangibleObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + IntangibleObjectQuerySelect (const IntangibleObjectQuerySelect&); + IntangibleObjectQuerySelect& operator= (const IntangibleObjectQuerySelect&); +}; + +class ManufactureSchematicObjectQuery : public DatabaseProcessQuery +{ + ManufactureSchematicObjectQuery(const ManufactureSchematicObjectQuery&); + ManufactureSchematicObjectQuery& operator= (const ManufactureSchematicObjectQuery&); +public: + ManufactureSchematicObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_creator_ids; + DB::BindableVarrayString m_creator_names; + DB::BindableVarrayNumber m_items_per_containers; + DB::BindableVarrayNumber m_manufacture_times; + DB::BindableVarrayNumber m_draft_schematics; + DB::BindableLong m_numItems; +}; + +class ManufactureSchematicObjectQuerySelect : public DB::Query +{ +public: + ManufactureSchematicObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + ManufactureSchematicObjectQuerySelect (const ManufactureSchematicObjectQuerySelect&); + ManufactureSchematicObjectQuerySelect& operator= (const ManufactureSchematicObjectQuerySelect&); +}; + +class ManufactureInstallationObjectQuery : public DatabaseProcessQuery +{ + ManufactureInstallationObjectQuery(const ManufactureInstallationObjectQuery&); + ManufactureInstallationObjectQuery& operator= (const ManufactureInstallationObjectQuery&); +public: + ManufactureInstallationObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class ManufactureInstallationObjectQuerySelect : public DB::Query +{ +public: + ManufactureInstallationObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + ManufactureInstallationObjectQuerySelect (const ManufactureInstallationObjectQuerySelect&); + ManufactureInstallationObjectQuerySelect& operator= (const ManufactureInstallationObjectQuerySelect&); +}; + +class MissionObjectQuery : public DatabaseProcessQuery +{ + MissionObjectQuery(const MissionObjectQuery&); + MissionObjectQuery& operator= (const MissionObjectQuery&); +public: + MissionObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_difficultys; + DB::BindableVarrayNumber m_end_xs; + DB::BindableVarrayNumber m_end_ys; + DB::BindableVarrayNumber m_end_zs; + DB::BindableVarrayString m_end_cells; + DB::BindableVarrayNumber m_end_scenes; + DB::BindableVarrayString m_mission_creators; + DB::BindableVarrayNumber m_rewards; + DB::BindableVarrayString m_root_script_names; + DB::BindableVarrayNumber m_start_xs; + DB::BindableVarrayNumber m_start_ys; + DB::BindableVarrayNumber m_start_zs; + DB::BindableVarrayString m_start_cells; + DB::BindableVarrayNumber m_start_scenes; + DB::BindableVarrayString m_description_tables; + DB::BindableVarrayString m_description_texts; + DB::BindableVarrayString m_title_tables; + DB::BindableVarrayString m_title_texts; + DB::BindableVarrayString m_mission_holder_ids; + DB::BindableVarrayNumber m_statuss; + DB::BindableVarrayNumber m_mission_types; + DB::BindableVarrayNumber m_target_appearances; + DB::BindableVarrayString m_target_names; + DB::BindableLong m_numItems; +}; + +class MissionObjectQuerySelect : public DB::Query +{ +public: + MissionObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + MissionObjectQuerySelect (const MissionObjectQuerySelect&); + MissionObjectQuerySelect& operator= (const MissionObjectQuerySelect&); +}; + +class PlanetObjectQuery : public DatabaseProcessQuery +{ + PlanetObjectQuery(const PlanetObjectQuery&); + PlanetObjectQuery& operator= (const PlanetObjectQuery&); +public: + PlanetObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_planet_names; + DB::BindableLong m_numItems; +}; + +class PlanetObjectQuerySelect : public DB::Query +{ +public: + PlanetObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + PlanetObjectQuerySelect (const PlanetObjectQuerySelect&); + PlanetObjectQuerySelect& operator= (const PlanetObjectQuerySelect&); +}; + +class PlayerObjectQuery : public DatabaseProcessQuery +{ + PlayerObjectQuery(const PlayerObjectQuery&); + PlayerObjectQuery& operator= (const PlayerObjectQuery&); +public: + PlayerObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_station_ids; + DB::BindableVarrayString m_house_ids; + DB::BindableVarrayNumber m_account_num_lotss; + DB::BindableVarrayString m_account_is_outcasts; + DB::BindableVarrayNumber m_account_cheater_levels; + DB::BindableVarrayNumber m_account_max_lots_adjustments; + DB::BindableVarrayString m_personal_profile_ids; + DB::BindableVarrayString m_character_profile_ids; + DB::BindableVarrayString m_skill_titles; + DB::BindableVarrayNumber m_born_dates; + DB::BindableVarrayNumber m_played_times; + DB::BindableVarrayNumber m_force_regen_rates; + DB::BindableVarrayNumber m_force_powers; + DB::BindableVarrayNumber m_max_force_powers; + DB::BindableVarrayString m_active_questss; + DB::BindableVarrayString m_completed_questss; + DB::BindableVarrayNumber m_current_quests; + DB::BindableVarrayString m_questss; + DB::BindableVarrayNumber m_role_icon_choices; + DB::BindableVarrayString m_quests2s; + DB::BindableVarrayString m_quests3s; + DB::BindableVarrayString m_quests4s; + DB::BindableVarrayString m_skill_templates; + DB::BindableVarrayString m_working_skills; + DB::BindableVarrayNumber m_current_gcw_pointss; + DB::BindableVarrayNumber m_current_gcw_ratings; + DB::BindableVarrayNumber m_current_pvp_killss; + DB::BindableVarrayNumber m_lifetime_gcw_pointss; + DB::BindableVarrayNumber m_max_gcw_imperial_ratings; + DB::BindableVarrayNumber m_max_gcw_rebel_ratings; + DB::BindableVarrayNumber m_lifetime_pvp_killss; + DB::BindableVarrayNumber m_next_gcw_rating_calc_times; + DB::BindableVarrayString m_collectionss; + DB::BindableVarrayString m_show_backpacks; + DB::BindableVarrayString m_show_helmets; + DB::BindableVarrayString m_collections2s; + DB::BindableLong m_numItems; +}; + +class PlayerObjectQuerySelect : public DB::Query +{ +public: + PlayerObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + PlayerObjectQuerySelect (const PlayerObjectQuerySelect&); + PlayerObjectQuerySelect& operator= (const PlayerObjectQuerySelect&); +}; + +class PlayerQuestObjectQuery : public DatabaseProcessQuery +{ + PlayerQuestObjectQuery(const PlayerQuestObjectQuery&); + PlayerQuestObjectQuery& operator= (const PlayerQuestObjectQuery&); +public: + PlayerQuestObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_titles; + DB::BindableVarrayString m_descriptions; + DB::BindableVarrayString m_creators; + DB::BindableVarrayNumber m_total_taskss; + DB::BindableVarrayNumber m_difficultys; + DB::BindableVarrayString m_task_title1s; + DB::BindableVarrayString m_task_description1s; + DB::BindableVarrayString m_task_title2s; + DB::BindableVarrayString m_task_description2s; + DB::BindableVarrayString m_task_title3s; + DB::BindableVarrayString m_task_description3s; + DB::BindableVarrayString m_task_title4s; + DB::BindableVarrayString m_task_description4s; + DB::BindableVarrayString m_task_title5s; + DB::BindableVarrayString m_task_description5s; + DB::BindableVarrayString m_task_title6s; + DB::BindableVarrayString m_task_description6s; + DB::BindableVarrayString m_task_title7s; + DB::BindableVarrayString m_task_description7s; + DB::BindableVarrayString m_task_title8s; + DB::BindableVarrayString m_task_description8s; + DB::BindableVarrayString m_task_title9s; + DB::BindableVarrayString m_task_description9s; + DB::BindableVarrayString m_task_title10s; + DB::BindableVarrayString m_task_description10s; + DB::BindableVarrayString m_task_title11s; + DB::BindableVarrayString m_task_description11s; + DB::BindableVarrayString m_task_title12s; + DB::BindableVarrayString m_task_description12s; + DB::BindableLong m_numItems; +}; + +class PlayerQuestObjectQuerySelect : public DB::Query +{ +public: + PlayerQuestObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + PlayerQuestObjectQuerySelect (const PlayerQuestObjectQuerySelect&); + PlayerQuestObjectQuerySelect& operator= (const PlayerQuestObjectQuerySelect&); +}; + +class ResourceContainerObjectQuery : public DatabaseProcessQuery +{ + ResourceContainerObjectQuery(const ResourceContainerObjectQuery&); + ResourceContainerObjectQuery& operator= (const ResourceContainerObjectQuery&); +public: + ResourceContainerObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_resource_types; + DB::BindableVarrayNumber m_quantitys; + DB::BindableVarrayString m_sources; + DB::BindableLong m_numItems; +}; + +class ResourceContainerObjectQuerySelect : public DB::Query +{ +public: + ResourceContainerObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + ResourceContainerObjectQuerySelect (const ResourceContainerObjectQuerySelect&); + ResourceContainerObjectQuerySelect& operator= (const ResourceContainerObjectQuerySelect&); +}; + +class ShipObjectQuery : public DatabaseProcessQuery +{ + ShipObjectQuery(const ShipObjectQuery&); + ShipObjectQuery& operator= (const ShipObjectQuery&); +public: + ShipObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_slide_dampeners; + DB::BindableVarrayNumber m_current_chassis_hit_pointss; + DB::BindableVarrayNumber m_maximum_chassis_hit_pointss; + DB::BindableVarrayNumber m_chassis_types; + DB::BindableVarrayString m_cmp_armor_hp_maximums; + DB::BindableVarrayString m_cmp_armor_hp_currents; + DB::BindableVarrayString m_cmp_efficiency_generals; + DB::BindableVarrayString m_cmp_efficiency_engs; + DB::BindableVarrayString m_cmp_eng_maintenances; + DB::BindableVarrayString m_cmp_masss; + DB::BindableVarrayString m_cmp_crcs; + DB::BindableVarrayString m_cmp_hp_currents; + DB::BindableVarrayString m_cmp_hp_maximums; + DB::BindableVarrayString m_cmp_flagss; + DB::BindableVarrayString m_cmp_namess; + DB::BindableVarrayString m_weapon_damage_maximums; + DB::BindableVarrayString m_weapon_damage_minimums; + DB::BindableVarrayString m_weapon_effectiveness_shieldss; + DB::BindableVarrayString m_weapon_effectiveness_armors; + DB::BindableVarrayString m_weapon_eng_per_shots; + DB::BindableVarrayString m_weapon_refire_rates; + DB::BindableVarrayString m_weapon_ammo_currents; + DB::BindableVarrayString m_weapon_ammo_maximums; + DB::BindableVarrayString m_weapon_ammo_types; + DB::BindableVarrayNumber m_shield_hp_front_maximums; + DB::BindableVarrayNumber m_shield_hp_back_maximums; + DB::BindableVarrayNumber m_shield_recharge_rates; + DB::BindableVarrayNumber m_capacitor_eng_maximums; + DB::BindableVarrayNumber m_capacitor_eng_recharge_rates; + DB::BindableVarrayNumber m_engine_acc_rates; + DB::BindableVarrayNumber m_engine_deceleration_rates; + DB::BindableVarrayNumber m_engine_pitch_acc_rates; + DB::BindableVarrayNumber m_engine_yaw_acc_rates; + DB::BindableVarrayNumber m_engine_roll_acc_rates; + DB::BindableVarrayNumber m_engine_pitch_rate_maximums; + DB::BindableVarrayNumber m_engine_yaw_rate_maximums; + DB::BindableVarrayNumber m_engine_roll_rate_maximums; + DB::BindableVarrayNumber m_engine_speed_maximums; + DB::BindableVarrayNumber m_reactor_eng_generation_rates; + DB::BindableVarrayNumber m_booster_eng_maximums; + DB::BindableVarrayNumber m_booster_eng_recharge_rates; + DB::BindableVarrayNumber m_booster_eng_consumption_rates; + DB::BindableVarrayNumber m_booster_accs; + DB::BindableVarrayNumber m_booster_speed_maximums; + DB::BindableVarrayNumber m_droid_if_cmd_speeds; + DB::BindableVarrayString m_installed_dcds; + DB::BindableVarrayNumber m_chassis_cmp_mass_maximums; + DB::BindableVarrayString m_cmp_creatorss; + DB::BindableVarrayNumber m_cargo_hold_contents_maximums; + DB::BindableVarrayNumber m_cargo_hold_contents_currents; + DB::BindableVarrayString m_cargo_hold_contentss; + DB::BindableLong m_numItems; +}; + +class ShipObjectQuerySelect : public DB::Query +{ +public: + ShipObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + ShipObjectQuerySelect (const ShipObjectQuerySelect&); + ShipObjectQuerySelect& operator= (const ShipObjectQuerySelect&); +}; + +class StaticObjectQuery : public DatabaseProcessQuery +{ + StaticObjectQuery(const StaticObjectQuery&); + StaticObjectQuery& operator= (const StaticObjectQuery&); +public: + StaticObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class StaticObjectQuerySelect : public DB::Query +{ +public: + StaticObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + StaticObjectQuerySelect (const StaticObjectQuerySelect&); + StaticObjectQuerySelect& operator= (const StaticObjectQuerySelect&); +}; + +class TangibleObjectQuery : public DatabaseProcessQuery +{ + TangibleObjectQuery(const TangibleObjectQuery&); + TangibleObjectQuery& operator= (const TangibleObjectQuery&); +public: + TangibleObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_max_hit_pointss; + DB::BindableVarrayString m_owner_ids; + DB::BindableVarrayString m_visibles; + DB::BindableVarrayString m_appearance_datas; + DB::BindableVarrayNumber m_interest_radiuss; + DB::BindableVarrayNumber m_pvp_types; + DB::BindableVarrayNumber m_pvp_factions; + DB::BindableVarrayNumber m_damage_takens; + DB::BindableVarrayString m_custom_appearances; + DB::BindableVarrayNumber m_counts; + DB::BindableVarrayNumber m_conditions; + DB::BindableVarrayString m_creator_ids; + DB::BindableVarrayNumber m_source_draft_schematics; + DB::BindableLong m_numItems; +}; + +class TangibleObjectQuerySelect : public DB::Query +{ +public: + TangibleObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + TangibleObjectQuerySelect (const TangibleObjectQuerySelect&); + TangibleObjectQuerySelect& operator= (const TangibleObjectQuerySelect&); +}; + +class TokenObjectQuery : public DatabaseProcessQuery +{ + TokenObjectQuery(const TokenObjectQuery&); + TokenObjectQuery& operator= (const TokenObjectQuery&); +public: + TokenObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayString m_references; + DB::BindableVarrayString m_target_server_template_names; + DB::BindableVarrayString m_target_shared_template_names; + DB::BindableVarrayString m_waypoints; + DB::BindableLong m_numItems; +}; + +class TokenObjectQuerySelect : public DB::Query +{ +public: + TokenObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + TokenObjectQuerySelect (const TokenObjectQuerySelect&); + TokenObjectQuerySelect& operator= (const TokenObjectQuerySelect&); +}; + +class UniverseObjectQuery : public DatabaseProcessQuery +{ + UniverseObjectQuery(const UniverseObjectQuery&); + UniverseObjectQuery& operator= (const UniverseObjectQuery&); +public: + UniverseObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableLong m_numItems; +}; + +class UniverseObjectQuerySelect : public DB::Query +{ +public: + UniverseObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + UniverseObjectQuerySelect (const UniverseObjectQuerySelect&); + UniverseObjectQuerySelect& operator= (const UniverseObjectQuerySelect&); +}; + +class VehicleObjectQuery : public DatabaseProcessQuery +{ + VehicleObjectQuery(const VehicleObjectQuery&); + VehicleObjectQuery& operator= (const VehicleObjectQuery&); +public: + VehicleObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_boguss; + DB::BindableLong m_numItems; +}; + +class VehicleObjectQuerySelect : public DB::Query +{ +public: + VehicleObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + VehicleObjectQuerySelect (const VehicleObjectQuerySelect&); + VehicleObjectQuerySelect& operator= (const VehicleObjectQuerySelect&); +}; + +class WeaponObjectQuery : public DatabaseProcessQuery +{ + WeaponObjectQuery(const WeaponObjectQuery&); + WeaponObjectQuery& operator= (const WeaponObjectQuery&); +public: + WeaponObjectQuery(); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL(std::string &sql); + + bool setupData(DB::Session *session); + bool addData(const DB::Row *_data); + void clearData(); + void freeData(); + + int getNumItems() const; + +private: + DB::BindableVarrayString m_object_ids; + DB::BindableVarrayNumber m_min_damages; + DB::BindableVarrayNumber m_max_damages; + DB::BindableVarrayNumber m_damage_types; + DB::BindableVarrayNumber m_elemental_types; + DB::BindableVarrayNumber m_elemental_values; + DB::BindableVarrayNumber m_attack_speeds; + DB::BindableVarrayNumber m_wound_chances; + DB::BindableVarrayNumber m_accuracys; + DB::BindableVarrayNumber m_attack_costs; + DB::BindableVarrayNumber m_damage_radiuss; + DB::BindableVarrayNumber m_min_ranges; + DB::BindableVarrayNumber m_max_ranges; + DB::BindableLong m_numItems; +}; + +class WeaponObjectQuerySelect : public DB::Query +{ +public: + WeaponObjectQuerySelect(const std::string &schema); + + virtual bool bindParameters (); + virtual bool bindColumns (); + virtual void getSQL (std::string &sql); + + const std::vector & getData() const; + +protected: + virtual QueryMode getExecutionMode() const; + +private: + + std::vector m_data; + const std::string m_schema; + + WeaponObjectQuerySelect (const WeaponObjectQuerySelect&); + WeaponObjectQuerySelect& operator= (const WeaponObjectQuerySelect&); +}; //!!!END GENERATED QUERYDECLARATIONS diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template index 0be172b00..7297cfd7a 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template +++ b/src/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template @@ -252,6 +252,2876 @@ struct WaypointRow : public DB::Row }; //!!!BEGIN GENERATED DECLARATIONS +struct ArmorRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong layer; + DB::BindableLong effectiveness; + DB::BindableLong integrity; + DB::BindableString<1000> special_protections; + DB::BindableLong encumberance_0; + DB::BindableLong encumberance_1; + DB::BindableLong encumberance_2; + DB::BindableLong encumberance_3; + DB::BindableLong encumberance_4; + DB::BindableLong encumberance_5; + DB::BindableLong encumberance_6; + DB::BindableLong encumberance_7; + DB::BindableLong encumberance_8; + DB::BindableString<255> object_template; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ArmorBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong layer; + DB::BindableLong effectiveness; + DB::BindableLong integrity; + DB::BufferString special_protections; + DB::BindableLong encumberance_0; + DB::BindableLong encumberance_1; + DB::BindableLong encumberance_2; + DB::BindableLong encumberance_3; + DB::BindableLong encumberance_4; + DB::BindableLong encumberance_5; + DB::BindableLong encumberance_6; + DB::BindableLong encumberance_7; + DB::BindableLong encumberance_8; + DB::BufferString object_template; + + ArmorBufferRow() : + object_id(), + layer(), + effectiveness(), + integrity(), + special_protections(1000), + encumberance_0(), + encumberance_1(), + encumberance_2(), + encumberance_3(), + encumberance_4(), + encumberance_5(), + encumberance_6(), + encumberance_7(), + encumberance_8(), + object_template(255) + { + } + + ArmorBufferRow(const ArmorRow & rhs) : + object_id(rhs.object_id), + layer(rhs.layer), + effectiveness(rhs.effectiveness), + integrity(rhs.integrity), + special_protections(rhs.special_protections), + encumberance_0(rhs.encumberance_0), + encumberance_1(rhs.encumberance_1), + encumberance_2(rhs.encumberance_2), + encumberance_3(rhs.encumberance_3), + encumberance_4(rhs.encumberance_4), + encumberance_5(rhs.encumberance_5), + encumberance_6(rhs.encumberance_6), + encumberance_7(rhs.encumberance_7), + encumberance_8(rhs.encumberance_8), + object_template(rhs.object_template) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct BattlefieldMarkerObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableString<500> region_name; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct BattlefieldMarkerObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BufferString region_name; + + BattlefieldMarkerObjectBufferRow() : + object_id(), + region_name(500) + { + } + + BattlefieldMarkerObjectBufferRow(const BattlefieldMarkerObjectRow & rhs) : + object_id(rhs.object_id), + region_name(rhs.region_name) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct BattlefieldParticipantRow : public DB::Row +{ + DB::BindableNetworkId region_object_id; + DB::BindableNetworkId character_object_id; + DB::BindableLong faction_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct BattlefieldParticipantBufferRow : public DB::Row +{ + DB::BindableNetworkId region_object_id; + DB::BindableNetworkId character_object_id; + DB::BindableLong faction_id; + + BattlefieldParticipantBufferRow() : + region_object_id(), + character_object_id(), + faction_id() + { + } + + BattlefieldParticipantBufferRow(const BattlefieldParticipantRow & rhs) : + region_object_id(rhs.region_object_id), + character_object_id(rhs.character_object_id), + faction_id(rhs.faction_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct BountyHunterTargetRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId target_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct BountyHunterTargetBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId target_id; + + BountyHunterTargetBufferRow() : + object_id(), + target_id() + { + } + + BountyHunterTargetBufferRow(const BountyHunterTargetRow & rhs) : + object_id(rhs.object_id), + target_id(rhs.target_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct BuildingObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong maintenance_cost; + DB::BindableDouble time_last_checked; + DB::BindableBool is_public; + DB::BindableLong city_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct BuildingObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong maintenance_cost; + DB::BindableDouble time_last_checked; + DB::BindableBool is_public; + DB::BindableLong city_id; + + BuildingObjectBufferRow() : + object_id(), + maintenance_cost(), + time_last_checked(), + is_public(), + city_id() + { + } + + BuildingObjectBufferRow(const BuildingObjectRow & rhs) : + object_id(rhs.object_id), + maintenance_cost(rhs.maintenance_cost), + time_last_checked(rhs.time_last_checked), + is_public(rhs.is_public), + city_id(rhs.city_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct CellObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong cell_number; + DB::BindableBool is_public; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct CellObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong cell_number; + DB::BindableBool is_public; + + CellObjectBufferRow() : + object_id(), + cell_number(), + is_public() + { + } + + CellObjectBufferRow(const CellObjectRow & rhs) : + object_id(rhs.object_id), + cell_number(rhs.cell_number), + is_public(rhs.is_public) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct CityObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct CityObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + CityObjectBufferRow() : + object_id() + { + } + + CityObjectBufferRow(const CityObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ClockRow : public DB::Row +{ + DB::BindableLong last_save_time; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ClockBufferRow : public DB::Row +{ + DB::BindableLong last_save_time; + + ClockBufferRow() : + last_save_time() + { + } + + ClockBufferRow(const ClockRow & rhs) : + last_save_time(rhs.last_save_time) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct CreatureObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble scale_factor; + DB::BindableInt64 states; + DB::BindableLong posture; + DB::BindableLong shock_wounds; + DB::BindableNetworkId master_id; + DB::BindableLong rank; + DB::BindableDouble base_walk_speed; + DB::BindableDouble base_run_speed; + DB::BindableLong attribute_0; + DB::BindableLong attribute_1; + DB::BindableLong attribute_2; + DB::BindableLong attribute_3; + DB::BindableLong attribute_4; + DB::BindableLong attribute_5; + DB::BindableLong attribute_6; + DB::BindableLong attribute_7; + DB::BindableLong attribute_8; + DB::BindableLong attribute_9; + DB::BindableLong attribute_10; + DB::BindableLong attribute_11; + DB::BindableLong attribute_12; + DB::BindableLong attribute_13; + DB::BindableLong attribute_14; + DB::BindableLong attribute_15; + DB::BindableLong attribute_16; + DB::BindableLong attribute_17; + DB::BindableLong attribute_18; + DB::BindableLong attribute_19; + DB::BindableLong attribute_20; + DB::BindableLong attribute_21; + DB::BindableLong attribute_22; + DB::BindableLong attribute_23; + DB::BindableLong attribute_24; + DB::BindableLong attribute_25; + DB::BindableLong attribute_26; + DB::BindableString<1000> persisted_buffs; + DB::BindableDouble ws_x; + DB::BindableDouble ws_y; + DB::BindableDouble ws_z; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct CreatureObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble scale_factor; + DB::BindableInt64 states; + DB::BindableLong posture; + DB::BindableLong shock_wounds; + DB::BindableNetworkId master_id; + DB::BindableLong rank; + DB::BindableDouble base_walk_speed; + DB::BindableDouble base_run_speed; + DB::BindableLong attribute_0; + DB::BindableLong attribute_1; + DB::BindableLong attribute_2; + DB::BindableLong attribute_3; + DB::BindableLong attribute_4; + DB::BindableLong attribute_5; + DB::BindableLong attribute_6; + DB::BindableLong attribute_7; + DB::BindableLong attribute_8; + DB::BindableLong attribute_9; + DB::BindableLong attribute_10; + DB::BindableLong attribute_11; + DB::BindableLong attribute_12; + DB::BindableLong attribute_13; + DB::BindableLong attribute_14; + DB::BindableLong attribute_15; + DB::BindableLong attribute_16; + DB::BindableLong attribute_17; + DB::BindableLong attribute_18; + DB::BindableLong attribute_19; + DB::BindableLong attribute_20; + DB::BindableLong attribute_21; + DB::BindableLong attribute_22; + DB::BindableLong attribute_23; + DB::BindableLong attribute_24; + DB::BindableLong attribute_25; + DB::BindableLong attribute_26; + DB::BufferString persisted_buffs; + DB::BindableDouble ws_x; + DB::BindableDouble ws_y; + DB::BindableDouble ws_z; + + CreatureObjectBufferRow() : + object_id(), + scale_factor(), + states(), + posture(), + shock_wounds(), + master_id(), + rank(), + base_walk_speed(), + base_run_speed(), + attribute_0(), + attribute_1(), + attribute_2(), + attribute_3(), + attribute_4(), + attribute_5(), + attribute_6(), + attribute_7(), + attribute_8(), + attribute_9(), + attribute_10(), + attribute_11(), + attribute_12(), + attribute_13(), + attribute_14(), + attribute_15(), + attribute_16(), + attribute_17(), + attribute_18(), + attribute_19(), + attribute_20(), + attribute_21(), + attribute_22(), + attribute_23(), + attribute_24(), + attribute_25(), + attribute_26(), + persisted_buffs(1000), + ws_x(), + ws_y(), + ws_z() + { + } + + CreatureObjectBufferRow(const CreatureObjectRow & rhs) : + object_id(rhs.object_id), + scale_factor(rhs.scale_factor), + states(rhs.states), + posture(rhs.posture), + shock_wounds(rhs.shock_wounds), + master_id(rhs.master_id), + rank(rhs.rank), + base_walk_speed(rhs.base_walk_speed), + base_run_speed(rhs.base_run_speed), + attribute_0(rhs.attribute_0), + attribute_1(rhs.attribute_1), + attribute_2(rhs.attribute_2), + attribute_3(rhs.attribute_3), + attribute_4(rhs.attribute_4), + attribute_5(rhs.attribute_5), + attribute_6(rhs.attribute_6), + attribute_7(rhs.attribute_7), + attribute_8(rhs.attribute_8), + attribute_9(rhs.attribute_9), + attribute_10(rhs.attribute_10), + attribute_11(rhs.attribute_11), + attribute_12(rhs.attribute_12), + attribute_13(rhs.attribute_13), + attribute_14(rhs.attribute_14), + attribute_15(rhs.attribute_15), + attribute_16(rhs.attribute_16), + attribute_17(rhs.attribute_17), + attribute_18(rhs.attribute_18), + attribute_19(rhs.attribute_19), + attribute_20(rhs.attribute_20), + attribute_21(rhs.attribute_21), + attribute_22(rhs.attribute_22), + attribute_23(rhs.attribute_23), + attribute_24(rhs.attribute_24), + attribute_25(rhs.attribute_25), + attribute_26(rhs.attribute_26), + persisted_buffs(rhs.persisted_buffs), + ws_x(rhs.ws_x), + ws_y(rhs.ws_y), + ws_z(rhs.ws_z) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ExperiencePointRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableString<500> experience_type; + DB::BindableLong points; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ExperiencePointBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BufferString experience_type; + DB::BindableLong points; + + ExperiencePointBufferRow() : + object_id(), + experience_type(500), + points() + { + } + + ExperiencePointBufferRow(const ExperiencePointRow & rhs) : + object_id(rhs.object_id), + experience_type(rhs.experience_type), + points(rhs.points) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct FactoryObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct FactoryObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + FactoryObjectBufferRow() : + object_id() + { + } + + FactoryObjectBufferRow(const FactoryObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct FreeObjectIdRow : public DB::Row +{ + DB::BindableLong start_id; + DB::BindableLong end_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct FreeObjectIdBufferRow : public DB::Row +{ + DB::BindableLong start_id; + DB::BindableLong end_id; + + FreeObjectIdBufferRow() : + start_id(), + end_id() + { + } + + FreeObjectIdBufferRow(const FreeObjectIdRow & rhs) : + start_id(rhs.start_id), + end_id(rhs.end_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct GuildObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct GuildObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + GuildObjectBufferRow() : + object_id() + { + } + + GuildObjectBufferRow(const GuildObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct HarvesterInstallationObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble installed_efficiency; + DB::BindableLong max_extraction_rate; + DB::BindableDouble current_extraction_rate; + DB::BindableLong max_hopper_amount; + DB::BindableNetworkId hopper_resource; + DB::BindableDouble hopper_amount; + DB::BindableNetworkId resource_type; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct HarvesterInstallationObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble installed_efficiency; + DB::BindableLong max_extraction_rate; + DB::BindableDouble current_extraction_rate; + DB::BindableLong max_hopper_amount; + DB::BindableNetworkId hopper_resource; + DB::BindableDouble hopper_amount; + DB::BindableNetworkId resource_type; + + HarvesterInstallationObjectBufferRow() : + object_id(), + installed_efficiency(), + max_extraction_rate(), + current_extraction_rate(), + max_hopper_amount(), + hopper_resource(), + hopper_amount(), + resource_type() + { + } + + HarvesterInstallationObjectBufferRow(const HarvesterInstallationObjectRow & rhs) : + object_id(rhs.object_id), + installed_efficiency(rhs.installed_efficiency), + max_extraction_rate(rhs.max_extraction_rate), + current_extraction_rate(rhs.current_extraction_rate), + max_hopper_amount(rhs.max_hopper_amount), + hopper_resource(rhs.hopper_resource), + hopper_amount(rhs.hopper_amount), + resource_type(rhs.resource_type) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct InstallationObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong installation_type; + DB::BindableBool activated; + DB::BindableDouble tick_count; + DB::BindableDouble activate_start_time; + DB::BindableDouble power; + DB::BindableDouble power_rate; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct InstallationObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong installation_type; + DB::BindableBool activated; + DB::BindableDouble tick_count; + DB::BindableDouble activate_start_time; + DB::BindableDouble power; + DB::BindableDouble power_rate; + + InstallationObjectBufferRow() : + object_id(), + installation_type(), + activated(), + tick_count(), + activate_start_time(), + power(), + power_rate() + { + } + + InstallationObjectBufferRow(const InstallationObjectRow & rhs) : + object_id(rhs.object_id), + installation_type(rhs.installation_type), + activated(rhs.activated), + tick_count(rhs.tick_count), + activate_start_time(rhs.activate_start_time), + power(rhs.power), + power_rate(rhs.power_rate) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct IntangibleObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong count; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct IntangibleObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong count; + + IntangibleObjectBufferRow() : + object_id(), + count() + { + } + + IntangibleObjectBufferRow(const IntangibleObjectRow & rhs) : + object_id(rhs.object_id), + count(rhs.count) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct LoadbeaconServerMapRow : public DB::Row +{ + DB::BindableString<255> object_template; + DB::BindableLong server_id; + DB::BindableLong secondary_server_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct LoadbeaconServerMapBufferRow : public DB::Row +{ + DB::BufferString object_template; + DB::BindableLong server_id; + DB::BindableLong secondary_server_id; + + LoadbeaconServerMapBufferRow() : + object_template(255), + server_id(), + secondary_server_id() + { + } + + LoadbeaconServerMapBufferRow(const LoadbeaconServerMapRow & rhs) : + object_template(rhs.object_template), + server_id(rhs.server_id), + secondary_server_id(rhs.secondary_server_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ManufactureInstallationObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ManufactureInstallationObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + ManufactureInstallationObjectBufferRow() : + object_id() + { + } + + ManufactureInstallationObjectBufferRow(const ManufactureInstallationObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ManufactureSchematicObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId creator_id; + DB::BindableString<127> creator_name; + DB::BindableLong items_per_container; + DB::BindableDouble manufacture_time; + DB::BindableLong draft_schematic; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ManufactureSchematicObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId creator_id; + DB::BufferString creator_name; + DB::BindableLong items_per_container; + DB::BindableDouble manufacture_time; + DB::BindableLong draft_schematic; + + ManufactureSchematicObjectBufferRow() : + object_id(), + creator_id(), + creator_name(127), + items_per_container(), + manufacture_time(), + draft_schematic() + { + } + + ManufactureSchematicObjectBufferRow(const ManufactureSchematicObjectRow & rhs) : + object_id(rhs.object_id), + creator_id(rhs.creator_id), + creator_name(rhs.creator_name), + items_per_container(rhs.items_per_container), + manufacture_time(rhs.manufacture_time), + draft_schematic(rhs.draft_schematic) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct MessageRow : public DB::Row +{ + DB::BindableNetworkId message_id; + DB::BindableNetworkId target; + DB::BindableString<50> method; + DB::BindableString<4000> data; + DB::BindableLong call_time; + DB::BindableBool guaranteed; + DB::BindableLong delivery_type; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + message_id.setValue(keyValue); + } +}; + +struct MessageBufferRow : public DB::Row +{ + DB::BindableNetworkId message_id; + DB::BindableNetworkId target; + DB::BufferString method; + DB::BufferString data; + DB::BindableLong call_time; + DB::BindableBool guaranteed; + DB::BindableLong delivery_type; + + MessageBufferRow() : + message_id(), + target(), + method(50), + data(4000), + call_time(), + guaranteed(), + delivery_type() + { + } + + MessageBufferRow(const MessageRow & rhs) : + message_id(rhs.message_id), + target(rhs.target), + method(rhs.method), + data(rhs.data), + call_time(rhs.call_time), + guaranteed(rhs.guaranteed), + delivery_type(rhs.delivery_type) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + message_id.setValue(keyValue); + } +}; + +struct MissionObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong difficulty; + DB::BindableDouble end_x; + DB::BindableDouble end_y; + DB::BindableDouble end_z; + DB::BindableNetworkId end_cell; + DB::BindableLong end_scene; + DB::BindableString<127> mission_creator; + DB::BindableLong reward; + DB::BindableString<100> root_script_name; + DB::BindableDouble start_x; + DB::BindableDouble start_y; + DB::BindableDouble start_z; + DB::BindableNetworkId start_cell; + DB::BindableLong start_scene; + DB::BindableString<100> description_table; + DB::BindableString<100> description_text; + DB::BindableString<100> title_table; + DB::BindableString<100> title_text; + DB::BindableNetworkId mission_holder_id; + DB::BindableLong status; + DB::BindableLong mission_type; + DB::BindableLong target_appearance; + DB::BindableString<127> target_name; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct MissionObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong difficulty; + DB::BindableDouble end_x; + DB::BindableDouble end_y; + DB::BindableDouble end_z; + DB::BindableNetworkId end_cell; + DB::BindableLong end_scene; + DB::BufferString mission_creator; + DB::BindableLong reward; + DB::BufferString root_script_name; + DB::BindableDouble start_x; + DB::BindableDouble start_y; + DB::BindableDouble start_z; + DB::BindableNetworkId start_cell; + DB::BindableLong start_scene; + DB::BufferString description_table; + DB::BufferString description_text; + DB::BufferString title_table; + DB::BufferString title_text; + DB::BindableNetworkId mission_holder_id; + DB::BindableLong status; + DB::BindableLong mission_type; + DB::BindableLong target_appearance; + DB::BufferString target_name; + + MissionObjectBufferRow() : + object_id(), + difficulty(), + end_x(), + end_y(), + end_z(), + end_cell(), + end_scene(), + mission_creator(127), + reward(), + root_script_name(100), + start_x(), + start_y(), + start_z(), + start_cell(), + start_scene(), + description_table(100), + description_text(100), + title_table(100), + title_text(100), + mission_holder_id(), + status(), + mission_type(), + target_appearance(), + target_name(127) + { + } + + MissionObjectBufferRow(const MissionObjectRow & rhs) : + object_id(rhs.object_id), + difficulty(rhs.difficulty), + end_x(rhs.end_x), + end_y(rhs.end_y), + end_z(rhs.end_z), + end_cell(rhs.end_cell), + end_scene(rhs.end_scene), + mission_creator(rhs.mission_creator), + reward(rhs.reward), + root_script_name(rhs.root_script_name), + start_x(rhs.start_x), + start_y(rhs.start_y), + start_z(rhs.start_z), + start_cell(rhs.start_cell), + start_scene(rhs.start_scene), + description_table(rhs.description_table), + description_text(rhs.description_text), + title_table(rhs.title_table), + title_text(rhs.title_text), + mission_holder_id(rhs.mission_holder_id), + status(rhs.status), + mission_type(rhs.mission_type), + target_appearance(rhs.target_appearance), + target_name(rhs.target_name) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble x; + DB::BindableDouble y; + DB::BindableDouble z; + DB::BindableDouble quaternion_w; + DB::BindableDouble quaternion_x; + DB::BindableDouble quaternion_y; + DB::BindableDouble quaternion_z; + DB::BindableLong node_x; + DB::BindableLong node_y; + DB::BindableLong node_z; + DB::BindableLong type_id; + DB::BindableString<50> scene_id; + DB::BindableLong controller_type; + DB::BindableLong deleted; + DB::BindableString<127> object_name; + DB::BindableLong volume; + DB::BindableNetworkId contained_by; + DB::BindableLong slot_arrangement; + DB::BindableBool player_controlled; + DB::BindableLong cache_version; + DB::BindableBool load_contents; + DB::BindableLong cash_balance; + DB::BindableLong bank_balance; + DB::BindableDouble complexity; + DB::BindableString<500> name_string_table; + DB::BindableString<500> name_string_text; + DB::BindableLong object_template_id; + DB::BindableString<128> static_item_name; + DB::BindableLong static_item_version; + DB::BindableLong conversion_id; + DB::BindableNetworkId load_with; + DB::BindableString<50> objvar_0_name; + DB::BindableLong objvar_0_type; + DB::BindableString<50> objvar_0_value; + DB::BindableString<50> objvar_1_name; + DB::BindableLong objvar_1_type; + DB::BindableString<50> objvar_1_value; + DB::BindableString<50> objvar_2_name; + DB::BindableLong objvar_2_type; + DB::BindableString<50> objvar_2_value; + DB::BindableString<50> objvar_3_name; + DB::BindableLong objvar_3_type; + DB::BindableString<50> objvar_3_value; + DB::BindableString<50> objvar_4_name; + DB::BindableLong objvar_4_type; + DB::BindableString<50> objvar_4_value; + DB::BindableString<50> objvar_5_name; + DB::BindableLong objvar_5_type; + DB::BindableString<50> objvar_5_value; + DB::BindableString<50> objvar_6_name; + DB::BindableLong objvar_6_type; + DB::BindableString<50> objvar_6_value; + DB::BindableString<50> objvar_7_name; + DB::BindableLong objvar_7_type; + DB::BindableString<50> objvar_7_value; + DB::BindableString<50> objvar_8_name; + DB::BindableLong objvar_8_type; + DB::BindableString<50> objvar_8_value; + DB::BindableString<50> objvar_9_name; + DB::BindableLong objvar_9_type; + DB::BindableString<50> objvar_9_value; + DB::BindableString<50> objvar_10_name; + DB::BindableLong objvar_10_type; + DB::BindableString<50> objvar_10_value; + DB::BindableString<50> objvar_11_name; + DB::BindableLong objvar_11_type; + DB::BindableString<50> objvar_11_value; + DB::BindableString<50> objvar_12_name; + DB::BindableLong objvar_12_type; + DB::BindableString<50> objvar_12_value; + DB::BindableString<50> objvar_13_name; + DB::BindableLong objvar_13_type; + DB::BindableString<50> objvar_13_value; + DB::BindableString<50> objvar_14_name; + DB::BindableLong objvar_14_type; + DB::BindableString<50> objvar_14_value; + DB::BindableString<50> objvar_15_name; + DB::BindableLong objvar_15_type; + DB::BindableString<50> objvar_15_value; + DB::BindableString<50> objvar_16_name; + DB::BindableLong objvar_16_type; + DB::BindableString<50> objvar_16_value; + DB::BindableString<50> objvar_17_name; + DB::BindableLong objvar_17_type; + DB::BindableString<50> objvar_17_value; + DB::BindableString<50> objvar_18_name; + DB::BindableLong objvar_18_type; + DB::BindableString<50> objvar_18_value; + DB::BindableString<50> objvar_19_name; + DB::BindableLong objvar_19_type; + DB::BindableString<50> objvar_19_value; + DB::BindableString<2000> script_list; + + DB::BindableLong container_level; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble x; + DB::BindableDouble y; + DB::BindableDouble z; + DB::BindableDouble quaternion_w; + DB::BindableDouble quaternion_x; + DB::BindableDouble quaternion_y; + DB::BindableDouble quaternion_z; + DB::BindableLong node_x; + DB::BindableLong node_y; + DB::BindableLong node_z; + DB::BindableLong type_id; + DB::BufferString scene_id; + DB::BindableLong controller_type; + DB::BindableLong deleted; + DB::BufferString object_name; + DB::BindableLong volume; + DB::BindableNetworkId contained_by; + DB::BindableLong slot_arrangement; + DB::BindableBool player_controlled; + DB::BindableLong cache_version; + DB::BindableBool load_contents; + DB::BindableLong cash_balance; + DB::BindableLong bank_balance; + DB::BindableDouble complexity; + DB::BufferString name_string_table; + DB::BufferString name_string_text; + DB::BindableLong object_template_id; + DB::BufferString static_item_name; + DB::BindableLong static_item_version; + DB::BindableLong conversion_id; + DB::BindableNetworkId load_with; + DB::BufferString objvar_0_name; + DB::BindableLong objvar_0_type; + DB::BufferString objvar_0_value; + DB::BufferString objvar_1_name; + DB::BindableLong objvar_1_type; + DB::BufferString objvar_1_value; + DB::BufferString objvar_2_name; + DB::BindableLong objvar_2_type; + DB::BufferString objvar_2_value; + DB::BufferString objvar_3_name; + DB::BindableLong objvar_3_type; + DB::BufferString objvar_3_value; + DB::BufferString objvar_4_name; + DB::BindableLong objvar_4_type; + DB::BufferString objvar_4_value; + DB::BufferString objvar_5_name; + DB::BindableLong objvar_5_type; + DB::BufferString objvar_5_value; + DB::BufferString objvar_6_name; + DB::BindableLong objvar_6_type; + DB::BufferString objvar_6_value; + DB::BufferString objvar_7_name; + DB::BindableLong objvar_7_type; + DB::BufferString objvar_7_value; + DB::BufferString objvar_8_name; + DB::BindableLong objvar_8_type; + DB::BufferString objvar_8_value; + DB::BufferString objvar_9_name; + DB::BindableLong objvar_9_type; + DB::BufferString objvar_9_value; + DB::BufferString objvar_10_name; + DB::BindableLong objvar_10_type; + DB::BufferString objvar_10_value; + DB::BufferString objvar_11_name; + DB::BindableLong objvar_11_type; + DB::BufferString objvar_11_value; + DB::BufferString objvar_12_name; + DB::BindableLong objvar_12_type; + DB::BufferString objvar_12_value; + DB::BufferString objvar_13_name; + DB::BindableLong objvar_13_type; + DB::BufferString objvar_13_value; + DB::BufferString objvar_14_name; + DB::BindableLong objvar_14_type; + DB::BufferString objvar_14_value; + DB::BufferString objvar_15_name; + DB::BindableLong objvar_15_type; + DB::BufferString objvar_15_value; + DB::BufferString objvar_16_name; + DB::BindableLong objvar_16_type; + DB::BufferString objvar_16_value; + DB::BufferString objvar_17_name; + DB::BindableLong objvar_17_type; + DB::BufferString objvar_17_value; + DB::BufferString objvar_18_name; + DB::BindableLong objvar_18_type; + DB::BufferString objvar_18_value; + DB::BufferString objvar_19_name; + DB::BindableLong objvar_19_type; + DB::BufferString objvar_19_value; + DB::BufferString script_list; + + ObjectBufferRow() : + object_id(), + x(), + y(), + z(), + quaternion_w(), + quaternion_x(), + quaternion_y(), + quaternion_z(), + node_x(), + node_y(), + node_z(), + type_id(), + scene_id(50), + controller_type(), + deleted(), + object_name(127), + volume(), + contained_by(), + slot_arrangement(), + player_controlled(), + cache_version(), + load_contents(), + cash_balance(), + bank_balance(), + complexity(), + name_string_table(500), + name_string_text(500), + object_template_id(), + static_item_name(128), + static_item_version(), + conversion_id(), + load_with(), + objvar_0_name(50), + objvar_0_type(), + objvar_0_value(50), + objvar_1_name(50), + objvar_1_type(), + objvar_1_value(50), + objvar_2_name(50), + objvar_2_type(), + objvar_2_value(50), + objvar_3_name(50), + objvar_3_type(), + objvar_3_value(50), + objvar_4_name(50), + objvar_4_type(), + objvar_4_value(50), + objvar_5_name(50), + objvar_5_type(), + objvar_5_value(50), + objvar_6_name(50), + objvar_6_type(), + objvar_6_value(50), + objvar_7_name(50), + objvar_7_type(), + objvar_7_value(50), + objvar_8_name(50), + objvar_8_type(), + objvar_8_value(50), + objvar_9_name(50), + objvar_9_type(), + objvar_9_value(50), + objvar_10_name(50), + objvar_10_type(), + objvar_10_value(50), + objvar_11_name(50), + objvar_11_type(), + objvar_11_value(50), + objvar_12_name(50), + objvar_12_type(), + objvar_12_value(50), + objvar_13_name(50), + objvar_13_type(), + objvar_13_value(50), + objvar_14_name(50), + objvar_14_type(), + objvar_14_value(50), + objvar_15_name(50), + objvar_15_type(), + objvar_15_value(50), + objvar_16_name(50), + objvar_16_type(), + objvar_16_value(50), + objvar_17_name(50), + objvar_17_type(), + objvar_17_value(50), + objvar_18_name(50), + objvar_18_type(), + objvar_18_value(50), + objvar_19_name(50), + objvar_19_type(), + objvar_19_value(50), + script_list(2000) + { + } + + ObjectBufferRow(const ObjectRow & rhs) : + object_id(rhs.object_id), + x(rhs.x), + y(rhs.y), + z(rhs.z), + quaternion_w(rhs.quaternion_w), + quaternion_x(rhs.quaternion_x), + quaternion_y(rhs.quaternion_y), + quaternion_z(rhs.quaternion_z), + node_x(rhs.node_x), + node_y(rhs.node_y), + node_z(rhs.node_z), + type_id(rhs.type_id), + scene_id(rhs.scene_id), + controller_type(rhs.controller_type), + deleted(rhs.deleted), + object_name(rhs.object_name), + volume(rhs.volume), + contained_by(rhs.contained_by), + slot_arrangement(rhs.slot_arrangement), + player_controlled(rhs.player_controlled), + cache_version(rhs.cache_version), + load_contents(rhs.load_contents), + cash_balance(rhs.cash_balance), + bank_balance(rhs.bank_balance), + complexity(rhs.complexity), + name_string_table(rhs.name_string_table), + name_string_text(rhs.name_string_text), + object_template_id(rhs.object_template_id), + static_item_name(rhs.static_item_name), + static_item_version(rhs.static_item_version), + conversion_id(rhs.conversion_id), + load_with(rhs.load_with), + objvar_0_name(rhs.objvar_0_name), + objvar_0_type(rhs.objvar_0_type), + objvar_0_value(rhs.objvar_0_value), + objvar_1_name(rhs.objvar_1_name), + objvar_1_type(rhs.objvar_1_type), + objvar_1_value(rhs.objvar_1_value), + objvar_2_name(rhs.objvar_2_name), + objvar_2_type(rhs.objvar_2_type), + objvar_2_value(rhs.objvar_2_value), + objvar_3_name(rhs.objvar_3_name), + objvar_3_type(rhs.objvar_3_type), + objvar_3_value(rhs.objvar_3_value), + objvar_4_name(rhs.objvar_4_name), + objvar_4_type(rhs.objvar_4_type), + objvar_4_value(rhs.objvar_4_value), + objvar_5_name(rhs.objvar_5_name), + objvar_5_type(rhs.objvar_5_type), + objvar_5_value(rhs.objvar_5_value), + objvar_6_name(rhs.objvar_6_name), + objvar_6_type(rhs.objvar_6_type), + objvar_6_value(rhs.objvar_6_value), + objvar_7_name(rhs.objvar_7_name), + objvar_7_type(rhs.objvar_7_type), + objvar_7_value(rhs.objvar_7_value), + objvar_8_name(rhs.objvar_8_name), + objvar_8_type(rhs.objvar_8_type), + objvar_8_value(rhs.objvar_8_value), + objvar_9_name(rhs.objvar_9_name), + objvar_9_type(rhs.objvar_9_type), + objvar_9_value(rhs.objvar_9_value), + objvar_10_name(rhs.objvar_10_name), + objvar_10_type(rhs.objvar_10_type), + objvar_10_value(rhs.objvar_10_value), + objvar_11_name(rhs.objvar_11_name), + objvar_11_type(rhs.objvar_11_type), + objvar_11_value(rhs.objvar_11_value), + objvar_12_name(rhs.objvar_12_name), + objvar_12_type(rhs.objvar_12_type), + objvar_12_value(rhs.objvar_12_value), + objvar_13_name(rhs.objvar_13_name), + objvar_13_type(rhs.objvar_13_type), + objvar_13_value(rhs.objvar_13_value), + objvar_14_name(rhs.objvar_14_name), + objvar_14_type(rhs.objvar_14_type), + objvar_14_value(rhs.objvar_14_value), + objvar_15_name(rhs.objvar_15_name), + objvar_15_type(rhs.objvar_15_type), + objvar_15_value(rhs.objvar_15_value), + objvar_16_name(rhs.objvar_16_name), + objvar_16_type(rhs.objvar_16_type), + objvar_16_value(rhs.objvar_16_value), + objvar_17_name(rhs.objvar_17_name), + objvar_17_type(rhs.objvar_17_type), + objvar_17_value(rhs.objvar_17_value), + objvar_18_name(rhs.objvar_18_name), + objvar_18_type(rhs.objvar_18_type), + objvar_18_value(rhs.objvar_18_value), + objvar_19_name(rhs.objvar_19_name), + objvar_19_type(rhs.objvar_19_type), + objvar_19_value(rhs.objvar_19_value), + script_list(rhs.script_list) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct PlanetObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableString<100> planet_name; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct PlanetObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BufferString planet_name; + + PlanetObjectBufferRow() : + object_id(), + planet_name(100) + { + } + + PlanetObjectBufferRow(const PlanetObjectRow & rhs) : + object_id(rhs.object_id), + planet_name(rhs.planet_name) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct PlayerQuestObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableString<256> title; + DB::BindableString<4000> description; + DB::BindableNetworkId creator; + DB::BindableLong total_tasks; + DB::BindableLong difficulty; + DB::BindableString<128> task_title1; + DB::BindableString<4000> task_description1; + DB::BindableString<128> task_title2; + DB::BindableString<4000> task_description2; + DB::BindableString<128> task_title3; + DB::BindableString<4000> task_description3; + DB::BindableString<128> task_title4; + DB::BindableString<4000> task_description4; + DB::BindableString<128> task_title5; + DB::BindableString<4000> task_description5; + DB::BindableString<128> task_title6; + DB::BindableString<4000> task_description6; + DB::BindableString<128> task_title7; + DB::BindableString<4000> task_description7; + DB::BindableString<128> task_title8; + DB::BindableString<4000> task_description8; + DB::BindableString<128> task_title9; + DB::BindableString<4000> task_description9; + DB::BindableString<128> task_title10; + DB::BindableString<4000> task_description10; + DB::BindableString<128> task_title11; + DB::BindableString<4000> task_description11; + DB::BindableString<128> task_title12; + DB::BindableString<4000> task_description12; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct PlayerQuestObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BufferString title; + DB::BufferString description; + DB::BindableNetworkId creator; + DB::BindableLong total_tasks; + DB::BindableLong difficulty; + DB::BufferString task_title1; + DB::BufferString task_description1; + DB::BufferString task_title2; + DB::BufferString task_description2; + DB::BufferString task_title3; + DB::BufferString task_description3; + DB::BufferString task_title4; + DB::BufferString task_description4; + DB::BufferString task_title5; + DB::BufferString task_description5; + DB::BufferString task_title6; + DB::BufferString task_description6; + DB::BufferString task_title7; + DB::BufferString task_description7; + DB::BufferString task_title8; + DB::BufferString task_description8; + DB::BufferString task_title9; + DB::BufferString task_description9; + DB::BufferString task_title10; + DB::BufferString task_description10; + DB::BufferString task_title11; + DB::BufferString task_description11; + DB::BufferString task_title12; + DB::BufferString task_description12; + + PlayerQuestObjectBufferRow() : + object_id(), + title(256), + description(4000), + creator(), + total_tasks(), + difficulty(), + task_title1(128), + task_description1(4000), + task_title2(128), + task_description2(4000), + task_title3(128), + task_description3(4000), + task_title4(128), + task_description4(4000), + task_title5(128), + task_description5(4000), + task_title6(128), + task_description6(4000), + task_title7(128), + task_description7(4000), + task_title8(128), + task_description8(4000), + task_title9(128), + task_description9(4000), + task_title10(128), + task_description10(4000), + task_title11(128), + task_description11(4000), + task_title12(128), + task_description12(4000) + { + } + + PlayerQuestObjectBufferRow(const PlayerQuestObjectRow & rhs) : + object_id(rhs.object_id), + title(rhs.title), + description(rhs.description), + creator(rhs.creator), + total_tasks(rhs.total_tasks), + difficulty(rhs.difficulty), + task_title1(rhs.task_title1), + task_description1(rhs.task_description1), + task_title2(rhs.task_title2), + task_description2(rhs.task_description2), + task_title3(rhs.task_title3), + task_description3(rhs.task_description3), + task_title4(rhs.task_title4), + task_description4(rhs.task_description4), + task_title5(rhs.task_title5), + task_description5(rhs.task_description5), + task_title6(rhs.task_title6), + task_description6(rhs.task_description6), + task_title7(rhs.task_title7), + task_description7(rhs.task_description7), + task_title8(rhs.task_title8), + task_description8(rhs.task_description8), + task_title9(rhs.task_title9), + task_description9(rhs.task_description9), + task_title10(rhs.task_title10), + task_description10(rhs.task_description10), + task_title11(rhs.task_title11), + task_description11(rhs.task_description11), + task_title12(rhs.task_title12), + task_description12(rhs.task_description12) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct PropertyListRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong list_id; + DB::BindableString<500> value; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct PropertyListBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong list_id; + DB::BufferString value; + + PropertyListBufferRow() : + object_id(), + list_id(), + value(500) + { + } + + PropertyListBufferRow(const PropertyListRow & rhs) : + object_id(rhs.object_id), + list_id(rhs.list_id), + value(rhs.value) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ResourceContainerObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId resource_type; + DB::BindableLong quantity; + DB::BindableNetworkId source; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ResourceContainerObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId resource_type; + DB::BindableLong quantity; + DB::BindableNetworkId source; + + ResourceContainerObjectBufferRow() : + object_id(), + resource_type(), + quantity(), + source() + { + } + + ResourceContainerObjectBufferRow(const ResourceContainerObjectRow & rhs) : + object_id(rhs.object_id), + resource_type(rhs.resource_type), + quantity(rhs.quantity), + source(rhs.source) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ResourceTypeRow : public DB::Row +{ + DB::BindableNetworkId resource_id; + DB::BindableString<100> resource_name; + DB::BindableString<100> resource_class; + DB::BindableString<1024> attributes; + DB::BindableString<1024> fractal_seeds; + DB::BindableLong depleted_timestamp; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ResourceTypeBufferRow : public DB::Row +{ + DB::BindableNetworkId resource_id; + DB::BufferString resource_name; + DB::BufferString resource_class; + DB::BufferString attributes; + DB::BufferString fractal_seeds; + DB::BindableLong depleted_timestamp; + + ResourceTypeBufferRow() : + resource_id(), + resource_name(100), + resource_class(100), + attributes(1024), + fractal_seeds(1024), + depleted_timestamp() + { + } + + ResourceTypeBufferRow(const ResourceTypeRow & rhs) : + resource_id(rhs.resource_id), + resource_name(rhs.resource_name), + resource_class(rhs.resource_class), + attributes(rhs.attributes), + fractal_seeds(rhs.fractal_seeds), + depleted_timestamp(rhs.depleted_timestamp) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ScriptRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong sequence_no; + DB::BindableString<100> script; + DB::BindableLong detached; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ScriptBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong sequence_no; + DB::BufferString script; + DB::BindableLong detached; + + ScriptBufferRow() : + object_id(), + sequence_no(), + script(100), + detached() + { + } + + ScriptBufferRow(const ScriptRow & rhs) : + object_id(rhs.object_id), + sequence_no(rhs.sequence_no), + script(rhs.script), + detached(rhs.detached) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } +}; + +struct ShipObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble slide_dampener; + DB::BindableDouble current_chassis_hit_points; + DB::BindableDouble maximum_chassis_hit_points; + DB::BindableLong chassis_type; + DB::BindableString<400> cmp_armor_hp_maximum; + DB::BindableString<400> cmp_armor_hp_current; + DB::BindableString<400> cmp_efficiency_general; + DB::BindableString<400> cmp_efficiency_eng; + DB::BindableString<400> cmp_eng_maintenance; + DB::BindableString<400> cmp_mass; + DB::BindableString<500> cmp_crc; + DB::BindableString<400> cmp_hp_current; + DB::BindableString<400> cmp_hp_maximum; + DB::BindableString<400> cmp_flags; + DB::BindableString<4000> cmp_names; + DB::BindableString<400> weapon_damage_maximum; + DB::BindableString<400> weapon_damage_minimum; + DB::BindableString<400> weapon_effectiveness_shields; + DB::BindableString<400> weapon_effectiveness_armor; + DB::BindableString<400> weapon_eng_per_shot; + DB::BindableString<400> weapon_refire_rate; + DB::BindableString<400> weapon_ammo_current; + DB::BindableString<400> weapon_ammo_maximum; + DB::BindableString<400> weapon_ammo_type; + DB::BindableDouble shield_hp_front_maximum; + DB::BindableDouble shield_hp_back_maximum; + DB::BindableDouble shield_recharge_rate; + DB::BindableDouble capacitor_eng_maximum; + DB::BindableDouble capacitor_eng_recharge_rate; + DB::BindableDouble engine_acc_rate; + DB::BindableDouble engine_deceleration_rate; + DB::BindableDouble engine_pitch_acc_rate; + DB::BindableDouble engine_yaw_acc_rate; + DB::BindableDouble engine_roll_acc_rate; + DB::BindableDouble engine_pitch_rate_maximum; + DB::BindableDouble engine_yaw_rate_maximum; + DB::BindableDouble engine_roll_rate_maximum; + DB::BindableDouble engine_speed_maximum; + DB::BindableDouble reactor_eng_generation_rate; + DB::BindableDouble booster_eng_maximum; + DB::BindableDouble booster_eng_recharge_rate; + DB::BindableDouble booster_eng_consumption_rate; + DB::BindableDouble booster_acc; + DB::BindableDouble booster_speed_maximum; + DB::BindableDouble droid_if_cmd_speed; + DB::BindableNetworkId installed_dcd; + DB::BindableDouble chassis_cmp_mass_maximum; + DB::BindableString<400> cmp_creators; + DB::BindableLong cargo_hold_contents_maximum; + DB::BindableLong cargo_hold_contents_current; + DB::BindableString<500> cargo_hold_contents; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct ShipObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableDouble slide_dampener; + DB::BindableDouble current_chassis_hit_points; + DB::BindableDouble maximum_chassis_hit_points; + DB::BindableLong chassis_type; + DB::BufferString cmp_armor_hp_maximum; + DB::BufferString cmp_armor_hp_current; + DB::BufferString cmp_efficiency_general; + DB::BufferString cmp_efficiency_eng; + DB::BufferString cmp_eng_maintenance; + DB::BufferString cmp_mass; + DB::BufferString cmp_crc; + DB::BufferString cmp_hp_current; + DB::BufferString cmp_hp_maximum; + DB::BufferString cmp_flags; + DB::BufferString cmp_names; + DB::BufferString weapon_damage_maximum; + DB::BufferString weapon_damage_minimum; + DB::BufferString weapon_effectiveness_shields; + DB::BufferString weapon_effectiveness_armor; + DB::BufferString weapon_eng_per_shot; + DB::BufferString weapon_refire_rate; + DB::BufferString weapon_ammo_current; + DB::BufferString weapon_ammo_maximum; + DB::BufferString weapon_ammo_type; + DB::BindableDouble shield_hp_front_maximum; + DB::BindableDouble shield_hp_back_maximum; + DB::BindableDouble shield_recharge_rate; + DB::BindableDouble capacitor_eng_maximum; + DB::BindableDouble capacitor_eng_recharge_rate; + DB::BindableDouble engine_acc_rate; + DB::BindableDouble engine_deceleration_rate; + DB::BindableDouble engine_pitch_acc_rate; + DB::BindableDouble engine_yaw_acc_rate; + DB::BindableDouble engine_roll_acc_rate; + DB::BindableDouble engine_pitch_rate_maximum; + DB::BindableDouble engine_yaw_rate_maximum; + DB::BindableDouble engine_roll_rate_maximum; + DB::BindableDouble engine_speed_maximum; + DB::BindableDouble reactor_eng_generation_rate; + DB::BindableDouble booster_eng_maximum; + DB::BindableDouble booster_eng_recharge_rate; + DB::BindableDouble booster_eng_consumption_rate; + DB::BindableDouble booster_acc; + DB::BindableDouble booster_speed_maximum; + DB::BindableDouble droid_if_cmd_speed; + DB::BindableNetworkId installed_dcd; + DB::BindableDouble chassis_cmp_mass_maximum; + DB::BufferString cmp_creators; + DB::BindableLong cargo_hold_contents_maximum; + DB::BindableLong cargo_hold_contents_current; + DB::BufferString cargo_hold_contents; + + ShipObjectBufferRow() : + object_id(), + slide_dampener(), + current_chassis_hit_points(), + maximum_chassis_hit_points(), + chassis_type(), + cmp_armor_hp_maximum(400), + cmp_armor_hp_current(400), + cmp_efficiency_general(400), + cmp_efficiency_eng(400), + cmp_eng_maintenance(400), + cmp_mass(400), + cmp_crc(500), + cmp_hp_current(400), + cmp_hp_maximum(400), + cmp_flags(400), + cmp_names(4000), + weapon_damage_maximum(400), + weapon_damage_minimum(400), + weapon_effectiveness_shields(400), + weapon_effectiveness_armor(400), + weapon_eng_per_shot(400), + weapon_refire_rate(400), + weapon_ammo_current(400), + weapon_ammo_maximum(400), + weapon_ammo_type(400), + shield_hp_front_maximum(), + shield_hp_back_maximum(), + shield_recharge_rate(), + capacitor_eng_maximum(), + capacitor_eng_recharge_rate(), + engine_acc_rate(), + engine_deceleration_rate(), + engine_pitch_acc_rate(), + engine_yaw_acc_rate(), + engine_roll_acc_rate(), + engine_pitch_rate_maximum(), + engine_yaw_rate_maximum(), + engine_roll_rate_maximum(), + engine_speed_maximum(), + reactor_eng_generation_rate(), + booster_eng_maximum(), + booster_eng_recharge_rate(), + booster_eng_consumption_rate(), + booster_acc(), + booster_speed_maximum(), + droid_if_cmd_speed(), + installed_dcd(), + chassis_cmp_mass_maximum(), + cmp_creators(400), + cargo_hold_contents_maximum(), + cargo_hold_contents_current(), + cargo_hold_contents(500) + { + } + + ShipObjectBufferRow(const ShipObjectRow & rhs) : + object_id(rhs.object_id), + slide_dampener(rhs.slide_dampener), + current_chassis_hit_points(rhs.current_chassis_hit_points), + maximum_chassis_hit_points(rhs.maximum_chassis_hit_points), + chassis_type(rhs.chassis_type), + cmp_armor_hp_maximum(rhs.cmp_armor_hp_maximum), + cmp_armor_hp_current(rhs.cmp_armor_hp_current), + cmp_efficiency_general(rhs.cmp_efficiency_general), + cmp_efficiency_eng(rhs.cmp_efficiency_eng), + cmp_eng_maintenance(rhs.cmp_eng_maintenance), + cmp_mass(rhs.cmp_mass), + cmp_crc(rhs.cmp_crc), + cmp_hp_current(rhs.cmp_hp_current), + cmp_hp_maximum(rhs.cmp_hp_maximum), + cmp_flags(rhs.cmp_flags), + cmp_names(rhs.cmp_names), + weapon_damage_maximum(rhs.weapon_damage_maximum), + weapon_damage_minimum(rhs.weapon_damage_minimum), + weapon_effectiveness_shields(rhs.weapon_effectiveness_shields), + weapon_effectiveness_armor(rhs.weapon_effectiveness_armor), + weapon_eng_per_shot(rhs.weapon_eng_per_shot), + weapon_refire_rate(rhs.weapon_refire_rate), + weapon_ammo_current(rhs.weapon_ammo_current), + weapon_ammo_maximum(rhs.weapon_ammo_maximum), + weapon_ammo_type(rhs.weapon_ammo_type), + shield_hp_front_maximum(rhs.shield_hp_front_maximum), + shield_hp_back_maximum(rhs.shield_hp_back_maximum), + shield_recharge_rate(rhs.shield_recharge_rate), + capacitor_eng_maximum(rhs.capacitor_eng_maximum), + capacitor_eng_recharge_rate(rhs.capacitor_eng_recharge_rate), + engine_acc_rate(rhs.engine_acc_rate), + engine_deceleration_rate(rhs.engine_deceleration_rate), + engine_pitch_acc_rate(rhs.engine_pitch_acc_rate), + engine_yaw_acc_rate(rhs.engine_yaw_acc_rate), + engine_roll_acc_rate(rhs.engine_roll_acc_rate), + engine_pitch_rate_maximum(rhs.engine_pitch_rate_maximum), + engine_yaw_rate_maximum(rhs.engine_yaw_rate_maximum), + engine_roll_rate_maximum(rhs.engine_roll_rate_maximum), + engine_speed_maximum(rhs.engine_speed_maximum), + reactor_eng_generation_rate(rhs.reactor_eng_generation_rate), + booster_eng_maximum(rhs.booster_eng_maximum), + booster_eng_recharge_rate(rhs.booster_eng_recharge_rate), + booster_eng_consumption_rate(rhs.booster_eng_consumption_rate), + booster_acc(rhs.booster_acc), + booster_speed_maximum(rhs.booster_speed_maximum), + droid_if_cmd_speed(rhs.droid_if_cmd_speed), + installed_dcd(rhs.installed_dcd), + chassis_cmp_mass_maximum(rhs.chassis_cmp_mass_maximum), + cmp_creators(rhs.cmp_creators), + cargo_hold_contents_maximum(rhs.cargo_hold_contents_maximum), + cargo_hold_contents_current(rhs.cargo_hold_contents_current), + cargo_hold_contents(rhs.cargo_hold_contents) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct StaticObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct StaticObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + StaticObjectBufferRow() : + object_id() + { + } + + StaticObjectBufferRow(const StaticObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct TangibleObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong max_hit_points; + DB::BindableNetworkId owner_id; + DB::BindableBool visible; + DB::BindableString<2000> appearance_data; + DB::BindableLong interest_radius; + DB::BindableLong pvp_type; + DB::BindableLong pvp_faction; + DB::BindableLong damage_taken; + DB::BindableString<2000> custom_appearance; + DB::BindableLong count; + DB::BindableLong condition; + DB::BindableNetworkId creator_id; + DB::BindableLong source_draft_schematic; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct TangibleObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong max_hit_points; + DB::BindableNetworkId owner_id; + DB::BindableBool visible; + DB::BufferString appearance_data; + DB::BindableLong interest_radius; + DB::BindableLong pvp_type; + DB::BindableLong pvp_faction; + DB::BindableLong damage_taken; + DB::BufferString custom_appearance; + DB::BindableLong count; + DB::BindableLong condition; + DB::BindableNetworkId creator_id; + DB::BindableLong source_draft_schematic; + + TangibleObjectBufferRow() : + object_id(), + max_hit_points(), + owner_id(), + visible(), + appearance_data(2000), + interest_radius(), + pvp_type(), + pvp_faction(), + damage_taken(), + custom_appearance(2000), + count(), + condition(), + creator_id(), + source_draft_schematic() + { + } + + TangibleObjectBufferRow(const TangibleObjectRow & rhs) : + object_id(rhs.object_id), + max_hit_points(rhs.max_hit_points), + owner_id(rhs.owner_id), + visible(rhs.visible), + appearance_data(rhs.appearance_data), + interest_radius(rhs.interest_radius), + pvp_type(rhs.pvp_type), + pvp_faction(rhs.pvp_faction), + damage_taken(rhs.damage_taken), + custom_appearance(rhs.custom_appearance), + count(rhs.count), + condition(rhs.condition), + creator_id(rhs.creator_id), + source_draft_schematic(rhs.source_draft_schematic) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct TokenObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId reference; + DB::BindableString<500> target_server_template_name; + DB::BindableString<500> target_shared_template_name; + DB::BindableNetworkId waypoint; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct TokenObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableNetworkId reference; + DB::BufferString target_server_template_name; + DB::BufferString target_shared_template_name; + DB::BindableNetworkId waypoint; + + TokenObjectBufferRow() : + object_id(), + reference(), + target_server_template_name(500), + target_shared_template_name(500), + waypoint() + { + } + + TokenObjectBufferRow(const TokenObjectRow & rhs) : + object_id(rhs.object_id), + reference(rhs.reference), + target_server_template_name(rhs.target_server_template_name), + target_shared_template_name(rhs.target_shared_template_name), + waypoint(rhs.waypoint) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct UniverseObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct UniverseObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + + UniverseObjectBufferRow() : + object_id() + { + } + + UniverseObjectBufferRow(const UniverseObjectRow & rhs) : + object_id(rhs.object_id) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct VehicleObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong bogus; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct VehicleObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong bogus; + + VehicleObjectBufferRow() : + object_id(), + bogus() + { + } + + VehicleObjectBufferRow(const VehicleObjectRow & rhs) : + object_id(rhs.object_id), + bogus(rhs.bogus) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct WeaponObjectRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong min_damage; + DB::BindableLong max_damage; + DB::BindableLong damage_type; + DB::BindableLong elemental_type; + DB::BindableLong elemental_value; + DB::BindableDouble attack_speed; + DB::BindableDouble wound_chance; + DB::BindableLong accuracy; + DB::BindableLong attack_cost; + DB::BindableDouble damage_radius; + DB::BindableDouble min_range; + DB::BindableDouble max_range; + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + +struct WeaponObjectBufferRow : public DB::Row +{ + DB::BindableNetworkId object_id; + DB::BindableLong min_damage; + DB::BindableLong max_damage; + DB::BindableLong damage_type; + DB::BindableLong elemental_type; + DB::BindableLong elemental_value; + DB::BindableDouble attack_speed; + DB::BindableDouble wound_chance; + DB::BindableLong accuracy; + DB::BindableLong attack_cost; + DB::BindableDouble damage_radius; + DB::BindableDouble min_range; + DB::BindableDouble max_range; + + WeaponObjectBufferRow() : + object_id(), + min_damage(), + max_damage(), + damage_type(), + elemental_type(), + elemental_value(), + attack_speed(), + wound_chance(), + accuracy(), + attack_cost(), + damage_radius(), + min_range(), + max_range() + { + } + + WeaponObjectBufferRow(const WeaponObjectRow & rhs) : + object_id(rhs.object_id), + min_damage(rhs.min_damage), + max_damage(rhs.max_damage), + damage_type(rhs.damage_type), + elemental_type(rhs.elemental_type), + elemental_value(rhs.elemental_value), + attack_speed(rhs.attack_speed), + wound_chance(rhs.wound_chance), + accuracy(rhs.accuracy), + attack_cost(rhs.attack_cost), + damage_radius(rhs.damage_radius), + min_range(rhs.min_range), + max_range(rhs.max_range) + { + } + + virtual void copy(const DB::Row &rhs) + { + *this = dynamic_cast(rhs); + } + + void setPrimaryKey(const NetworkId &keyValue) + { + object_id.setValue(keyValue); + } + + NetworkId getPrimaryKey() const + { + return object_id.getValue(); + } +}; + //!!!END GENERATED DECLARATIONS } diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h index 5098a3c1b..55469272f 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h @@ -11,7 +11,7 @@ #include "serverDatabase/DatabaseProcessQuery.h" #include "sharedDatabaseInterface/DbBindableVarray.h" #include "sharedDatabaseInterface/DbModeQuery.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "SwgDatabaseServer/CommoditiesSchema.h" #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h index 0af504787..61fa760e2 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h @@ -65,7 +65,7 @@ namespace DBQuery virtual bool bindParameters(); virtual bool bindColumns(); virtual void getSQL(std::string &sql); - virtual QueryMode GetAllManufactureSchematicAttributes::getExecutionMode() const; + virtual QueryMode getExecutionMode() const; private: GetAllManufactureSchematicAttributes(const GetAllManufactureSchematicAttributes&); // disable diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h index bf4bb4382..44aef98fe 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h @@ -14,7 +14,7 @@ #include "serverDatabase/DatabaseProcessQuery.h" #include "sharedDatabaseInterface/DbBindableVarray.h" #include "sharedDatabaseInterface/DbModeQuery.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h index 813c8acad..2817fe3d8 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h @@ -13,7 +13,7 @@ #include "serverDatabase/DatabaseProcessQuery.h" #include "sharedDatabaseInterface/DbBindableVarray.h" #include "sharedDatabaseInterface/DbModeQuery.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include // ====================================================================== diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h index 0819e539e..32a49ffa1 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h @@ -90,7 +90,7 @@ namespace DBQuery virtual bool bindParameters(); virtual bool bindColumns(); virtual void getSQL(std::string &sql); - virtual QueryMode GetAllPropertyLists::getExecutionMode() const; + virtual QueryMode getExecutionMode() const; private: GetAllPropertyLists(const GetAllPropertyLists&); // disable diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h b/src/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h index 04a457b42..b0514a7e9 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h @@ -73,7 +73,7 @@ namespace DBQuery virtual bool bindParameters(); virtual bool bindColumns(); virtual void getSQL(std::string &sql); - virtual QueryMode GetAllSkills::getExecutionMode() const; + virtual QueryMode getExecutionMode() const; private: GetAllSkills(const GetAllSkills&); // disable diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetCharacters.h b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetCharacters.h index 8e7cf659c..ceabcbe23 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetCharacters.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetCharacters.h @@ -13,7 +13,7 @@ #include #include "sharedDatabaseInterface/DbTaskRequest.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "Unicode.h" //----------------------------------------------------------------------- diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h index 5b810d2b9..2e043f3d1 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h @@ -14,7 +14,7 @@ #include "sharedDatabaseInterface/BindableNetworkId.h" #include "sharedDatabaseInterface/DbQuery.h" #include "sharedDatabaseInterface/DbTaskRequest.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h" +#include "sharedFoundation/StationId.h" //----------------------------------------------------------------------- diff --git a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h index 2cc1c050b..c9d69a693 100644 --- a/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h +++ b/src/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h @@ -17,7 +17,7 @@ #include "sharedDatabaseInterface/BindableNetworkId.h" #include "sharedDatabaseInterface/DbQuery.h" #include "sharedDatabaseInterface/DbTaskRequest.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/StationId.h" +#include "sharedFoundation/StationId.h" class TransferCharacterData; diff --git a/src/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp b/src/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp index 8b42da06d..4fd1db3e5 100644 --- a/src/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp +++ b/src/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp @@ -46,7 +46,7 @@ void ConfigCombatEngine::install(void) Iff file; ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_body"), static_cast(CSB_body))); - ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_head"), static_cast(CSB_head))); + ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_head"), static_cast(CSB_head))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_rightArm"), static_cast(CSB_rightArm))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_leftArm"), static_cast(CSB_leftArm))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_rightLeg"), static_cast(CSB_rightLeg))); @@ -96,11 +96,11 @@ void ConfigCombatEngine::parseVersion0(Iff & file) std::string paramName, tempString; ConfigCombatEngineData::BodyAttackMod bodyAttackMod; ConfigCombatEngine::SkeletonAttackMod skeletonAttackMod; - - //-- Initialize data structures. - memset(&bodyAttackMod, 0, sizeof(bodyAttackMod)); - memset(&skeletonAttackMod, 0, sizeof(skeletonAttackMod)); - +// +// //-- Initialize data structures. +// memset(&bodyAttackMod, 0, sizeof(bodyAttackMod)); +// memset(&skeletonAttackMod, 0, sizeof(skeletonAttackMod)); +// file.enterForm(); for (;;) @@ -212,7 +212,7 @@ ConfigCombatEngine::SkeletonAttackMod skeletonAttackMod; bodyLoc.damageBonus[Attributes::Mind] = static_cast(file.read_uint8()) / 100.0f; } file.exitChunk(); - } + } file.exitForm(); diff --git a/src/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp b/src/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp index d51dbfb21..622cd4434 100644 --- a/src/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp +++ b/src/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp @@ -1348,7 +1348,7 @@ CS_CMD( get_pc_info ) const CreatureObject::SkillList & skills = creatureActor->getSkillList(); int temp_int = 0; - for( CreatureObject::SkillList::iterator slit = skills.begin(); + for( CreatureObject::SkillList::const_iterator slit = skills.begin(); slit != skills.end(); ++slit ) { diff --git a/src/game/server/application/SwgGameServer/src/shared/core/FirstSwgGameServer.h b/src/game/server/application/SwgGameServer/src/shared/core/FirstSwgGameServer.h index a7c23bb01..967cf1701 100644 --- a/src/game/server/application/SwgGameServer/src/shared/core/FirstSwgGameServer.h +++ b/src/game/server/application/SwgGameServer/src/shared/core/FirstSwgGameServer.h @@ -11,7 +11,7 @@ // ====================================================================== #pragma warning ( disable : 4503 ) // name truncated (STL) -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedDebug/FirstSharedDebug.h" #include "sharedMemoryManager/FirstSharedMemoryManager.h" diff --git a/src/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp b/src/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp index a2b4f8825..42d7a2790 100644 --- a/src/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp +++ b/src/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp @@ -31,6 +31,7 @@ #include "swgServerNetworkMessages/MessageQueueJediLocation.h" #include "swgServerNetworkMessages/MessageQueueRequestJediBounty.h" +#include static const int IGNORE_JEDI_STAT = INT_MAX; diff --git a/src/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h b/src/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h index 89add3bd8..4244461a0 100644 --- a/src/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h +++ b/src/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h @@ -14,7 +14,7 @@ #define _INCLUDED_ServerJediManagerObjectTemplate_H #include "serverGame/ServerUniverseObjectTemplate.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/DynamicVariable.h" +#include "sharedFoundation/DynamicVariable.h" #include "sharedUtility/TemplateParameter.h" diff --git a/src/game/server/application/SwgNameGenerator/src/shared/FirstSwgNameGenerator.h b/src/game/server/application/SwgNameGenerator/src/shared/FirstSwgNameGenerator.h index a9248b236..73f5079ff 100644 --- a/src/game/server/application/SwgNameGenerator/src/shared/FirstSwgNameGenerator.h +++ b/src/game/server/application/SwgNameGenerator/src/shared/FirstSwgNameGenerator.h @@ -1 +1 @@ -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" \ No newline at end of file +#include "sharedFoundation/FirstSharedFoundation.h" \ No newline at end of file diff --git a/src/game/server/application/SwgSpaceQuestEditor/src/win32/FirstSwgSpaceQuestEditor.h b/src/game/server/application/SwgSpaceQuestEditor/src/win32/FirstSwgSpaceQuestEditor.h index 4e2116f6f..4e4c85f61 100644 --- a/src/game/server/application/SwgSpaceQuestEditor/src/win32/FirstSwgSpaceQuestEditor.h +++ b/src/game/server/application/SwgSpaceQuestEditor/src/win32/FirstSwgSpaceQuestEditor.h @@ -41,7 +41,7 @@ typedef std::set StringSet; // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/game/server/application/SwgSpaceZoneEditor/src/win32/FirstSwgSpaceZoneEditor.h b/src/game/server/application/SwgSpaceZoneEditor/src/win32/FirstSwgSpaceZoneEditor.h index aa0149855..a4e60df84 100644 --- a/src/game/server/application/SwgSpaceZoneEditor/src/win32/FirstSwgSpaceZoneEditor.h +++ b/src/game/server/application/SwgSpaceZoneEditor/src/win32/FirstSwgSpaceZoneEditor.h @@ -31,7 +31,7 @@ typedef std::set StringSet; // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" // ====================================================================== diff --git a/src/game/server/database/login_schema/cluster_list.tab b/src/game/server/database/login_schema/cluster_list.tab index 9fbdcdf05..121bcdb89 100644 --- a/src/game/server/database/login_schema/cluster_list.tab +++ b/src/game/server/database/login_schema/cluster_list.tab @@ -4,12 +4,12 @@ create table cluster_list --NO_IMPORT name varchar2(255), num_characters number, address varchar2(255), - port number, + port number default 44463, secret char(1), locked char(1), not_recommended char(1), group_id int default 1 not null, - online_player_limit number, + online_player_limit number default 100, online_free_trial_limit number, free_trial_can_create_char char(1), online_tutorial_limit number default 350, diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.h b/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.h index fd6dfa2cf..a6cf0f351 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueCombatDamageList_H #define INCLUDED_MessageQueueCombatDamageList_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "swgSharedUtility/CombatEngineData.h" diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueDirectDamage.h b/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueDirectDamage.h index c95895ec3..ada07b7ab 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueDirectDamage.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueDirectDamage.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueDirectDamage_H #define INCLUDED_MessageQueueDirectDamage_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/core/FirstSwgServerNetworkMessages.h b/src/game/server/library/swgServerNetworkMessages/src/shared/core/FirstSwgServerNetworkMessages.h index 6635a9eec..dbddd38b1 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/core/FirstSwgServerNetworkMessages.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/core/FirstSwgServerNetworkMessages.h @@ -11,14 +11,14 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/FirstSharedFoundation.h" +#include "sharedFoundation/FirstSharedFoundation.h" #include "sharedDebug/FirstSharedDebug.h" #include "sharedMemoryManager/FirstSharedMemoryManager.h" #include "sharedNetworkMessages/GameNetworkMessage.h" #include "Archive/AutoDeltaByteStream.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/NetworkId.h" #include "unicodeArchive/UnicodeArchive.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkIdArchive.h" +#include "sharedFoundation/NetworkIdArchive.h" // ====================================================================== #endif // INCLUDED_FirstSwgServerNetworkObject_H diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediData.h b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediData.h index ff245e106..e8cf1784c 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediData.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediData.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueJediData_H #define INCLUDED_MessageQueueJediData_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediLocation.h b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediLocation.h index defb6ace5..b207cf4b0 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediLocation.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueJediLocation.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueJediLocation_H #define INCLUDED_MessageQueueJediLocation_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueRequestJediBounty.h b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueRequestJediBounty.h index 63e8acce0..93ddbdee0 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueRequestJediBounty.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/jedi/MessageQueueRequestJediBounty.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueRequestJediBounty_H #define INCLUDED_MessageQueueRequestJediBounty_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/money/MessageQueueScriptTransferMoney.h b/src/game/server/library/swgServerNetworkMessages/src/shared/money/MessageQueueScriptTransferMoney.h index 429ad4630..7769fdfbb 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/money/MessageQueueScriptTransferMoney.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/money/MessageQueueScriptTransferMoney.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueScriptTransferMoney_H #define INCLUDED_MessageQueueScriptTransferMoney_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueActivateInstallation.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueActivateInstallation.h index 925091eec..8e0fbda81 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueActivateInstallation.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueActivateInstallation.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueActivateInstallation_H #define INCLUDED_MessageQueueActivateInstallation_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" // ====================================================================== diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueDeactivateInstallation.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueDeactivateInstallation.h index 3cbf05cee..73295c58f 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueDeactivateInstallation.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueDeactivateInstallation.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueDeactivateInstallation_H #define INCLUDED_MessageQueueDeactivateInstallation_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" //---------------------------------------------------------------------- diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueInstallationHarvest.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueInstallationHarvest.h index 67a972f2f..fb80c2547 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueInstallationHarvest.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueInstallationHarvest.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueInstallationHarvest_H #define INCLUDED_MessageQueueInstallationHarvest_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" class MemoryBlockManager; diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceAdd.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceAdd.h index b883266af..19a9de8cb 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceAdd.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceAdd.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueResourceAdd_H #define INCLUDED_MessageQueueResourceAdd_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceFinishHarvest.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceFinishHarvest.h index 14fe2ce58..57089b35b 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceFinishHarvest.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceFinishHarvest.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueResourceFinishHarvest_H #define INCLUDED_MessageQueueResourceFinishHarvest_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" /** * Sent by: Resource Pool diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceSetInstalledEfficiency.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceSetInstalledEfficiency.h index 939b33e59..4c5480f7a 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceSetInstalledEfficiency.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceSetInstalledEfficiency.h @@ -10,7 +10,7 @@ #ifndef INCLUDED_MessageQueueResourceSetInstalledEfficiency_H #define INCLUDED_MessageQueueResourceSetInstalledEfficiency_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" /** * Sent by: Resource Pool diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceTypeDepleted.h b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceTypeDepleted.h index 31634a0bc..5880910ae 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceTypeDepleted.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/resource/MessageQueueResourceTypeDepleted.h @@ -10,8 +10,8 @@ #ifndef INCLUDED_MessageQueueResourceTypeDepleted_H #define INCLUDED_MessageQueueResourceTypeDepleted_H -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/NetworkId.h" +#include "sharedFoundation/MessageQueue.h" +#include "sharedFoundation/NetworkId.h" // ====================================================================== diff --git a/src/game/server/library/swgServerNetworkMessages/src/shared/travel/MessageQueuePlanetAddTravelPoint.h b/src/game/server/library/swgServerNetworkMessages/src/shared/travel/MessageQueuePlanetAddTravelPoint.h index a45be9c19..581bce61e 100644 --- a/src/game/server/library/swgServerNetworkMessages/src/shared/travel/MessageQueuePlanetAddTravelPoint.h +++ b/src/game/server/library/swgServerNetworkMessages/src/shared/travel/MessageQueuePlanetAddTravelPoint.h @@ -12,7 +12,7 @@ // ====================================================================== -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/MessageQueue.h" +#include "sharedFoundation/MessageQueue.h" #include "sharedMath/Vector.h" #include "sharedNetworkMessages/ControllerMessageMacros.h" diff --git a/src/game/shared/application/SwgLoadClient/src/shared/Makefile.am b/src/game/shared/application/SwgLoadClient/src/shared/Makefile.am index 16cbaffdc..5c46677a5 100644 --- a/src/game/shared/application/SwgLoadClient/src/shared/Makefile.am +++ b/src/game/shared/application/SwgLoadClient/src/shared/Makefile.am @@ -24,8 +24,7 @@ SwgLoadClient_CXXFLAGS= \ -I$(localization_dir)/include \ -I$(localizationArchive_dir)/include/public \ -I$(unicode_dir)/include \ - -I$(unicodeArchive_dir)/include/public \ - -I$(stlport_dir)/stlport + -I$(unicodeArchive_dir)/include/public SwgLoadClient_SOURCES=FirstSwgLoadClient.cpp \ FirstSwgLoadClient.h \ @@ -93,7 +92,7 @@ SwgLoadClient_LDADD= \ $(top_builddir)/../external/ours/library/unicode/libunicode.la \ $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la \ $(libxml_dir)/libxml2.la \ - $(stlport_dir)/lib/libstlport_gcc.a \ + \ $(udplibrary_dir)/output/debug/libudplibrary.a \ $(top_builddir)/../engine/shared/library/sharedMemoryManager/libsharedMemoryManager.la @@ -246,8 +245,8 @@ $(top_builddir)/../external/ours/library/unicode/libunicode.la: $(top_builddir)/../external/ours/library/unicodeArchive/libunicodeArchive.la: make -C $(top_builddir)/../external/ours/library/unicodeArchive -$(stlport_dir)/lib/libstlport_gcc.a: - make -C $(stlport_dir)/src -f gcc-linux.mak + + $(udplibrary_dir)/output/debug/libudplibrary.a: make -C $(udplibrary_dir) diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/Makefile.am b/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/Makefile.am index 2dc274578..2a10c6a68 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/Makefile.am +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/Makefile.am @@ -17,7 +17,7 @@ libswgSharedNetworkMessagessharedcombat_la_CXXFLAGS=-I$(srcdir)/../../../include -I$(engine_dir)/shared/library/sharedObject/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \ diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp b/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp index 7395e9f92..0426ac11f 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp @@ -361,8 +361,8 @@ uint32 MessageQueueCombatAction::getComparisonChecksum( void ) const { uint32 retval = 0; retval += m_actionId; - retval += NetworkId::Hash()(m_attacker.id); - retval += NetworkId::Hash()(m_attacker.weapon); + retval += NetworkId::NetHash()(m_attacker.id); + retval += NetworkId::NetHash()(m_attacker.weapon); retval += int(m_attacker.endPosture); retval += m_attacker.trailBits; retval += m_attacker.clientEffectId; diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/consent/Makefile.am b/src/game/shared/library/swgSharedNetworkMessages/src/shared/consent/Makefile.am index fb809cc4b..e35414597 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/consent/Makefile.am +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/consent/Makefile.am @@ -16,7 +16,7 @@ libswgSharedNetworkMessagessharedconsent_la_CXXFLAGS=-I$(srcdir)/../../../includ -I$(engine_dir)/shared/library/sharedObject/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \ diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/core/Makefile.am b/src/game/shared/library/swgSharedNetworkMessages/src/shared/core/Makefile.am index a9821a75b..ab3a3f9ce 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/core/Makefile.am +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/core/Makefile.am @@ -20,7 +20,7 @@ libswgSharedNetworkMessagessharedcore_la_CXXFLAGS=-I$(srcdir)/../../../include/p -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \ diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/permissionList/Makefile.am b/src/game/shared/library/swgSharedNetworkMessages/src/shared/permissionList/Makefile.am index 21b55fe1f..a6f72a5bc 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/permissionList/Makefile.am +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/permissionList/Makefile.am @@ -15,7 +15,7 @@ libswgSharedNetworkMessagessharedpermissionList_la_CXXFLAGS=-I$(srcdir)/../../.. -I$(engine_dir)/shared/library/sharedObject/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \ diff --git a/src/game/shared/library/swgSharedNetworkMessages/src/shared/survey/Makefile.am b/src/game/shared/library/swgSharedNetworkMessages/src/shared/survey/Makefile.am index 323dc98f1..5a4d60dd2 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/src/shared/survey/Makefile.am +++ b/src/game/shared/library/swgSharedNetworkMessages/src/shared/survey/Makefile.am @@ -16,7 +16,7 @@ libswgSharedNetworkMessagessharedsurvey_la_CXXFLAGS=-I$(srcdir)/../../../include -I$(engine_dir)/shared/library/sharedObject/include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \ diff --git a/src/game/shared/library/swgSharedUtility/src/shared/Makefile.am b/src/game/shared/library/swgSharedUtility/src/shared/Makefile.am index db31ec43c..1da1f9c07 100644 --- a/src/game/shared/library/swgSharedUtility/src/shared/Makefile.am +++ b/src/game/shared/library/swgSharedUtility/src/shared/Makefile.am @@ -16,7 +16,7 @@ libswgSharedUtilityshared_la_CXXFLAGS=-I$(srcdir)/../../include/public \ -I$(engine_dir)/shared/library/sharedSynchronization/include/public \ -I$(engine_dir)/shared/library/sharedThread/include/public \ -I$(engine_dir)/shared/library/sharedUtility/include/public \ - -I$(stlport_dir)/stlport \ + \ -I$(udplibrary_dir) \ -I$(singleton_dir)/include \ -I$(archive_dir)/include \