From dd50b8ce5663168c428595a5c909e6ad7211aaae Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 16 Jun 2016 21:03:57 -0700 Subject: [PATCH] history squash --- src/build/win32/_all.vcxproj | 6 +- src/build/win32/_all_client.vcxproj | 6 +- src/build/win32/_all_client_libraries.vcxproj | 6 +- src/build/win32/_all_server.vcxproj | 6 +- src/build/win32/_all_server_libraries.vcxproj | 6 +- src/build/win32/_all_shared_libraries.vcxproj | 6 +- src/build/win32/_all_tools.vcxproj | 6 +- .../build/win32/AnimationEditor.vcxproj | 6 +- .../BugTool/build/win32/BugTool.vcxproj | 6 +- .../build/win32/ClientEffectEditor.vcxproj | 6 +- .../build/win32/CrashReporter.vcxproj | 6 +- .../build/win32/DebugWindow.vcxproj | 6 +- .../Direct3d9/build/win32/Direct3d9.vcxproj | 6 +- .../build/win32/Direct3d9_ffp.vcxproj | 6 +- .../build/win32/Direct3d9_vsps.vcxproj | 6 +- .../DllExport/build/win32/DllExport.vcxproj | 6 +- .../build/win32/LightningEditor.vcxproj | 6 +- .../build/win32/MayaExporter.vcxproj | 6 +- .../application/Miff/build/win32/Miff.vcxproj | 6 +- .../NpcEditor/build/win32/NpcEditor.vcxproj | 6 +- .../build/win32/ParticleEditor.vcxproj | 6 +- .../build/win32/QuestEditor.vcxproj | 6 +- .../build/win32/RemoteDebugTool.vcxproj | 6 +- .../build/win32/ShaderBuilder.vcxproj | 6 +- .../build/win32/ShipComponentEditor.vcxproj | 6 +- .../build/win32/SoundEditor.vcxproj | 6 +- .../build/win32/SwooshEditor.vcxproj | 6 +- .../build/win32/TerrainEditor.vcxproj | 6 +- .../build/win32/TextureBuilder.vcxproj | 6 +- .../ViewIff/build/win32/ViewIff.vcxproj | 6 +- .../Viewer/build/win32/Viewer.vcxproj | 6 +- .../build/win32/WorldSnapshotViewer.vcxproj | 6 +- .../build/win32/clientAnimation.vcxproj | 6 +- .../build/win32/clientAudio.vcxproj | 8 +- .../public/clientAudio/SwgAudioCapture.h | 1 - .../clientAudio/src/win32/SwgAudioCapture.cpp | 48 ---------- .../clientAudio/src/win32/SwgAudioCapture.h | 39 -------- .../build/win32/clientBugReporting.vcxproj | 6 +- .../build/win32/clientDirectInput.vcxproj | 6 +- .../clientGame/build/win32/clientGame.vcxproj | 6 +- .../clientGame/src/shared/core/Game.cpp | 5 +- .../build/win32/clientGraphics.vcxproj | 6 +- .../build/win32/clientObject.vcxproj | 6 +- .../build/win32/clientParticle.vcxproj | 6 +- .../win32/clientSkeletalAnimation.vcxproj | 6 +- .../build/win32/clientTerrain.vcxproj | 6 +- .../build/win32/clientTextureRenderer.vcxproj | 6 +- .../build/win32/clientUserInterface.vcxproj | 6 +- .../build/win32/ArmorExporterTool.vcxproj | 6 +- .../win32/CoreWeaponExporterTool.vcxproj | 6 +- .../build/win32/DataLintRspBuilder.vcxproj | 6 +- .../build/win32/DataTableTool.vcxproj | 6 +- .../build/win32/LabelHashTool.vcxproj | 6 +- .../Md5sum/build/win32/Md5sum.vcxproj | 6 +- .../build/win32/PlanetWatcher.vcxproj | 6 +- .../build/win32/StringFileTool.vcxproj | 6 +- .../build/win32/TemplateCompiler.vcxproj | 6 +- .../win32/TemplateDefinitionCompiler.vcxproj | 6 +- .../build/win32/TreeFileBuilder.vcxproj | 6 +- .../build/win32/TreeFileExtractor.vcxproj | 6 +- .../build/win32/TreeFileRspBuilder.vcxproj | 6 +- .../application/Turf/build/win32/Turf.vcxproj | 6 +- .../win32/UpdateLocalizedStrings.vcxproj | 6 +- .../build/win32/WeaponExporterTool.vcxproj | 6 +- .../build/win32/WordCountTool.vcxproj | 6 +- .../build/win32/sharedCollision.vcxproj | 10 +- .../src/shared/core/CollisionUtils.cpp | 4 - .../src/shared/core/CollisionVolume.cpp | 8 -- .../src/shared/core/CollisionVolume.h | 39 -------- .../build/win32/sharedCommandParser.vcxproj | 6 +- .../build/win32/sharedCompression.vcxproj | 6 +- .../win32/sharedDatabaseInterface.vcxproj | 6 +- .../build/win32/sharedDebug.vcxproj | 6 +- .../sharedFile/build/win32/sharedFile.vcxproj | 6 +- .../build/win32/sharedFoundation.vcxproj | 6 +- .../src/win32/PerThreadData.cpp | 2 +- .../build/win32/sharedFoundationTypes.vcxproj | 6 +- .../build/win32/sharedFractal.vcxproj | 6 +- .../sharedGame/build/win32/sharedGame.vcxproj | 6 +- .../build/win32/sharedImage.vcxproj | 6 +- .../build/win32/sharedInputMap.vcxproj | 6 +- .../build/win32/sharedIoWin.vcxproj | 6 +- .../sharedLog/build/win32/sharedLog.vcxproj | 6 +- .../sharedMath/build/win32/sharedMath.vcxproj | 6 +- .../build/win32/sharedMathArchive.vcxproj | 6 +- .../build/win32/sharedMemoryManager.vcxproj | 6 +- .../build/win32/sharedMessageDispatch.vcxproj | 6 +- .../build/win32/sharedNetwork.vcxproj | 6 +- .../build/win32/sharedNetworkMessages.vcxproj | 6 +- .../build/win32/sharedObject.vcxproj | 6 +- .../build/win32/sharedPathfinding.vcxproj | 6 +- .../build/win32/sharedRandom.vcxproj | 6 +- .../build/win32/sharedRegex.vcxproj | 6 +- .../win32/sharedRemoteDebugServer.vcxproj | 6 +- .../build/win32/sharedSkillSystem.vcxproj | 6 +- .../build/win32/sharedStatusWindow.vcxproj | 6 +- .../build/win32/sharedSwitcher.vcxproj | 6 +- .../build/win32/sharedSynchronization.vcxproj | 6 +- .../build/win32/sharedTemplate.vcxproj | 6 +- .../win32/sharedTemplateDefinition.vcxproj | 6 +- .../build/win32/sharedTerrain.vcxproj | 6 +- .../build/win32/sharedThread.vcxproj | 6 +- .../build/win32/sharedUtility.vcxproj | 6 +- .../sharedXml/build/win32/sharedXml.vcxproj | 6 +- .../application/UiBuilder/UIBuilder.vcxproj | 4 +- .../UiFontBuilder/UIFontBuilder.vcxproj | 4 +- .../library/blat194/build/win32/blat.vcxproj | 6 +- .../dpvs/implementation/msvc8/dpvs.vcxproj | 6 +- .../lcdui_src/build/win32/lcdui.vcxproj | 6 +- .../build/win32/libEverQuestTCG.vcxproj | 6 +- .../libMozilla/build/win32/libMozilla.vcxproj | 6 +- .../Session/CommonAPI/CommonAPI.vcxproj | 8 +- .../Session/LoginAPI/LoginAPI.vcxproj | 8 +- .../platform/utils/Base/win32/Base.vcxproj | 8 +- .../3rd/library/udplibrary/udplibrary.vcxproj | 6 +- .../3rd/library/ui/build/win32/ui.vcxproj | 6 +- .../3rd/library/zlib-1.2.3/zlib.vcxproj | 4 +- .../build/win32/LocalizationTool.vcxproj | 6 +- .../build/win32/LocalizationToolCon.vcxproj | 6 +- .../archive/build/win32/archive.vcxproj | 6 +- .../library/crypto/build/win32/crypto.vcxproj | 6 +- .../build/win32/fileInterface.vcxproj | 6 +- .../build/win32/localization.vcxproj | 6 +- .../build/win32/localizationArchive.vcxproj | 6 +- .../singleton/build/win32/singleton.vcxproj | 6 +- .../unicode/build/win32/unicode.vcxproj | 6 +- .../build/win32/unicodeArchive.vcxproj | 6 +- .../SwgClient/build/win32/SwgClient.vcxproj | 6 +- .../SwgClient/src/win32/ClientMain.cpp | 6 -- .../SwgClient/src/win32/WinMain.cpp | 37 ++++--- .../build/win32/SwgClientSetup.vcxproj | 4 +- .../build/win32/SwgGodClient.vcxproj | 6 +- .../build/win32/swgClientQtWidgets.vcxproj | 6 +- .../win32/swgClientUserInterface.vcxproj | 10 +- .../SwgCuiNpeContinuation.h | 1 - .../core/SwgCuiMediatorFactorySetup.cpp | 2 - .../src/shared/page/SwgCuiHudAction.cpp | 1 - .../src/shared/page/SwgCuiNpeContinuation.cpp | 96 ------------------- .../src/shared/page/SwgCuiNpeContinuation.h | 61 ------------ .../build/win32/SwgContentBuilder.vcxproj | 6 +- .../build/win32/SwgConversationEditor.vcxproj | 6 +- .../win32/SwgDraftSchematicEditor.vcxproj | 6 +- .../build/win32/SwgNameGenerator.vcxproj | 6 +- .../build/win32/SwgSpaceQuestEditor.vcxproj | 6 +- .../build/win32/SwgSpaceZoneEditor.vcxproj | 6 +- .../build/win32/SwgContentSync.vcxproj | 6 +- .../build/win32/SwgLoadClient.vcxproj | 6 +- .../win32/swgSharedNetworkMessages.vcxproj | 6 +- .../build/win32/swgSharedUtility.vcxproj | 6 +- 149 files changed, 421 insertions(+), 741 deletions(-) delete mode 100644 src/engine/client/library/clientAudio/include/public/clientAudio/SwgAudioCapture.h delete mode 100644 src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.cpp delete mode 100644 src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h delete mode 100644 src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp delete mode 100644 src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h delete mode 100644 src/game/client/library/swgClientUserInterface/include/public/swgClientUserInterface/SwgCuiNpeContinuation.h delete mode 100644 src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.cpp delete mode 100644 src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.h diff --git a/src/build/win32/_all.vcxproj b/src/build/win32/_all.vcxproj index 86877d68c..9ba582751 100644 --- a/src/build/win32/_all.vcxproj +++ b/src/build/win32/_all.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_client.vcxproj b/src/build/win32/_all_client.vcxproj index e1fc6fb7d..bbce5363a 100644 --- a/src/build/win32/_all_client.vcxproj +++ b/src/build/win32/_all_client.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_client_libraries.vcxproj b/src/build/win32/_all_client_libraries.vcxproj index 33d12c9f4..0e9d3e1b8 100644 --- a/src/build/win32/_all_client_libraries.vcxproj +++ b/src/build/win32/_all_client_libraries.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_server.vcxproj b/src/build/win32/_all_server.vcxproj index 30456726f..5916305a6 100644 --- a/src/build/win32/_all_server.vcxproj +++ b/src/build/win32/_all_server.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_server_libraries.vcxproj b/src/build/win32/_all_server_libraries.vcxproj index 2917c97c8..f17dbb636 100644 --- a/src/build/win32/_all_server_libraries.vcxproj +++ b/src/build/win32/_all_server_libraries.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_shared_libraries.vcxproj b/src/build/win32/_all_shared_libraries.vcxproj index 2df1a5d1d..afb7609d3 100644 --- a/src/build/win32/_all_shared_libraries.vcxproj +++ b/src/build/win32/_all_shared_libraries.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/build/win32/_all_tools.vcxproj b/src/build/win32/_all_tools.vcxproj index 95f3a841f..d2fc939a2 100644 --- a/src/build/win32/_all_tools.vcxproj +++ b/src/build/win32/_all_tools.vcxproj @@ -21,17 +21,17 @@ Utility - v120_xp + v120 false Utility - v120_xp + v120 false Utility - v120_xp + v120 false diff --git a/src/engine/client/application/AnimationEditor/build/win32/AnimationEditor.vcxproj b/src/engine/client/application/AnimationEditor/build/win32/AnimationEditor.vcxproj index 56da7b44c..a8136003b 100644 --- a/src/engine/client/application/AnimationEditor/build/win32/AnimationEditor.vcxproj +++ b/src/engine/client/application/AnimationEditor/build/win32/AnimationEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/BugTool/build/win32/BugTool.vcxproj b/src/engine/client/application/BugTool/build/win32/BugTool.vcxproj index d562ee487..16c8124f9 100644 --- a/src/engine/client/application/BugTool/build/win32/BugTool.vcxproj +++ b/src/engine/client/application/BugTool/build/win32/BugTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/ClientEffectEditor/build/win32/ClientEffectEditor.vcxproj b/src/engine/client/application/ClientEffectEditor/build/win32/ClientEffectEditor.vcxproj index cc45cb26e..6e0cc7c4c 100644 --- a/src/engine/client/application/ClientEffectEditor/build/win32/ClientEffectEditor.vcxproj +++ b/src/engine/client/application/ClientEffectEditor/build/win32/ClientEffectEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/CrashReporter/build/win32/CrashReporter.vcxproj b/src/engine/client/application/CrashReporter/build/win32/CrashReporter.vcxproj index 7b8269dd9..5064f6e09 100644 --- a/src/engine/client/application/CrashReporter/build/win32/CrashReporter.vcxproj +++ b/src/engine/client/application/CrashReporter/build/win32/CrashReporter.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/DebugWindow/build/win32/DebugWindow.vcxproj b/src/engine/client/application/DebugWindow/build/win32/DebugWindow.vcxproj index 7b30270a6..87f540b5b 100644 --- a/src/engine/client/application/DebugWindow/build/win32/DebugWindow.vcxproj +++ b/src/engine/client/application/DebugWindow/build/win32/DebugWindow.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/Direct3d9/build/win32/Direct3d9.vcxproj b/src/engine/client/application/Direct3d9/build/win32/Direct3d9.vcxproj index 77cc58bbd..16222b648 100644 --- a/src/engine/client/application/Direct3d9/build/win32/Direct3d9.vcxproj +++ b/src/engine/client/application/Direct3d9/build/win32/Direct3d9.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/Direct3d9/build/win32/Direct3d9_ffp.vcxproj b/src/engine/client/application/Direct3d9/build/win32/Direct3d9_ffp.vcxproj index d92d291f8..ebb32fdbd 100644 --- a/src/engine/client/application/Direct3d9/build/win32/Direct3d9_ffp.vcxproj +++ b/src/engine/client/application/Direct3d9/build/win32/Direct3d9_ffp.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/Direct3d9/build/win32/Direct3d9_vsps.vcxproj b/src/engine/client/application/Direct3d9/build/win32/Direct3d9_vsps.vcxproj index 4449a8c56..6e294ff4f 100644 --- a/src/engine/client/application/Direct3d9/build/win32/Direct3d9_vsps.vcxproj +++ b/src/engine/client/application/Direct3d9/build/win32/Direct3d9_vsps.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/DllExport/build/win32/DllExport.vcxproj b/src/engine/client/application/DllExport/build/win32/DllExport.vcxproj index c70964623..7a6085e6d 100644 --- a/src/engine/client/application/DllExport/build/win32/DllExport.vcxproj +++ b/src/engine/client/application/DllExport/build/win32/DllExport.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/LightningEditor/build/win32/LightningEditor.vcxproj b/src/engine/client/application/LightningEditor/build/win32/LightningEditor.vcxproj index 932a26081..e31d70b32 100644 --- a/src/engine/client/application/LightningEditor/build/win32/LightningEditor.vcxproj +++ b/src/engine/client/application/LightningEditor/build/win32/LightningEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/MayaExporter/build/win32/MayaExporter.vcxproj b/src/engine/client/application/MayaExporter/build/win32/MayaExporter.vcxproj index 8477b8dc4..dae342c62 100644 --- a/src/engine/client/application/MayaExporter/build/win32/MayaExporter.vcxproj +++ b/src/engine/client/application/MayaExporter/build/win32/MayaExporter.vcxproj @@ -20,19 +20,19 @@ DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte DynamicLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/Miff/build/win32/Miff.vcxproj b/src/engine/client/application/Miff/build/win32/Miff.vcxproj index 48c8be07f..4b6701665 100644 --- a/src/engine/client/application/Miff/build/win32/Miff.vcxproj +++ b/src/engine/client/application/Miff/build/win32/Miff.vcxproj @@ -20,19 +20,19 @@ Application - v120_xp + v120 false Unicode Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/NpcEditor/build/win32/NpcEditor.vcxproj b/src/engine/client/application/NpcEditor/build/win32/NpcEditor.vcxproj index 46d7f14fc..bf417580f 100644 --- a/src/engine/client/application/NpcEditor/build/win32/NpcEditor.vcxproj +++ b/src/engine/client/application/NpcEditor/build/win32/NpcEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/ParticleEditor/build/win32/ParticleEditor.vcxproj b/src/engine/client/application/ParticleEditor/build/win32/ParticleEditor.vcxproj index ca7bea675..4a9caaeb3 100644 --- a/src/engine/client/application/ParticleEditor/build/win32/ParticleEditor.vcxproj +++ b/src/engine/client/application/ParticleEditor/build/win32/ParticleEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/QuestEditor/build/win32/QuestEditor.vcxproj b/src/engine/client/application/QuestEditor/build/win32/QuestEditor.vcxproj index 9f7c0a126..08ff95720 100644 --- a/src/engine/client/application/QuestEditor/build/win32/QuestEditor.vcxproj +++ b/src/engine/client/application/QuestEditor/build/win32/QuestEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/RemoteDebugTool/build/win32/RemoteDebugTool.vcxproj b/src/engine/client/application/RemoteDebugTool/build/win32/RemoteDebugTool.vcxproj index f415c6035..bf67c0c08 100644 --- a/src/engine/client/application/RemoteDebugTool/build/win32/RemoteDebugTool.vcxproj +++ b/src/engine/client/application/RemoteDebugTool/build/win32/RemoteDebugTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/ShaderBuilder/build/win32/ShaderBuilder.vcxproj b/src/engine/client/application/ShaderBuilder/build/win32/ShaderBuilder.vcxproj index b98b10e6f..49f4448e3 100644 --- a/src/engine/client/application/ShaderBuilder/build/win32/ShaderBuilder.vcxproj +++ b/src/engine/client/application/ShaderBuilder/build/win32/ShaderBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static Unicode diff --git a/src/engine/client/application/ShipComponentEditor/build/win32/ShipComponentEditor.vcxproj b/src/engine/client/application/ShipComponentEditor/build/win32/ShipComponentEditor.vcxproj index 516d09de8..4b7958cb5 100644 --- a/src/engine/client/application/ShipComponentEditor/build/win32/ShipComponentEditor.vcxproj +++ b/src/engine/client/application/ShipComponentEditor/build/win32/ShipComponentEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/SoundEditor/build/win32/SoundEditor.vcxproj b/src/engine/client/application/SoundEditor/build/win32/SoundEditor.vcxproj index 6e3f290fb..7fc415236 100644 --- a/src/engine/client/application/SoundEditor/build/win32/SoundEditor.vcxproj +++ b/src/engine/client/application/SoundEditor/build/win32/SoundEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/SwooshEditor/build/win32/SwooshEditor.vcxproj b/src/engine/client/application/SwooshEditor/build/win32/SwooshEditor.vcxproj index 03c3add58..10ecaa443 100644 --- a/src/engine/client/application/SwooshEditor/build/win32/SwooshEditor.vcxproj +++ b/src/engine/client/application/SwooshEditor/build/win32/SwooshEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/client/application/TerrainEditor/build/win32/TerrainEditor.vcxproj b/src/engine/client/application/TerrainEditor/build/win32/TerrainEditor.vcxproj index 4a13d1c7c..d89219225 100644 --- a/src/engine/client/application/TerrainEditor/build/win32/TerrainEditor.vcxproj +++ b/src/engine/client/application/TerrainEditor/build/win32/TerrainEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static Unicode diff --git a/src/engine/client/application/TextureBuilder/build/win32/TextureBuilder.vcxproj b/src/engine/client/application/TextureBuilder/build/win32/TextureBuilder.vcxproj index 04bbf9a20..53be2e573 100644 --- a/src/engine/client/application/TextureBuilder/build/win32/TextureBuilder.vcxproj +++ b/src/engine/client/application/TextureBuilder/build/win32/TextureBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 Static Unicode diff --git a/src/engine/client/application/ViewIff/build/win32/ViewIff.vcxproj b/src/engine/client/application/ViewIff/build/win32/ViewIff.vcxproj index efdea4dd7..0c8daec1b 100644 --- a/src/engine/client/application/ViewIff/build/win32/ViewIff.vcxproj +++ b/src/engine/client/application/ViewIff/build/win32/ViewIff.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static Unicode diff --git a/src/engine/client/application/Viewer/build/win32/Viewer.vcxproj b/src/engine/client/application/Viewer/build/win32/Viewer.vcxproj index fe29fdd9c..687f71f36 100644 --- a/src/engine/client/application/Viewer/build/win32/Viewer.vcxproj +++ b/src/engine/client/application/Viewer/build/win32/Viewer.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/engine/client/application/WorldSnapshotViewer/build/win32/WorldSnapshotViewer.vcxproj b/src/engine/client/application/WorldSnapshotViewer/build/win32/WorldSnapshotViewer.vcxproj index a4709fd68..a32f3d939 100644 --- a/src/engine/client/application/WorldSnapshotViewer/build/win32/WorldSnapshotViewer.vcxproj +++ b/src/engine/client/application/WorldSnapshotViewer/build/win32/WorldSnapshotViewer.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static Unicode diff --git a/src/engine/client/library/clientAnimation/build/win32/clientAnimation.vcxproj b/src/engine/client/library/clientAnimation/build/win32/clientAnimation.vcxproj index 81d39e4ac..e8a9949f9 100644 --- a/src/engine/client/library/clientAnimation/build/win32/clientAnimation.vcxproj +++ b/src/engine/client/library/clientAnimation/build/win32/clientAnimation.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientAudio/build/win32/clientAudio.vcxproj b/src/engine/client/library/clientAudio/build/win32/clientAudio.vcxproj index eaaac2ce1..72cbba6e9 100644 --- a/src/engine/client/library/clientAudio/build/win32/clientAudio.vcxproj +++ b/src/engine/client/library/clientAudio/build/win32/clientAudio.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte @@ -231,7 +231,6 @@ MaxSpeed - @@ -253,7 +252,6 @@ - diff --git a/src/engine/client/library/clientAudio/include/public/clientAudio/SwgAudioCapture.h b/src/engine/client/library/clientAudio/include/public/clientAudio/SwgAudioCapture.h deleted file mode 100644 index 79fe1df55..000000000 --- a/src/engine/client/library/clientAudio/include/public/clientAudio/SwgAudioCapture.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../src/win32/SwgAudioCapture.h" diff --git a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.cpp b/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.cpp deleted file mode 100644 index a401bf9ea..000000000 --- a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// ====================================================================== -// -// SwgAudioCapture.cpp -// copyright (c) 2009 Sony Online Entertainment -// -// ====================================================================== - -#include "clientAudio/FirstClientAudio.h" -#include "clientAudio/Audio.h" -#include "clientAudio/SwgAudioCapture.h" - -#if PRODUCTION == 0 - -namespace AudioCapture -{ - -SwgAudioCaptureManager& SwgAudioCaptureManager::GetInstance() -{ - static SwgAudioCaptureManager s_swgAudioCaptureManager; - return s_swgAudioCaptureManager; -} - -SwgAudioCaptureManager::SwgAudioCaptureManager() -{ -} - -SwgAudioCaptureManager::~SwgAudioCaptureManager() -{ -} - -bool SwgAudioCaptureManager::GetConfig(int& samplesPerSec, int& bitsPerSample, int& channels) -{ - return Audio::getAudioCaptureConfig(samplesPerSec, bitsPerSample, channels); -} - -bool SwgAudioCaptureManager::Start(ICallback* pCallback) -{ - return Audio::startAudioCapture(pCallback); -} - -void SwgAudioCaptureManager::Stop() -{ - Audio::stopAudioCapture(); -} - -} // AudioCapture - -#endif // PRODUCTION diff --git a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h b/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h deleted file mode 100644 index eaae0531e..000000000 --- a/src/engine/client/library/clientAudio/src/win32/SwgAudioCapture.h +++ /dev/null @@ -1,39 +0,0 @@ -// ====================================================================== -// -// SwgAudioCapture.h -// copyright (c) 2009 Sony Online Entertainment -// -// ====================================================================== - -#ifndef AUDIOCAPTURE_SWGAUDIOCAPTURE_H -#define AUDIOCAPTURE_SWGAUDIOCAPTURE_H - -#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" - -#if PRODUCTION == 0 - -#include "AudioCapture/AudioCapture.h" - -namespace AudioCapture -{ - -class SwgAudioCaptureManager : public IManager -{ -public: - static SwgAudioCaptureManager& GetInstance(); - // IManager - virtual bool GetConfig(int& samplesPerSec, int& bitsPerSample, int& channels); - virtual bool Start(ICallback* pCallback); - virtual void Stop(); -private: - SwgAudioCaptureManager(); - virtual ~SwgAudioCaptureManager(); - SwgAudioCaptureManager(const SwgAudioCaptureManager&); - SwgAudioCaptureManager& operator=(const SwgAudioCaptureManager&); -}; - -} // AudioCapture - -#endif // PRODUCTION - -#endif // AUDIOCAPTURE_SWGAUDIOCAPTURE_H diff --git a/src/engine/client/library/clientBugReporting/build/win32/clientBugReporting.vcxproj b/src/engine/client/library/clientBugReporting/build/win32/clientBugReporting.vcxproj index 6a4951653..9f5119398 100644 --- a/src/engine/client/library/clientBugReporting/build/win32/clientBugReporting.vcxproj +++ b/src/engine/client/library/clientBugReporting/build/win32/clientBugReporting.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientDirectInput/build/win32/clientDirectInput.vcxproj b/src/engine/client/library/clientDirectInput/build/win32/clientDirectInput.vcxproj index 48e16ee13..294f8c064 100644 --- a/src/engine/client/library/clientDirectInput/build/win32/clientDirectInput.vcxproj +++ b/src/engine/client/library/clientDirectInput/build/win32/clientDirectInput.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientGame/build/win32/clientGame.vcxproj b/src/engine/client/library/clientGame/build/win32/clientGame.vcxproj index 6045d35d2..87b7329ba 100644 --- a/src/engine/client/library/clientGame/build/win32/clientGame.vcxproj +++ b/src/engine/client/library/clientGame/build/win32/clientGame.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientGame/src/shared/core/Game.cpp b/src/engine/client/library/clientGame/src/shared/core/Game.cpp index beec69d2e..13bebcd9b 100644 --- a/src/engine/client/library/clientGame/src/shared/core/Game.cpp +++ b/src/engine/client/library/clientGame/src/shared/core/Game.cpp @@ -15,7 +15,6 @@ #include "clientAudio/Sound2.h" #include "clientAudio/SoundTemplate.h" #include "clientAudio/SoundTemplateList.h" -#include "clientAudio/SwgAudioCapture.h" #include "clientDirectInput/DirectInput.h" #include "clientGame/AuctionManagerClient.h" #include "clientGame/CellObject.h" @@ -263,7 +262,7 @@ namespace GameNamespace { if (m_deferred) { - endDeferredCreation(); + MultiPlayerSceneCreator::endDeferredCreation(); } delete [] m_templateName; } @@ -1659,7 +1658,7 @@ void Game::_getCutSceneFromTerrainFilename(char *o_name, const char *terrainFile std::string sceneId = Game::getSceneIdFromTerrainFilename(terrainFileName); const BuildoutArea *buildoutArea = SharedBuildoutAreaManager::findBuildoutAreaAtPosition(sceneId.c_str(), startPosition.x, startPosition.z, false); - const char *cutScene=0; + const char *cutScene; if (buildoutArea) { cutScene=CutScene::lookupCutScene(buildoutArea->areaName.c_str()); diff --git a/src/engine/client/library/clientGraphics/build/win32/clientGraphics.vcxproj b/src/engine/client/library/clientGraphics/build/win32/clientGraphics.vcxproj index 7bafc6db5..797cbc556 100644 --- a/src/engine/client/library/clientGraphics/build/win32/clientGraphics.vcxproj +++ b/src/engine/client/library/clientGraphics/build/win32/clientGraphics.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientObject/build/win32/clientObject.vcxproj b/src/engine/client/library/clientObject/build/win32/clientObject.vcxproj index ef05d89f4..c0f15ae03 100644 --- a/src/engine/client/library/clientObject/build/win32/clientObject.vcxproj +++ b/src/engine/client/library/clientObject/build/win32/clientObject.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientParticle/build/win32/clientParticle.vcxproj b/src/engine/client/library/clientParticle/build/win32/clientParticle.vcxproj index bf4a84840..bb6b15336 100644 --- a/src/engine/client/library/clientParticle/build/win32/clientParticle.vcxproj +++ b/src/engine/client/library/clientParticle/build/win32/clientParticle.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientSkeletalAnimation/build/win32/clientSkeletalAnimation.vcxproj b/src/engine/client/library/clientSkeletalAnimation/build/win32/clientSkeletalAnimation.vcxproj index 8c461dc35..14f484e1a 100644 --- a/src/engine/client/library/clientSkeletalAnimation/build/win32/clientSkeletalAnimation.vcxproj +++ b/src/engine/client/library/clientSkeletalAnimation/build/win32/clientSkeletalAnimation.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientTerrain/build/win32/clientTerrain.vcxproj b/src/engine/client/library/clientTerrain/build/win32/clientTerrain.vcxproj index 0d6fd1ee7..0e6895100 100644 --- a/src/engine/client/library/clientTerrain/build/win32/clientTerrain.vcxproj +++ b/src/engine/client/library/clientTerrain/build/win32/clientTerrain.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientTextureRenderer/build/win32/clientTextureRenderer.vcxproj b/src/engine/client/library/clientTextureRenderer/build/win32/clientTextureRenderer.vcxproj index 91cbb2968..631205565 100644 --- a/src/engine/client/library/clientTextureRenderer/build/win32/clientTextureRenderer.vcxproj +++ b/src/engine/client/library/clientTextureRenderer/build/win32/clientTextureRenderer.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/client/library/clientUserInterface/build/win32/clientUserInterface.vcxproj b/src/engine/client/library/clientUserInterface/build/win32/clientUserInterface.vcxproj index 7517ee55b..6dbf60b97 100644 --- a/src/engine/client/library/clientUserInterface/build/win32/clientUserInterface.vcxproj +++ b/src/engine/client/library/clientUserInterface/build/win32/clientUserInterface.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/ArmorExporterTool/build/win32/ArmorExporterTool.vcxproj b/src/engine/shared/application/ArmorExporterTool/build/win32/ArmorExporterTool.vcxproj index ee04b2a00..d3592d8b9 100644 --- a/src/engine/shared/application/ArmorExporterTool/build/win32/ArmorExporterTool.vcxproj +++ b/src/engine/shared/application/ArmorExporterTool/build/win32/ArmorExporterTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/CoreWeaponExporterTool/build/win32/CoreWeaponExporterTool.vcxproj b/src/engine/shared/application/CoreWeaponExporterTool/build/win32/CoreWeaponExporterTool.vcxproj index cbcc56b39..f1751ecc3 100644 --- a/src/engine/shared/application/CoreWeaponExporterTool/build/win32/CoreWeaponExporterTool.vcxproj +++ b/src/engine/shared/application/CoreWeaponExporterTool/build/win32/CoreWeaponExporterTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/DataLintRspBuilder/build/win32/DataLintRspBuilder.vcxproj b/src/engine/shared/application/DataLintRspBuilder/build/win32/DataLintRspBuilder.vcxproj index f269ccc89..926ecda07 100644 --- a/src/engine/shared/application/DataLintRspBuilder/build/win32/DataLintRspBuilder.vcxproj +++ b/src/engine/shared/application/DataLintRspBuilder/build/win32/DataLintRspBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/DataTableTool/build/win32/DataTableTool.vcxproj b/src/engine/shared/application/DataTableTool/build/win32/DataTableTool.vcxproj index 9100e434b..c21be2880 100644 --- a/src/engine/shared/application/DataTableTool/build/win32/DataTableTool.vcxproj +++ b/src/engine/shared/application/DataTableTool/build/win32/DataTableTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/LabelHashTool/build/win32/LabelHashTool.vcxproj b/src/engine/shared/application/LabelHashTool/build/win32/LabelHashTool.vcxproj index 282217b07..0d5e24fdf 100644 --- a/src/engine/shared/application/LabelHashTool/build/win32/LabelHashTool.vcxproj +++ b/src/engine/shared/application/LabelHashTool/build/win32/LabelHashTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/Md5sum/build/win32/Md5sum.vcxproj b/src/engine/shared/application/Md5sum/build/win32/Md5sum.vcxproj index db8eb5e16..6adb46e03 100644 --- a/src/engine/shared/application/Md5sum/build/win32/Md5sum.vcxproj +++ b/src/engine/shared/application/Md5sum/build/win32/Md5sum.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj index 8dd7e7ae0..5f5431948 100644 --- a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj +++ b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/StringFileTool/build/win32/StringFileTool.vcxproj b/src/engine/shared/application/StringFileTool/build/win32/StringFileTool.vcxproj index d4a7da522..40149222c 100644 --- a/src/engine/shared/application/StringFileTool/build/win32/StringFileTool.vcxproj +++ b/src/engine/shared/application/StringFileTool/build/win32/StringFileTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/engine/shared/application/TemplateCompiler/build/win32/TemplateCompiler.vcxproj b/src/engine/shared/application/TemplateCompiler/build/win32/TemplateCompiler.vcxproj index 6edab36f8..575d7bddd 100644 --- a/src/engine/shared/application/TemplateCompiler/build/win32/TemplateCompiler.vcxproj +++ b/src/engine/shared/application/TemplateCompiler/build/win32/TemplateCompiler.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/TemplateDefinitionCompiler/build/win32/TemplateDefinitionCompiler.vcxproj b/src/engine/shared/application/TemplateDefinitionCompiler/build/win32/TemplateDefinitionCompiler.vcxproj index a25f7fcaa..ba973fefa 100644 --- a/src/engine/shared/application/TemplateDefinitionCompiler/build/win32/TemplateDefinitionCompiler.vcxproj +++ b/src/engine/shared/application/TemplateDefinitionCompiler/build/win32/TemplateDefinitionCompiler.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/TreeFileBuilder/build/win32/TreeFileBuilder.vcxproj b/src/engine/shared/application/TreeFileBuilder/build/win32/TreeFileBuilder.vcxproj index 06950b057..8ff38062e 100644 --- a/src/engine/shared/application/TreeFileBuilder/build/win32/TreeFileBuilder.vcxproj +++ b/src/engine/shared/application/TreeFileBuilder/build/win32/TreeFileBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/TreeFileExtractor/build/win32/TreeFileExtractor.vcxproj b/src/engine/shared/application/TreeFileExtractor/build/win32/TreeFileExtractor.vcxproj index c99f9677f..c8eed247d 100644 --- a/src/engine/shared/application/TreeFileExtractor/build/win32/TreeFileExtractor.vcxproj +++ b/src/engine/shared/application/TreeFileExtractor/build/win32/TreeFileExtractor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/TreeFileRspBuilder/build/win32/TreeFileRspBuilder.vcxproj b/src/engine/shared/application/TreeFileRspBuilder/build/win32/TreeFileRspBuilder.vcxproj index 162cd7106..078044192 100644 --- a/src/engine/shared/application/TreeFileRspBuilder/build/win32/TreeFileRspBuilder.vcxproj +++ b/src/engine/shared/application/TreeFileRspBuilder/build/win32/TreeFileRspBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/Turf/build/win32/Turf.vcxproj b/src/engine/shared/application/Turf/build/win32/Turf.vcxproj index 699ca8c26..2f040a4ad 100644 --- a/src/engine/shared/application/Turf/build/win32/Turf.vcxproj +++ b/src/engine/shared/application/Turf/build/win32/Turf.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/UpdateLocalizedStrings/build/win32/UpdateLocalizedStrings.vcxproj b/src/engine/shared/application/UpdateLocalizedStrings/build/win32/UpdateLocalizedStrings.vcxproj index e8e74554a..021865dcb 100644 --- a/src/engine/shared/application/UpdateLocalizedStrings/build/win32/UpdateLocalizedStrings.vcxproj +++ b/src/engine/shared/application/UpdateLocalizedStrings/build/win32/UpdateLocalizedStrings.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/WeaponExporterTool/build/win32/WeaponExporterTool.vcxproj b/src/engine/shared/application/WeaponExporterTool/build/win32/WeaponExporterTool.vcxproj index 519421b58..0c62510fa 100644 --- a/src/engine/shared/application/WeaponExporterTool/build/win32/WeaponExporterTool.vcxproj +++ b/src/engine/shared/application/WeaponExporterTool/build/win32/WeaponExporterTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/application/WordCountTool/build/win32/WordCountTool.vcxproj b/src/engine/shared/application/WordCountTool/build/win32/WordCountTool.vcxproj index 2fa1ca86a..4ba90ad39 100644 --- a/src/engine/shared/application/WordCountTool/build/win32/WordCountTool.vcxproj +++ b/src/engine/shared/application/WordCountTool/build/win32/WordCountTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj b/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj index 0fce68e1f..bba1a2b31 100644 --- a/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj +++ b/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte @@ -211,9 +211,6 @@ MaxSpeed - - MaxSpeed - MaxSpeed @@ -365,7 +362,6 @@ - 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 7e4256124..c97710ba0 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp @@ -905,10 +905,6 @@ bool VertexSorterX ( Vector const & A, Vector const & B ) return A.x < B.x; } -void BuildConvexHull ( VertexList const & verts, VertexList & outPoly ) -{ -} - // ---------------------------------------------------------------------- // 3-d exit test diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp deleted file mode 100644 index f8d3ef001..000000000 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// ====================================================================== -// -// CollisionVolume.cpp -// copyright (c) 2001 Sony Online Entertainment -// -// ====================================================================== - -#include "sharedCollision/FirstSharedCollision.h" diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h deleted file mode 100644 index afb2324ec..000000000 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h +++ /dev/null @@ -1,39 +0,0 @@ -// ====================================================================== -// -// CollisionVolume.h -// copyright (c) 2001 Sony Online Entertainment -// -// ====================================================================== - -#ifndef INCLUDED_CollisionVolume_H -#define INCLUDED_CollisionVolume_H - -// ====================================================================== - -class Vector; - -// ====================================================================== - -class CollisionVolume -{ -public: - - CollisionVolume(); - virtual ~CollisionVolume(); - - // ---------- - // Generic interface - - bool contains ( Vector const & V ); - -protected: - - // Disable copying - - CollisionVolume(const CollisionVolume &source); - CollisionVolume & operator =(const CollisionVolume &source); -}; - -// ---------------------------------------------------------------------- - -#endif diff --git a/src/engine/shared/library/sharedCommandParser/build/win32/sharedCommandParser.vcxproj b/src/engine/shared/library/sharedCommandParser/build/win32/sharedCommandParser.vcxproj index 2ea4b30a4..908c65d89 100644 --- a/src/engine/shared/library/sharedCommandParser/build/win32/sharedCommandParser.vcxproj +++ b/src/engine/shared/library/sharedCommandParser/build/win32/sharedCommandParser.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedCompression/build/win32/sharedCompression.vcxproj b/src/engine/shared/library/sharedCompression/build/win32/sharedCompression.vcxproj index e98756c9e..8da73c5c1 100644 --- a/src/engine/shared/library/sharedCompression/build/win32/sharedCompression.vcxproj +++ b/src/engine/shared/library/sharedCompression/build/win32/sharedCompression.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedDatabaseInterface/build/win32/sharedDatabaseInterface.vcxproj b/src/engine/shared/library/sharedDatabaseInterface/build/win32/sharedDatabaseInterface.vcxproj index 8d0096c5e..ee3927872 100644 --- a/src/engine/shared/library/sharedDatabaseInterface/build/win32/sharedDatabaseInterface.vcxproj +++ b/src/engine/shared/library/sharedDatabaseInterface/build/win32/sharedDatabaseInterface.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedDebug/build/win32/sharedDebug.vcxproj b/src/engine/shared/library/sharedDebug/build/win32/sharedDebug.vcxproj index 3923ca265..817ead390 100644 --- a/src/engine/shared/library/sharedDebug/build/win32/sharedDebug.vcxproj +++ b/src/engine/shared/library/sharedDebug/build/win32/sharedDebug.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedFile/build/win32/sharedFile.vcxproj b/src/engine/shared/library/sharedFile/build/win32/sharedFile.vcxproj index 8eab3e853..e85037f47 100644 --- a/src/engine/shared/library/sharedFile/build/win32/sharedFile.vcxproj +++ b/src/engine/shared/library/sharedFile/build/win32/sharedFile.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedFoundation/build/win32/sharedFoundation.vcxproj b/src/engine/shared/library/sharedFoundation/build/win32/sharedFoundation.vcxproj index 2b161de38..e97ebb96e 100644 --- a/src/engine/shared/library/sharedFoundation/build/win32/sharedFoundation.vcxproj +++ b/src/engine/shared/library/sharedFoundation/build/win32/sharedFoundation.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.cpp b/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.cpp index 7b2d0b584..4f49a0ae4 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.cpp +++ b/src/engine/shared/library/sharedFoundation/src/win32/PerThreadData.cpp @@ -16,7 +16,7 @@ #include "sharedFoundation/Os.h" -#include +#include #include // ====================================================================== diff --git a/src/engine/shared/library/sharedFoundationTypes/build/win32/sharedFoundationTypes.vcxproj b/src/engine/shared/library/sharedFoundationTypes/build/win32/sharedFoundationTypes.vcxproj index 0e13c8aa7..8b1514641 100644 --- a/src/engine/shared/library/sharedFoundationTypes/build/win32/sharedFoundationTypes.vcxproj +++ b/src/engine/shared/library/sharedFoundationTypes/build/win32/sharedFoundationTypes.vcxproj @@ -21,19 +21,19 @@ Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedFractal/build/win32/sharedFractal.vcxproj b/src/engine/shared/library/sharedFractal/build/win32/sharedFractal.vcxproj index 65bab86ef..2c8c2e805 100644 --- a/src/engine/shared/library/sharedFractal/build/win32/sharedFractal.vcxproj +++ b/src/engine/shared/library/sharedFractal/build/win32/sharedFractal.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedGame/build/win32/sharedGame.vcxproj b/src/engine/shared/library/sharedGame/build/win32/sharedGame.vcxproj index 0b08ba853..abac06c01 100644 --- a/src/engine/shared/library/sharedGame/build/win32/sharedGame.vcxproj +++ b/src/engine/shared/library/sharedGame/build/win32/sharedGame.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedImage/build/win32/sharedImage.vcxproj b/src/engine/shared/library/sharedImage/build/win32/sharedImage.vcxproj index 4849f0fb8..1cdf957e9 100644 --- a/src/engine/shared/library/sharedImage/build/win32/sharedImage.vcxproj +++ b/src/engine/shared/library/sharedImage/build/win32/sharedImage.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedInputMap/build/win32/sharedInputMap.vcxproj b/src/engine/shared/library/sharedInputMap/build/win32/sharedInputMap.vcxproj index b10bed8d2..672f554d4 100644 --- a/src/engine/shared/library/sharedInputMap/build/win32/sharedInputMap.vcxproj +++ b/src/engine/shared/library/sharedInputMap/build/win32/sharedInputMap.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedIoWin/build/win32/sharedIoWin.vcxproj b/src/engine/shared/library/sharedIoWin/build/win32/sharedIoWin.vcxproj index f02f2ee9d..4df261d68 100644 --- a/src/engine/shared/library/sharedIoWin/build/win32/sharedIoWin.vcxproj +++ b/src/engine/shared/library/sharedIoWin/build/win32/sharedIoWin.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedLog/build/win32/sharedLog.vcxproj b/src/engine/shared/library/sharedLog/build/win32/sharedLog.vcxproj index 96c87f6d7..e54b2f21a 100644 --- a/src/engine/shared/library/sharedLog/build/win32/sharedLog.vcxproj +++ b/src/engine/shared/library/sharedLog/build/win32/sharedLog.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj b/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj index 20f7262fa..e5f34646b 100644 --- a/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj +++ b/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedMathArchive/build/win32/sharedMathArchive.vcxproj b/src/engine/shared/library/sharedMathArchive/build/win32/sharedMathArchive.vcxproj index 21f51509b..e0d376cc8 100644 --- a/src/engine/shared/library/sharedMathArchive/build/win32/sharedMathArchive.vcxproj +++ b/src/engine/shared/library/sharedMathArchive/build/win32/sharedMathArchive.vcxproj @@ -21,19 +21,19 @@ Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedMemoryManager/build/win32/sharedMemoryManager.vcxproj b/src/engine/shared/library/sharedMemoryManager/build/win32/sharedMemoryManager.vcxproj index 5e6a52318..252788579 100644 --- a/src/engine/shared/library/sharedMemoryManager/build/win32/sharedMemoryManager.vcxproj +++ b/src/engine/shared/library/sharedMemoryManager/build/win32/sharedMemoryManager.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedMessageDispatch/build/win32/sharedMessageDispatch.vcxproj b/src/engine/shared/library/sharedMessageDispatch/build/win32/sharedMessageDispatch.vcxproj index eeb28ff3a..e7b068cd7 100644 --- a/src/engine/shared/library/sharedMessageDispatch/build/win32/sharedMessageDispatch.vcxproj +++ b/src/engine/shared/library/sharedMessageDispatch/build/win32/sharedMessageDispatch.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedNetwork/build/win32/sharedNetwork.vcxproj b/src/engine/shared/library/sharedNetwork/build/win32/sharedNetwork.vcxproj index 1d6ea8180..e1b5dabcd 100644 --- a/src/engine/shared/library/sharedNetwork/build/win32/sharedNetwork.vcxproj +++ b/src/engine/shared/library/sharedNetwork/build/win32/sharedNetwork.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedNetworkMessages/build/win32/sharedNetworkMessages.vcxproj b/src/engine/shared/library/sharedNetworkMessages/build/win32/sharedNetworkMessages.vcxproj index 29ca8df98..629f2990d 100644 --- a/src/engine/shared/library/sharedNetworkMessages/build/win32/sharedNetworkMessages.vcxproj +++ b/src/engine/shared/library/sharedNetworkMessages/build/win32/sharedNetworkMessages.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedObject/build/win32/sharedObject.vcxproj b/src/engine/shared/library/sharedObject/build/win32/sharedObject.vcxproj index 6b9dc5da9..c9b488599 100644 --- a/src/engine/shared/library/sharedObject/build/win32/sharedObject.vcxproj +++ b/src/engine/shared/library/sharedObject/build/win32/sharedObject.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedPathfinding/build/win32/sharedPathfinding.vcxproj b/src/engine/shared/library/sharedPathfinding/build/win32/sharedPathfinding.vcxproj index ff49da4b2..5b28890bf 100644 --- a/src/engine/shared/library/sharedPathfinding/build/win32/sharedPathfinding.vcxproj +++ b/src/engine/shared/library/sharedPathfinding/build/win32/sharedPathfinding.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedRandom/build/win32/sharedRandom.vcxproj b/src/engine/shared/library/sharedRandom/build/win32/sharedRandom.vcxproj index 94249c35d..eeecd1fc8 100644 --- a/src/engine/shared/library/sharedRandom/build/win32/sharedRandom.vcxproj +++ b/src/engine/shared/library/sharedRandom/build/win32/sharedRandom.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedRegex/build/win32/sharedRegex.vcxproj b/src/engine/shared/library/sharedRegex/build/win32/sharedRegex.vcxproj index 5f167db51..4d86198ad 100644 --- a/src/engine/shared/library/sharedRegex/build/win32/sharedRegex.vcxproj +++ b/src/engine/shared/library/sharedRegex/build/win32/sharedRegex.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedRemoteDebugServer/build/win32/sharedRemoteDebugServer.vcxproj b/src/engine/shared/library/sharedRemoteDebugServer/build/win32/sharedRemoteDebugServer.vcxproj index fea5c8842..59d24b91d 100644 --- a/src/engine/shared/library/sharedRemoteDebugServer/build/win32/sharedRemoteDebugServer.vcxproj +++ b/src/engine/shared/library/sharedRemoteDebugServer/build/win32/sharedRemoteDebugServer.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedSkillSystem/build/win32/sharedSkillSystem.vcxproj b/src/engine/shared/library/sharedSkillSystem/build/win32/sharedSkillSystem.vcxproj index edbc26e18..d18d245e0 100644 --- a/src/engine/shared/library/sharedSkillSystem/build/win32/sharedSkillSystem.vcxproj +++ b/src/engine/shared/library/sharedSkillSystem/build/win32/sharedSkillSystem.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedStatusWindow/build/win32/sharedStatusWindow.vcxproj b/src/engine/shared/library/sharedStatusWindow/build/win32/sharedStatusWindow.vcxproj index 2817f24a8..935419c72 100644 --- a/src/engine/shared/library/sharedStatusWindow/build/win32/sharedStatusWindow.vcxproj +++ b/src/engine/shared/library/sharedStatusWindow/build/win32/sharedStatusWindow.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedSwitcher/build/win32/sharedSwitcher.vcxproj b/src/engine/shared/library/sharedSwitcher/build/win32/sharedSwitcher.vcxproj index 2cf464bc2..9be2a16fc 100644 --- a/src/engine/shared/library/sharedSwitcher/build/win32/sharedSwitcher.vcxproj +++ b/src/engine/shared/library/sharedSwitcher/build/win32/sharedSwitcher.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedSynchronization/build/win32/sharedSynchronization.vcxproj b/src/engine/shared/library/sharedSynchronization/build/win32/sharedSynchronization.vcxproj index ed2f74944..563ea4e42 100644 --- a/src/engine/shared/library/sharedSynchronization/build/win32/sharedSynchronization.vcxproj +++ b/src/engine/shared/library/sharedSynchronization/build/win32/sharedSynchronization.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedTemplate/build/win32/sharedTemplate.vcxproj b/src/engine/shared/library/sharedTemplate/build/win32/sharedTemplate.vcxproj index a3cfd27d4..041f09f31 100644 --- a/src/engine/shared/library/sharedTemplate/build/win32/sharedTemplate.vcxproj +++ b/src/engine/shared/library/sharedTemplate/build/win32/sharedTemplate.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedTemplateDefinition/build/win32/sharedTemplateDefinition.vcxproj b/src/engine/shared/library/sharedTemplateDefinition/build/win32/sharedTemplateDefinition.vcxproj index 96655b090..93fd896f7 100644 --- a/src/engine/shared/library/sharedTemplateDefinition/build/win32/sharedTemplateDefinition.vcxproj +++ b/src/engine/shared/library/sharedTemplateDefinition/build/win32/sharedTemplateDefinition.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedTerrain/build/win32/sharedTerrain.vcxproj b/src/engine/shared/library/sharedTerrain/build/win32/sharedTerrain.vcxproj index 2c4e9f607..165e64201 100644 --- a/src/engine/shared/library/sharedTerrain/build/win32/sharedTerrain.vcxproj +++ b/src/engine/shared/library/sharedTerrain/build/win32/sharedTerrain.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedThread/build/win32/sharedThread.vcxproj b/src/engine/shared/library/sharedThread/build/win32/sharedThread.vcxproj index 94fe47cbc..efa323985 100644 --- a/src/engine/shared/library/sharedThread/build/win32/sharedThread.vcxproj +++ b/src/engine/shared/library/sharedThread/build/win32/sharedThread.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedUtility/build/win32/sharedUtility.vcxproj b/src/engine/shared/library/sharedUtility/build/win32/sharedUtility.vcxproj index 37bafe0a8..834a128b4 100644 --- a/src/engine/shared/library/sharedUtility/build/win32/sharedUtility.vcxproj +++ b/src/engine/shared/library/sharedUtility/build/win32/sharedUtility.vcxproj @@ -22,19 +22,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/engine/shared/library/sharedXml/build/win32/sharedXml.vcxproj b/src/engine/shared/library/sharedXml/build/win32/sharedXml.vcxproj index 16f0572b1..f709d99fa 100644 --- a/src/engine/shared/library/sharedXml/build/win32/sharedXml.vcxproj +++ b/src/engine/shared/library/sharedXml/build/win32/sharedXml.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj index 12dcc7e2e..7ba99b6e7 100644 --- a/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj +++ b/src/external/3rd/application/UiBuilder/UIBuilder.vcxproj @@ -17,13 +17,13 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj index 9c6f9e743..b78c0d603 100644 --- a/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj +++ b/src/external/3rd/application/UiFontBuilder/UIFontBuilder.vcxproj @@ -17,13 +17,13 @@ Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 Static Unicode diff --git a/src/external/3rd/library/blat194/build/win32/blat.vcxproj b/src/external/3rd/library/blat194/build/win32/blat.vcxproj index ad4515f04..fd49b4254 100644 --- a/src/external/3rd/library/blat194/build/win32/blat.vcxproj +++ b/src/external/3rd/library/blat194/build/win32/blat.vcxproj @@ -20,19 +20,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj index 9c99cba59..555b44099 100644 --- a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj +++ b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj @@ -20,17 +20,17 @@ DynamicLibrary - v120_xp + v120 false DynamicLibrary - v120_xp + v120 false DynamicLibrary - v120_xp + v120 false diff --git a/src/external/3rd/library/lcdui_src/build/win32/lcdui.vcxproj b/src/external/3rd/library/lcdui_src/build/win32/lcdui.vcxproj index a55654253..ea9dc608c 100644 --- a/src/external/3rd/library/lcdui_src/build/win32/lcdui.vcxproj +++ b/src/external/3rd/library/lcdui_src/build/win32/lcdui.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/libEverQuestTCG/build/win32/libEverQuestTCG.vcxproj b/src/external/3rd/library/libEverQuestTCG/build/win32/libEverQuestTCG.vcxproj index adf4ba9a8..8303eeb68 100644 --- a/src/external/3rd/library/libEverQuestTCG/build/win32/libEverQuestTCG.vcxproj +++ b/src/external/3rd/library/libEverQuestTCG/build/win32/libEverQuestTCG.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/libMozilla/build/win32/libMozilla.vcxproj b/src/external/3rd/library/libMozilla/build/win32/libMozilla.vcxproj index f455f9a9a..66d162f1c 100644 --- a/src/external/3rd/library/libMozilla/build/win32/libMozilla.vcxproj +++ b/src/external/3rd/library/libMozilla/build/win32/libMozilla.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj index bba8ac85d..38b5502da 100644 --- a/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj +++ b/src/external/3rd/library/platform/projects/Session/CommonAPI/CommonAPI.vcxproj @@ -24,25 +24,25 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/platform/projects/Session/LoginAPI/LoginAPI.vcxproj b/src/external/3rd/library/platform/projects/Session/LoginAPI/LoginAPI.vcxproj index c9410c7ae..60f2573fe 100644 --- a/src/external/3rd/library/platform/projects/Session/LoginAPI/LoginAPI.vcxproj +++ b/src/external/3rd/library/platform/projects/Session/LoginAPI/LoginAPI.vcxproj @@ -24,25 +24,25 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj b/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj index 57bc5a06e..f1f7de256 100644 --- a/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj +++ b/src/external/3rd/library/platform/utils/Base/win32/Base.vcxproj @@ -24,25 +24,25 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/udplibrary/udplibrary.vcxproj b/src/external/3rd/library/udplibrary/udplibrary.vcxproj index 3058e8866..84a77a706 100644 --- a/src/external/3rd/library/udplibrary/udplibrary.vcxproj +++ b/src/external/3rd/library/udplibrary/udplibrary.vcxproj @@ -20,19 +20,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/ui/build/win32/ui.vcxproj b/src/external/3rd/library/ui/build/win32/ui.vcxproj index ce17d36a0..1af0d5bd7 100644 --- a/src/external/3rd/library/ui/build/win32/ui.vcxproj +++ b/src/external/3rd/library/ui/build/win32/ui.vcxproj @@ -20,19 +20,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/3rd/library/zlib-1.2.3/zlib.vcxproj b/src/external/3rd/library/zlib-1.2.3/zlib.vcxproj index d15de9d8f..832714b27 100644 --- a/src/external/3rd/library/zlib-1.2.3/zlib.vcxproj +++ b/src/external/3rd/library/zlib-1.2.3/zlib.vcxproj @@ -18,13 +18,13 @@ StaticLibrary - v120_xp + v120 MultiByte false StaticLibrary - v120_xp + v120 MultiByte false diff --git a/src/external/ours/application/LocalizationTool/build/win32/LocalizationTool.vcxproj b/src/external/ours/application/LocalizationTool/build/win32/LocalizationTool.vcxproj index ce2bb2481..0efa24fa9 100644 --- a/src/external/ours/application/LocalizationTool/build/win32/LocalizationTool.vcxproj +++ b/src/external/ours/application/LocalizationTool/build/win32/LocalizationTool.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/external/ours/application/LocalizationToolCon/build/win32/LocalizationToolCon.vcxproj b/src/external/ours/application/LocalizationToolCon/build/win32/LocalizationToolCon.vcxproj index 6fe536f3a..2afb06b21 100644 --- a/src/external/ours/application/LocalizationToolCon/build/win32/LocalizationToolCon.vcxproj +++ b/src/external/ours/application/LocalizationToolCon/build/win32/LocalizationToolCon.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/archive/build/win32/archive.vcxproj b/src/external/ours/library/archive/build/win32/archive.vcxproj index 7a464d36a..37ba0499b 100644 --- a/src/external/ours/library/archive/build/win32/archive.vcxproj +++ b/src/external/ours/library/archive/build/win32/archive.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/crypto/build/win32/crypto.vcxproj b/src/external/ours/library/crypto/build/win32/crypto.vcxproj index 3e78555ad..0fb74a2b5 100644 --- a/src/external/ours/library/crypto/build/win32/crypto.vcxproj +++ b/src/external/ours/library/crypto/build/win32/crypto.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/fileInterface/build/win32/fileInterface.vcxproj b/src/external/ours/library/fileInterface/build/win32/fileInterface.vcxproj index dc28b31b6..7a7d3d8b9 100644 --- a/src/external/ours/library/fileInterface/build/win32/fileInterface.vcxproj +++ b/src/external/ours/library/fileInterface/build/win32/fileInterface.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/localization/build/win32/localization.vcxproj b/src/external/ours/library/localization/build/win32/localization.vcxproj index 49effebde..39f8daa82 100644 --- a/src/external/ours/library/localization/build/win32/localization.vcxproj +++ b/src/external/ours/library/localization/build/win32/localization.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/localizationArchive/build/win32/localizationArchive.vcxproj b/src/external/ours/library/localizationArchive/build/win32/localizationArchive.vcxproj index 3aeece3c8..688b0a3d6 100644 --- a/src/external/ours/library/localizationArchive/build/win32/localizationArchive.vcxproj +++ b/src/external/ours/library/localizationArchive/build/win32/localizationArchive.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/singleton/build/win32/singleton.vcxproj b/src/external/ours/library/singleton/build/win32/singleton.vcxproj index af3502fa3..9ae9c17dc 100644 --- a/src/external/ours/library/singleton/build/win32/singleton.vcxproj +++ b/src/external/ours/library/singleton/build/win32/singleton.vcxproj @@ -21,19 +21,19 @@ Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte Utility - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/unicode/build/win32/unicode.vcxproj b/src/external/ours/library/unicode/build/win32/unicode.vcxproj index afddbced2..d4bd0923c 100644 --- a/src/external/ours/library/unicode/build/win32/unicode.vcxproj +++ b/src/external/ours/library/unicode/build/win32/unicode.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/external/ours/library/unicodeArchive/build/win32/unicodeArchive.vcxproj b/src/external/ours/library/unicodeArchive/build/win32/unicodeArchive.vcxproj index 5f26d0f50..83b3704d0 100644 --- a/src/external/ours/library/unicodeArchive/build/win32/unicodeArchive.vcxproj +++ b/src/external/ours/library/unicodeArchive/build/win32/unicodeArchive.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj b/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj index 1d6dc88cb..734d94d2a 100644 --- a/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj +++ b/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp index 5b3e81a8b..398df86cf 100644 --- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp @@ -388,12 +388,6 @@ int ClientMain( CuiChatHistory::save(); CurrentUserOptionManager::save (); LocalMachineOptionManager::save (); - - // -- if player is a trial or rental player, launch the conversion web page - if ((Game::getSubscriptionFeatureBits() & ClientSubscriptionFeature::Base) == 0) - { - Game::externalCommand("npe_continue"); - } } } diff --git a/src/game/client/application/SwgClient/src/win32/WinMain.cpp b/src/game/client/application/SwgClient/src/win32/WinMain.cpp index b29dd0cba..bce6697c5 100644 --- a/src/game/client/application/SwgClient/src/win32/WinMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/WinMain.cpp @@ -69,32 +69,29 @@ static void SetDefaultMemoryManagerTargetSize() void externalCommandHandler(const char* command) { - if (strcmp(command, "npe_continue") == 0) + const StringId trialNagId("client", "npe_nag_url_trial"); + const StringId rentalNagId("client", "npe_nag_url_rental"); + + Unicode::String url; + + if ((Game::getSubscriptionFeatureBits() & ClientSubscriptionFeature::NPENagForTrial) != 0) { - const StringId trialNagId("client", "npe_nag_url_trial"); - const StringId rentalNagId("client", "npe_nag_url_rental"); + url = trialNagId.localize(); + } - Unicode::String url; + if (!url.empty()) + { + Unicode::NarrowString url8 = Unicode::wideToNarrow( url ); - if ((Game::getSubscriptionFeatureBits() & ClientSubscriptionFeature::NPENagForTrial) != 0) + HINSTANCE result = ShellExecute(NULL, "open", url8.c_str(), NULL, NULL, SW_SHOWNORMAL); + + if (reinterpret_cast(result) < 32) //Pulled straight from MSDN -ARH { - url = trialNagId.localize(); + WARNING(true, ("could not launch external application (%d)", reinterpret_cast(result))); } - - if (!url.empty()) + else { - Unicode::NarrowString url8 = Unicode::wideToNarrow( url ); - - HINSTANCE result = ShellExecute(NULL, "open", url8.c_str(), NULL, NULL, SW_SHOWNORMAL); - - if (reinterpret_cast(result) < 32) //Pulled straight from MSDN -ARH - { - WARNING(true, ("could not launch external application (%d)", reinterpret_cast(result))); - } - else - { - Game::quit(); - } + Game::quit(); } } } diff --git a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj index 4ec044655..c0445e3a9 100644 --- a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj +++ b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj @@ -17,13 +17,13 @@ Application - v120_xp + v120 Static Unicode Application - v120_xp + v120 false Unicode diff --git a/src/game/client/application/SwgGodClient/build/win32/SwgGodClient.vcxproj b/src/game/client/application/SwgGodClient/build/win32/SwgGodClient.vcxproj index f0d162a53..e4c5ae469 100644 --- a/src/game/client/application/SwgGodClient/build/win32/SwgGodClient.vcxproj +++ b/src/game/client/application/SwgGodClient/build/win32/SwgGodClient.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/game/client/library/swgClientQtWidgets/build/win32/swgClientQtWidgets.vcxproj b/src/game/client/library/swgClientQtWidgets/build/win32/swgClientQtWidgets.vcxproj index ab55e55ad..a80919a5d 100644 --- a/src/game/client/library/swgClientQtWidgets/build/win32/swgClientQtWidgets.vcxproj +++ b/src/game/client/library/swgClientQtWidgets/build/win32/swgClientQtWidgets.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/game/client/library/swgClientUserInterface/build/win32/swgClientUserInterface.vcxproj b/src/game/client/library/swgClientUserInterface/build/win32/swgClientUserInterface.vcxproj index 592b7d888..4f3329a3b 100644 --- a/src/game/client/library/swgClientUserInterface/build/win32/swgClientUserInterface.vcxproj +++ b/src/game/client/library/swgClientUserInterface/build/win32/swgClientUserInterface.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte @@ -603,9 +603,6 @@ MaxSpeed - - MaxSpeed - MaxSpeed @@ -1073,7 +1070,6 @@ - diff --git a/src/game/client/library/swgClientUserInterface/include/public/swgClientUserInterface/SwgCuiNpeContinuation.h b/src/game/client/library/swgClientUserInterface/include/public/swgClientUserInterface/SwgCuiNpeContinuation.h deleted file mode 100644 index 265195d36..000000000 --- a/src/game/client/library/swgClientUserInterface/include/public/swgClientUserInterface/SwgCuiNpeContinuation.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../src/shared/page/SwgCuiNpeContinuation.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp index f291ee5d0..8cafa46f2 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp @@ -93,7 +93,6 @@ #include "swgClientUserInterface/SwgCuiMissionDetails.h" #include "swgClientUserInterface/SwgCuiNetStatus.h" #include "swgClientUserInterface/SwgCuiNews.h" -#include "swgClientUserInterface/SwgCuiNpeContinuation.h" #include "swgClientUserInterface/SwgCuiOpt.h" #include "swgClientUserInterface/SwgCuiPersistentMessageBrowser.h" #include "swgClientUserInterface/SwgCuiPersistentMessageComposer.h" @@ -251,7 +250,6 @@ void SwgCuiMediatorFactorySetup::install () MAKE_SWG_CTOR_WS (DpsMeter, "/pda.dpsMeter"); MAKE_SWG_CTOR_WS (Roadmap, "/pda.Roadmap"); MAKE_SWG_CTOR_WS (LootBox, "/pda.lootbox"); - MAKE_SWG_CTOR_WS (NpeContinuation, "/pda.ShellBeach"); MAKE_SWG_CTOR_WS (KillMeter, "/pda.KillMeter"); MAKE_SWG_CTOR_WS (BuffBuilderBuffer, "/pda.BuffBuilder.buffer"); MAKE_SWG_CTOR_WS (BuffBuilderBuffee, "/pda.BuffBuilder.buffee"); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp index 1cd79035b..ae2eb5d3f 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp @@ -97,7 +97,6 @@ #include "swgClientUserInterface/SwgCuiLootBox.h" #include "swgClientUserInterface/SwgCuiMediatorTypes.h" #include "swgClientUserInterface/SwgCuiMissionBrowser.h" -#include "swgClientUserInterface/SwgCuiNpeContinuation.h" #include "swgClientUserInterface/SwgCuiPlayerQuestConversation.h" #include "swgClientUserInterface/SwgCuiQuestAcceptance.h" #include "swgClientUserInterface/SwgCuiQuestBuilder.h" diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.cpp deleted file mode 100644 index 48a5868ad..000000000 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.cpp +++ /dev/null @@ -1,96 +0,0 @@ -//====================================================================== -// -// SwgCuiNpeContinuation.cpp -// copyright (c) 2001 Sony Online Entertainment -// -//====================================================================== - -#include "swgClientUserInterface/FirstSwgClientUserInterface.h" -#include "swgClientUserInterface/SwgCuiNpeContinuation.h" - -#include "clientGame/Game.h" -#include "clientGame/PlayerObject.h" -#include "clientGame/RoadmapManager.h" -#include "clientUserInterface/CuiManager.h" -#include "UIButton.h" - -namespace SwgCuiNpeContinuationNamespace -{ - -} - -using namespace SwgCuiNpeContinuationNamespace; - -//---------------------------------------------------------------------- - -SwgCuiNpeContinuation::SwgCuiNpeContinuation (UIPage & page) : -CuiMediator ("SwgCuiNpeContinuation", page), -UIEventCallback (), -m_previewButton(0), -m_continueButton(0), -m_returnButton(0) -{ - getCodeDataObject (TUIButton, m_previewButton, "preview", true); - getCodeDataObject (TUIButton, m_continueButton, "continue", true); - getCodeDataObject (TUIButton, m_returnButton, "return", true); - getCodeDataObject (TUIButton, m_closeButton, "close", true); - - registerMediatorObject(*m_previewButton, true); - registerMediatorObject(*m_continueButton, true); - registerMediatorObject(*m_returnButton, true); - registerMediatorObject(*m_closeButton, true); - - //page can be closed - setState(MS_closeable); - setState(MS_closeDeactivates); -} - - -//---------------------------------------------------------------------- - -SwgCuiNpeContinuation::~SwgCuiNpeContinuation () -{ - m_previewButton = 0; - m_continueButton = 0; - m_returnButton = 0; - m_closeButton = 0; -} - -//---------------------------------------------------------------------- - -void SwgCuiNpeContinuation::performActivate() -{ - CuiManager::requestPointer (true); -} - -//---------------------------------------------------------------------- - -void SwgCuiNpeContinuation::performDeactivate() -{ - CuiManager::requestPointer (false); -} - -//---------------------------------------------------------------------- - -void SwgCuiNpeContinuation::OnButtonPressed (UIWidget *context) -{ - if (context == m_previewButton) - { - PlayerObject const * player = Game::getPlayerObject(); - std::string const &templ = player->getSkillTemplate(); - Game::playProfessionMovie( RoadmapManager::getRoadmapNameForTemplateName(templ).c_str() ); - } - else if (context == m_continueButton) - { - Game::externalCommand( "npe_continue" ); - } - else if (context == m_returnButton) - { - closeThroughWorkspace (); - } - else if (context == m_closeButton) - { - closeThroughWorkspace (); - } -} - diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.h deleted file mode 100644 index 9d318108a..000000000 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiNpeContinuation.h +++ /dev/null @@ -1,61 +0,0 @@ -//====================================================================== -// -// SwgCuiNpeContinuation.h -// copyright (c) 2001 Sony Online Entertainment -// -//====================================================================== - -#ifndef INCLUDED_SwgCuiNpeContinuation_H -#define INCLUDED_SwgCuiNpeContinuation_H - -//====================================================================== - -#include "swgClientUserInterface/FirstSwgClientUserInterface.h" -#include "swgClientUserInterface/SwgCuiNpeContinuation.h" - - -#include "clientUserInterface/CuiMediator.h" -#include "UIEventCallback.h" -#include "sharedMessageDispatch/Receiver.h" - -class ClientNotificationBoxMessage; - -namespace MessageDispatch -{ - class Emitter; - class Callback; -}; - -//---------------------------------------------------------------------- - -class SwgCuiNpeContinuation : -public CuiMediator, -public UIEventCallback -{ - -public: - explicit SwgCuiNpeContinuation (UIPage & page); - - void OnButtonPressed (UIWidget *context); - -protected: - - virtual void performActivate (); - virtual void performDeactivate (); - -private: - - SwgCuiNpeContinuation (); - SwgCuiNpeContinuation (const SwgCuiNpeContinuation &); - SwgCuiNpeContinuation &operator= (const SwgCuiNpeContinuation &); - - ~SwgCuiNpeContinuation (); - - UIButton *m_previewButton; - UIButton *m_continueButton; - UIButton *m_returnButton; - UIButton *m_closeButton; -}; -//====================================================================== - -#endif diff --git a/src/game/server/application/SwgContentBuilder/build/win32/SwgContentBuilder.vcxproj b/src/game/server/application/SwgContentBuilder/build/win32/SwgContentBuilder.vcxproj index 3243f624f..ee6bc89e4 100644 --- a/src/game/server/application/SwgContentBuilder/build/win32/SwgContentBuilder.vcxproj +++ b/src/game/server/application/SwgContentBuilder/build/win32/SwgContentBuilder.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/game/server/application/SwgConversationEditor/build/win32/SwgConversationEditor.vcxproj b/src/game/server/application/SwgConversationEditor/build/win32/SwgConversationEditor.vcxproj index 52dd2fd0a..88ee6fcfa 100644 --- a/src/game/server/application/SwgConversationEditor/build/win32/SwgConversationEditor.vcxproj +++ b/src/game/server/application/SwgConversationEditor/build/win32/SwgConversationEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/game/server/application/SwgDraftSchematicEditor/build/win32/SwgDraftSchematicEditor.vcxproj b/src/game/server/application/SwgDraftSchematicEditor/build/win32/SwgDraftSchematicEditor.vcxproj index 4175fd83e..d15b65690 100644 --- a/src/game/server/application/SwgDraftSchematicEditor/build/win32/SwgDraftSchematicEditor.vcxproj +++ b/src/game/server/application/SwgDraftSchematicEditor/build/win32/SwgDraftSchematicEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/game/server/application/SwgNameGenerator/build/win32/SwgNameGenerator.vcxproj b/src/game/server/application/SwgNameGenerator/build/win32/SwgNameGenerator.vcxproj index 33b0de5b5..cede43f52 100644 --- a/src/game/server/application/SwgNameGenerator/build/win32/SwgNameGenerator.vcxproj +++ b/src/game/server/application/SwgNameGenerator/build/win32/SwgNameGenerator.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/game/server/application/SwgSpaceQuestEditor/build/win32/SwgSpaceQuestEditor.vcxproj b/src/game/server/application/SwgSpaceQuestEditor/build/win32/SwgSpaceQuestEditor.vcxproj index 1b5c0cbef..0ce80e281 100644 --- a/src/game/server/application/SwgSpaceQuestEditor/build/win32/SwgSpaceQuestEditor.vcxproj +++ b/src/game/server/application/SwgSpaceQuestEditor/build/win32/SwgSpaceQuestEditor.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/game/server/application/SwgSpaceZoneEditor/build/win32/SwgSpaceZoneEditor.vcxproj b/src/game/server/application/SwgSpaceZoneEditor/build/win32/SwgSpaceZoneEditor.vcxproj index 8e8fc144e..878761c65 100644 --- a/src/game/server/application/SwgSpaceZoneEditor/build/win32/SwgSpaceZoneEditor.vcxproj +++ b/src/game/server/application/SwgSpaceZoneEditor/build/win32/SwgSpaceZoneEditor.vcxproj @@ -22,19 +22,19 @@ Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte Application - v120_xp + v120 Static MultiByte diff --git a/src/game/shared/application/SwgContentSync/build/win32/SwgContentSync.vcxproj b/src/game/shared/application/SwgContentSync/build/win32/SwgContentSync.vcxproj index 5c395357d..1b8d4537e 100644 --- a/src/game/shared/application/SwgContentSync/build/win32/SwgContentSync.vcxproj +++ b/src/game/shared/application/SwgContentSync/build/win32/SwgContentSync.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/game/shared/application/SwgLoadClient/build/win32/SwgLoadClient.vcxproj b/src/game/shared/application/SwgLoadClient/build/win32/SwgLoadClient.vcxproj index 64c55cf25..c53f46cce 100644 --- a/src/game/shared/application/SwgLoadClient/build/win32/SwgLoadClient.vcxproj +++ b/src/game/shared/application/SwgLoadClient/build/win32/SwgLoadClient.vcxproj @@ -21,19 +21,19 @@ Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte Application - v120_xp + v120 false MultiByte diff --git a/src/game/shared/library/swgSharedNetworkMessages/build/win32/swgSharedNetworkMessages.vcxproj b/src/game/shared/library/swgSharedNetworkMessages/build/win32/swgSharedNetworkMessages.vcxproj index d01d7dc47..f36ded0f6 100644 --- a/src/game/shared/library/swgSharedNetworkMessages/build/win32/swgSharedNetworkMessages.vcxproj +++ b/src/game/shared/library/swgSharedNetworkMessages/build/win32/swgSharedNetworkMessages.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte diff --git a/src/game/shared/library/swgSharedUtility/build/win32/swgSharedUtility.vcxproj b/src/game/shared/library/swgSharedUtility/build/win32/swgSharedUtility.vcxproj index aec490afa..0c7f0e301 100644 --- a/src/game/shared/library/swgSharedUtility/build/win32/swgSharedUtility.vcxproj +++ b/src/game/shared/library/swgSharedUtility/build/win32/swgSharedUtility.vcxproj @@ -21,19 +21,19 @@ StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte StaticLibrary - v120_xp + v120 false MultiByte