Allow building with VS2010 Express

Fix wrong include in pnDispatchCreatable.h
Fix Debug_Internal config for pfMoviePlayer
2025-07-15 10:54:18 +00:00 · 2024-08-10 20:11:38 -07:00 · 2024-08-10 20:11:38 -07:00 · 2024-08-10 20:11:37 -07:00 · 2024-08-10 20:11:37 -07:00 · 2024-08-10 20:11:37 -07:00
21 changed files with 833 additions and 84 deletions
--- a/Build/VS2010/Plasma/AllClient.sln
+++ b/Build/VS2010/Plasma/AllClient.sln
@ -228,6 +228,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfMoviePlayer", "FeatureLib
 		{B2270EDB-6E92-332F-60C8-255E8AF2CFFC} = {B2270EDB-6E92-332F-60C8-255E8AF2CFFC}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundDecompress", "Apps\SoundDecompress\SoundDecompress.vcxproj", "{885DFDA6-A470-4770-9035-64F6BAD39CE7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{59197414-421B-457E-A559-F6D875379603} = {59197414-421B-457E-A559-F6D875379603}
+		{EEFE2438-9F93-4C5C-B85D-6FDD431A1CF1} = {EEFE2438-9F93-4C5C-B85D-6FDD431A1CF1}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_Internal|Win32 = Debug_Internal|Win32
@ -1028,14 +1034,22 @@ Global
 		{84868043-5563-435A-A176-76A059653D5C}.Release_Internal|Win32.Build.0 = Release_Internal|Win32
 		{84868043-5563-435A-A176-76A059653D5C}.Release|Win32.ActiveCfg = Release|Win32
 		{84868043-5563-435A-A176-76A059653D5C}.Release|Win32.Build.0 = Release|Win32
-		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
-		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug_Internal|Win32.Build.0 = Debug|Win32
+		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
+		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Debug|Win32.Build.0 = Debug|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Release_Internal|Win32.ActiveCfg = Release_Internal|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Release_Internal|Win32.Build.0 = Release_Internal|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Release|Win32.ActiveCfg = Release|Win32
 		{90045C91-576B-4639-8C2F-A6B5B70EC6A1}.Release|Win32.Build.0 = Release|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Debug|Win32.Build.0 = Debug|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Release_Internal|Win32.ActiveCfg = Release_Internal|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Release_Internal|Win32.Build.0 = Release_Internal|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Release|Win32.ActiveCfg = Release|Win32
+		{885DFDA6-A470-4770-9035-64F6BAD39CE7}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Build/VS2010/Plasma/Apps/AllClient/AllClient.vcxproj
+++ b/Build/VS2010/Plasma/Apps/AllClient/AllClient.vcxproj
@ -111,6 +111,10 @@
      <LinkLibraryDependencies>true</LinkLibraryDependencies>
      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    </ProjectReference>
+    <ProjectReference Include="..\SoundDecompress\SoundDecompress.vcxproj">
+      <Project>{885DFDA6-A470-4770-9035-64F6BAD39CE7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/Build/VS2010/Plasma/Apps/SoundDecompress/SoundDecompress.vcxproj
+++ b/Build/VS2010/Plasma/Apps/SoundDecompress/SoundDecompress.vcxproj
@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_Internal|Win32">
+      <Configuration>Debug_Internal</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Internal|Win32">
+      <Configuration>Release_Internal</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{885DFDA6-A470-4770-9035-64F6BAD39CE7}</ProjectGuid>
+    <SccProjectName />
+    <SccLocalPath />
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)_dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">$(ProjectName)_dbg</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../../Sources/Plasma/CoreLib;../../../../../Sources/Plasma/NucleusLib/inc;../../../../../Sources/Plasma/PubUtilLib/inc;../../../StaticSDKs/XPlatform/OpenSSL/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4800</DisableSpecificWarnings>
+      <StringPooling>true</StringPooling>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;dxerr.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\StaticSDKs\XPlatform\oggvorbis\libogg\win32\VS2010\Win32\Debug;..\..\..\StaticSDKs\XPlatform\oggvorbis\libvorbis\win32\VS2010\Win32\Debug;..\..\..\StaticSDKs\XPlatform\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libc.lib;libcd.lib;libci.lib;libcid.lib;libcmtd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>true</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <MapExports>true</MapExports>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <PostBuildEvent>
+      <Message>Copy to Tools directory</Message>
+      <Command>xcopy /Y /I "$(TargetPath)" ..\..\..\..\tools\</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../../Sources/Plasma/CoreLib;../../../../../Sources/Plasma/NucleusLib/inc;../../../../../Sources/Plasma/PubUtilLib/inc;../../../StaticSDKs/XPlatform/OpenSSL/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;PLASMA_EXTERNAL_RELEASE;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4800</DisableSpecificWarnings>
+      <StringPooling>true</StringPooling>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;dxerr.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\StaticSDKs\XPlatform\oggvorbis\libogg\win32\VS2010\Win32\Debug;..\..\..\StaticSDKs\XPlatform\oggvorbis\libvorbis\win32\VS2010\Win32\Debug;..\..\..\StaticSDKs\XPlatform\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libc.lib;libcd.lib;libci.lib;libcid.lib;libcmtd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>true</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <MapExports>true</MapExports>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <PostBuildEvent>
+      <Message>Copy to Tools directory</Message>
+      <Command>xcopy /Y /I "$(TargetPath)" ..\..\..\..\tools\</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../../Sources/Plasma/CoreLib;../../../../../Sources/Plasma/NucleusLib/inc;../../../../../Sources/Plasma/PubUtilLib/inc;../../../StaticSDKs/XPlatform/OpenSSL/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <BrowseInformation>false</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <DisableSpecificWarnings>4800</DisableSpecificWarnings>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;dxerr.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\StaticSDKs\XPlatform\oggvorbis\libogg\win32\VS2010\Win32\Release;..\..\..\StaticSDKs\XPlatform\oggvorbis\libvorbis\win32\VS2010\Win32\Release;..\..\..\StaticSDKs\XPlatform\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libc.lib;libci.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>false</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <TargetMachine>MachineX86</TargetMachine>
+      <MapExports>true</MapExports>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <PostBuildEvent>
+      <Message>Copy to Tools directory</Message>
+      <Command>xcopy /Y /I "$(TargetPath)" ..\..\..\..\tools\</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../../Sources/Plasma/CoreLib;../../../../../Sources/Plasma/NucleusLib/inc;../../../../../Sources/Plasma/PubUtilLib/inc;../../../StaticSDKs/XPlatform/OpenSSL/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PLASMA_EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;MS_NO_COREDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>
+      </FunctionLevelLinking>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;dxerr.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\StaticSDKs\XPlatform\oggvorbis\libogg\win32\VS2010\Win32\Release;..\..\..\StaticSDKs\XPlatform\oggvorbis\libvorbis\win32\VS2010\Win32\Release;..\..\..\StaticSDKs\XPlatform\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libc.lib;libci.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>false</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <TargetMachine>MachineX86</TargetMachine>
+      <MapExports>true</MapExports>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <PostBuildEvent>
+      <Message>Copy to Tools directory</Message>
+      <Command>xcopy /Y /I "$(TargetPath)" ..\..\..\..\tools\</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\Sources\Plasma\Apps\SoundDecompress\main.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CoreLibExe\CoreLibExe.vcxproj">
+      <Project>{4054c94f-866a-4aa7-874b-2afcfef23a71}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\CoreLib\CoreLib.vcxproj">
+      <Project>{83a96477-baef-4db7-8134-aeadf4b2e63f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnAddrInfo\pnAddrInfo.vcxproj">
+      <Project>{af37952c-0c38-4057-8d59-eaa18f28da26}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnDispatch\pnDispatch.vcxproj">
+      <Project>{e609c4f6-52a0-45c6-958a-8b41680ad809}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnFactory\pnFactory.vcxproj">
+      <Project>{7c9680f1-6d8c-429d-a3a9-0cd36d9aea0c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnKeyedObject\pnKeyedObject.vcxproj">
+      <Project>{4f020dd6-7d46-49e1-bfc1-082d5f979dac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnMessage\pnMessage.vcxproj">
+      <Project>{633286c6-e4e8-428f-b1ee-d48cdacc0490}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnModifier\pnModifier.vcxproj">
+      <Project>{b4752dfb-c7f8-4864-a23b-5f15bc64a7a0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnNetCommon\pnNetCommon.vcxproj">
+      <Project>{90da3776-6b7c-48a0-8cec-1a60db5be61f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnNucleusInc\pnNucleusInc.vcxproj">
+      <Project>{f2635bc2-a8ba-4d43-807a-ea91307dbf93}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnProduct\pnProduct.vcxproj">
+      <Project>{ca208971-6c77-47f6-aa4b-fb6ecc071132}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnSceneObject\pnSceneObject.vcxproj">
+      <Project>{c0e5499c-1b5b-49a2-9047-95ab6a6c2b13}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnTimer\pnTimer.vcxproj">
+      <Project>{59197414-421b-457e-a559-f6d875379603}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnUtilsExe\pnUtilsExe.vcxproj">
+      <Project>{08eb4dcb-75f7-419e-a212-0bead6a10ff1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NucleusLib\pnUtils\pnUtils.vcxproj">
+      <Project>{89316659-f4a9-4e92-8200-c36288a61b9b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plAgeDescription\plAgeDescription.vcxproj">
+      <Project>{7147ce72-97c7-48d9-b3be-e0fca3fba83c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plAudioCore\plAudioCore.vcxproj">
+      <Project>{99445121-67ba-4696-8904-f2fc13c928bb}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plCompression\plCompression.vcxproj">
+      <Project>{7d696f05-8019-4029-a6e5-1225619ed40a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plFile\plFile.vcxproj">
+      <Project>{eefe2438-9f93-4c5c-b85d-6fdd431a1cf1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plNetCommon\plNetCommon.vcxproj">
+      <Project>{050ac8c8-a537-46fe-afee-bd3f9cb98f69}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plMessage\plMessage.vcxproj">
+      <Project>{05ab7d6b-5c79-4aa2-bee0-b7f9cbfb976a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plResMgr\plResMgr.vcxproj">
+      <Project>{e157e0e4-ac35-4435-95a6-9179aab66436}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plStatusLog\plStatusLog.vcxproj">
+      <Project>{21694294-7039-4c2a-b332-08dcad747f05}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plUnifiedTime\plUnifiedTime.vcxproj">
+      <Project>{fe69f407-565e-4c33-a91a-fba622d59c18}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PubUtilLib\plUUID\plUUID.vcxproj">
+      <Project>{bbdf8302-be9c-43ec-aaf8-912e601515b3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/Build/VS2010/Plasma/Apps/SoundDecompress/SoundDecompress.vcxproj.filters
+++ b/Build/VS2010/Plasma/Apps/SoundDecompress/SoundDecompress.vcxproj.filters
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\Sources\Plasma\Apps\SoundDecompress\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
--- a/Sources/Plasma/Apps/SoundDecompress/main.cpp
+++ b/Sources/Plasma/Apps/SoundDecompress/main.cpp
@ -0,0 +1,261 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==LICENSE==*/
+
+#include <utility>
+
+#include "../plResMgr/plResManager.h"
+#include "../plResMgr/plResMgrSettings.h"
+#include "../plResMgr/plRegistryHelpers.h"
+#include "../plResMgr/plRegistryNode.h"
+
+#include "../plAgeDescription/plAgeManifest.h"
+
+#include "../plAudioCore/plSoundBuffer.h"
+
+#include "hsUtils.h"
+#include "../plFile/hsFiles.h"
+#include "../plFile/plFileUtils.h"
+
+#define NO_AV_MSGS
+#include "pnNucleusCreatables.h"
+#include "../pnDispatch/pnDispatchCreatable.h"
+#include "../pnKeyedObject/pnKeyedObjectCreatable.h"
+#include "../pnMessage/pnMessageCreatable.h"
+#include "../pnNetCommon/pnNetCommonCreatable.h"
+#include "../pnSceneObject/pnSceneObjectCreatable.h"
+#include "../pnTimer/pnTimerCreatable.h"
+#include "../plAudioCore/plAudioCoreCreatable.h"
+#include "../plNetCommon/plNetCommonCreatable.h"
+#include "../plMessage/plMessageCreatable.h"
+#include "../plResMgr/plResMgrCreatable.h"
+
+typedef std::set<std::pair<std::string, unsigned short>> SoundSet;
+
+enum OutputStyle
+{
+    kSilent,
+    kProgress,
+    kVerbose
+};
+
+//// plSoundBufferCollector //////////////////////////////////////////////////
+//  Page iterator that collects all the plSoundBuffers in all of our pages
+
+class plSoundBufferCollector : public plRegistryPageIterator, public plKeyCollector
+{
+public:
+    plSoundBufferCollector(std::set<plKey>& keyArray)
+                : plKeyCollector(keyArray) {}
+
+    hsBool EatPage(plRegistryPageNode* page)
+    {
+        if (page->IsValid())
+        {
+            page->LoadKeys();
+            return page->IterateKeys(this, plSoundBuffer::Index());
+        }
+        else
+        {
+            fprintf(stderr, "INVALID PAGE: %s\n", page->GetPagePath());
+            return true;
+        }
+    }
+};
+
+
+void PrintHelp()
+{
+    printf("Plasma Sound Decompressor\n");
+    printf("-------------------------\n");
+    printf("-s, --silent        Run silently, no output\n");
+    printf("-v, --verbose       Print each filename when decompressing\n");
+    printf("-f, --force         Force decompressing existing files\n");
+}
+
+bool CollectSounds(plResManager* rm, SoundSet& sfxArray)
+{
+    std::set<plKey> soundKeys;
+
+    plSoundBufferCollector soundCollector(soundKeys);
+    rm->IterateAllPages(&soundCollector);
+
+    for (auto it = soundKeys.begin(); it != soundKeys.end(); ++it)
+    {
+        plSoundBuffer* buffer = plSoundBuffer::ConvertNoRef((*it)->VerifyLoaded());
+        if (buffer)
+        {
+            // Ref it...
+            buffer->GetKey()->RefObject();
+
+            // Get the filename from it and add that file if necessary
+            const char* filename = buffer->GetFileName();
+            if (filename)
+            {
+                unsigned short flags = 0;
+
+                if (stricmp(plFileUtils::GetFileExt(filename), "wav") != 0)
+                {
+                    if (buffer->HasFlag(plSoundBuffer::kOnlyLeftChannel) ||
+                        buffer->HasFlag(plSoundBuffer::kOnlyRightChannel))
+                        hsSetBits(flags, plManifestFile::kSndFlagCacheSplit);
+                    else if (buffer->HasFlag(plSoundBuffer::kStreamCompressed))
+                        hsSetBits(flags, plManifestFile::kSndFlagStreamCompressed);
+                    else
+                        hsSetBits(flags, plManifestFile::kSndFlagCacheStereo);
+                }
+
+                std::pair<std::string, unsigned short> pair = std::make_pair(filename, flags);
+                sfxArray.insert(pair);
+            }
+
+            // Unref the object so it goes away
+            buffer->GetKey()->UnRefObject();
+        }
+    }
+
+    soundKeys.clear();
+
+    plIndirectUnloadIterator iter;
+    rm->IterateAllPages(&iter);
+
+    return true;
+}
+
+
+void DecompressSounds(SoundSet& sounds, bool overwrite, OutputStyle verbosity)
+{
+    int total = sounds.size();
+    int curr  = 0;
+
+    if (verbosity == kVerbose)
+    {
+        printf("There are %d sounds\n\n", total);
+    }
+
+    for (auto it = sounds.begin(); it != sounds.end(); ++it)
+    {
+        curr++;
+        char path[256];
+		memset(path, 0, sizeof(path));
+        strcat(path, "sfx\\");
+        strcat(path, it->first.c_str());
+
+        if (verbosity == kVerbose)
+        {
+            printf("%s\n", path);
+        }
+        else if (verbosity == kProgress)
+        {
+            int percent = (100 * curr) / total;
+            int progress = int((float(curr) / total) * 75);
+
+            fprintf(stdout, "\r%3d%% ", percent);
+            for (int i = 0; i < progress; i++)
+            {
+                fprintf(stdout, "=");
+            }
+            fflush(stdout);
+        }
+
+        if (hsCheckBits(it->second, plManifestFile::kSndFlagCacheSplit))
+        {
+            plAudioFileReader::CacheFile(path, true, !overwrite);
+        }
+        else if (hsCheckBits(it->second, plManifestFile::kSndFlagCacheStereo))
+        {
+            plAudioFileReader::CacheFile(path, false, !overwrite);
+        }
+    }
+
+
+    if (verbosity == kProgress)
+    {
+        // Hack to ensure we always end with 100%
+        fprintf(stdout, "\r100%%\n");
+    }
+}
+
+
+int main(int argc, const char** argv)
+{
+    bool overwrite = false;
+    OutputStyle verbosity = kProgress;
+
+    for (int arg = 1; arg < argc; arg++)
+    {
+        if (!strcmp(argv[arg], "-h") || !strcmp(argv[arg], "--help"))
+        {
+            PrintHelp();
+            return 0;
+        }
+        else if (!strcmp(argv[arg], "-s") || !strcmp(argv[arg], "--silent"))
+        {
+            verbosity = kSilent;
+        }
+        else if (!strcmp(argv[arg], "-v") || !strcmp(argv[arg], "--verbose"))
+        {
+            verbosity = kVerbose;
+        }
+        else if (!strcmp(argv[arg], "-f") || !strcmp(argv[arg], "--force"))
+        {
+            overwrite = true;
+        }
+    }
+
+    // Init our special resMgr
+    plResMgrSettings::Get().SetFilterNewerPageVersions(false);
+    plResMgrSettings::Get().SetFilterOlderPageVersions(false);
+    plResMgrSettings::Get().SetLoadPagesOnInit(true);
+
+    plResManager* rm = new plResManager();
+    rm->SetDataPath("dat");
+    hsgResMgr::Init(rm);
+
+    SoundSet sounds;
+
+    CollectSounds(rm, sounds);
+    DecompressSounds(sounds, overwrite, verbosity);
+
+    hsgResMgr::Shutdown();
+
+    return 0;
+}
--- a/Sources/Plasma/Apps/plClient/res/plClient.rc
+++ b/Sources/Plasma/Apps/plClient/res/plClient.rc
@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
+#define IDC_STATIC (-1)

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
--- a/Sources/Plasma/Apps/plUruLauncher/plUruLauncher.rc
+++ b/Sources/Plasma/Apps/plUruLauncher/plUruLauncher.rc
@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
+#define IDC_STATIC (-1)

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
--- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h
+++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h
@ -165,6 +165,8 @@ class pfKIMsg : public plMessage
 			kUNUSED1		= 0x00000008,
 			kStatusMsg		= 0x00000010,
 			kNeighborMsg	= 0x00000020,	// sending to all the neighbors
+			kSubtitleMsg	= 0x00000040,
+			kLocKeyMsg		= 0x00000080,
 			kChannelMask	= 0x0000ff00
 		};

--- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
@ -474,6 +474,12 @@ void plPythonSDLModifier::IPythonVarToSDL(plStateDataRecord* state, const char*
 		int count = PyTuple_Size(pyVar);
 		plSimpleVarDescriptor::Type type = var->GetSimpleVarDescriptor()->GetType();

+		// Ensure that variable length arrays match.
+		if (var->GetSimpleVarDescriptor()->IsVariableLength()) {
+			if (var->GetCount() != count)
+				var->Alloc(count);
+		}
+
 		for (int i = 0; i < count; i++)
 		{
 			PyObject* pyVarItem = PyTuple_GetItem(pyVar, i);
--- a/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h
+++ b/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h
@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pnDispatchCreatable_inc
 #define pnDispatchCreatable_inc

-#include "../pnFactory/plCreatable.h"
+#include "../pnFactory/plCreator.h"

 #include "plDispatch.h"

--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp
@ -326,7 +326,7 @@ bool plAvBrainClimb::IProcessExitStage(double time, float elapsed)

 	float curBlend = ai->GetBlend();
 	
-	if(curBlend > .99)		// reached peak strength
+	if(fCurStage && curBlend > .99)		// reached peak strength
 	{
 		fCurStage->Detach(fAvMod);	// remove the (now completely masked) underlying anim
 		fCurStage = nil;
--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
@ -481,8 +481,8 @@ void plMouseDevice::SetCursorY(hsScalar y)

 void plMouseDevice::HideCursor(hsBool override)
 {
-	if( fInstance->fCursor != nil )
-		fInstance->fCursor->SetVisible( false );
+	if (fInstance && fInstance->fCursor)
+		fInstance->fCursor->SetVisible(false);

 	plMouseDevice::bCursorOverride = (override != 0);
 	plMouseDevice::bCursorHidden = true;
@ -499,9 +499,11 @@ void plMouseDevice::ShowCursor(hsBool override)
 	plMouseDevice::bCursorHidden = false;
 	plMouseDevice::bCursorOverride = false;
 	
-	if( fInstance->fCursor == nil )
-		fInstance->CreateCursor( fInstance->fCursorID );
-	fInstance->fCursor->SetVisible( true );
+	if (fInstance) {
+		if (!fInstance->fCursor)
+			fInstance->CreateCursor(fInstance->fCursorID);
+		fInstance->fCursor->SetVisible(true);
+	}
 }

 void plMouseDevice::NewCursor(char* cursor)
--- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
+++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
@ -217,6 +217,8 @@ bool plResponderModifier::IIsLocalOnlyCmd(plMessage* cmd)
 		return true;
 	if (plCameraMsg::ConvertNoRef(cmd))		// don't want to change our camera
 		return true;
+	if (plSubWorldMsg::ConvertNoRef(cmd))   // don't want to enter a subworld (changes the avatar SDL)
+		return true;

 	plSoundMsg *snd = plSoundMsg::ConvertNoRef( cmd );
 	if( snd != nil && snd->Cmd( plSoundMsg::kIsLocalOnly ) )
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
@ -211,7 +211,7 @@ void plNCAgeJoiner::Start () {

 	plNetClientMgr * nc = plNetClientMgr::GetInstance();
 	nc->SetFlagsBit(plNetClientMgr::kPlayingGame, false);
-	nc->fServerTimeOffset				= 0;	// reset since we're connecting to a new server
+	nc->ResetServerTimeOffset();
 	nc->fRequiredNumInitialSDLStates	= 0;
 	nc->fNumInitialSDLStates			= 0;
 	nc->SetFlagsBit(plNetClientApp::kNeedInitialAgeStateCount);
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
@ -133,9 +133,7 @@ plNetClientMgr::plNetClientMgr() :
 		// fProgressBar( nil ),
 		fTaskProgBar( nil ),
 		fMsgRecorder(nil),
-		fServerTimeOffset(0),
-		fTimeSamples(0),
-		fLastTimeUpdate(0),
+		fLastLocalTime(), 
 		fListenListMode(kListenList_Distance),
 		fAgeSDLObjectKey(nil),
 		fExperimentalLevel(0),
@ -480,34 +478,23 @@ void plNetClientMgr::StartLinkInFX()
 //
 void plNetClientMgr::UpdateServerTimeOffset(plNetMessage* msg)
 {
-	if ((hsTimer::GetSysSeconds() - fLastTimeUpdate) > 5)
-	{
-		fLastTimeUpdate = hsTimer::GetSysSeconds();
+	if (!msg->GetHasTimeSent())
+		return;
+	if (msg->GetTimeSent().AtEpoch())
+		return;

-		const plUnifiedTime& msgSentUT = msg->GetTimeSent();
-		if (!msgSentUT.AtEpoch())
-		{
-			double diff = plUnifiedTime::GetTimeDifference(msgSentUT, plClientUnifiedTime::GetCurrentTime());
+	double localTime = hsTimer::GetSeconds();
+	if (localTime - fLastLocalTime < 1.0)
+		return;

-			if (fServerTimeOffset == 0)
-			{
-				fServerTimeOffset = diff;
-			}
-			else
-			{
-				fServerTimeOffset = fServerTimeOffset + ((diff - fServerTimeOffset) / ++fTimeSamples);
-			}
-
-			DebugMsg("Setting server time offset to %f", fServerTimeOffset);
-		}
-	}
+	fLastServerTime = msg->GetTimeSent();
+	fLastLocalTime = localTime;
 }

 void plNetClientMgr::ResetServerTimeOffset()
 {
-	fServerTimeOffset = 0;
-	fTimeSamples = 0;
-	fLastTimeUpdate = 0;
+	fLastServerTime.ToEpoch();
+	fLastLocalTime = 0.0;
 }

 //
@ -515,14 +502,12 @@ void plNetClientMgr::ResetServerTimeOffset()
 //
 plUnifiedTime plNetClientMgr::GetServerTime() const 
 { 
-	if ( fServerTimeOffset==0 )		// offline mode or before connecting/calibrating to a server
+	if (fLastServerTime.AtEpoch()) {
+		WarningMsg("Someone asked for the server time, but we don't know it yet!");
 		return plUnifiedTime::GetCurrentTime();
-	
-	plUnifiedTime serverUT;
-	if (fServerTimeOffset<0)
-		return plUnifiedTime::GetCurrentTime() - plUnifiedTime(fabs(fServerTimeOffset)); 
-	else
-		return  plUnifiedTime::GetCurrentTime() + plUnifiedTime(fServerTimeOffset); 
+	}
+
+	return fLastServerTime + plUnifiedTime(hsTimer::GetSeconds() - fLastLocalTime);
 }

 //
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
@ -166,9 +166,8 @@ private:
 	std::string			fSPDesiredPlayerName;	// SP: the player we want to load from vault.
 	
 	// server info
-	double				fServerTimeOffset;		// diff between our unified time and server's unified time
-	UInt32				fTimeSamples;
-	double				fLastTimeUpdate;
+	plUnifiedTime		fLastServerTime;		// Last received time update from the server
+	double				fLastLocalTime;			// Last monotonic time (in seconds) when the above update was received

 	UInt8				fJoinOrder;			// returned by the server
 	
--- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp
+++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp
@ -1328,9 +1328,9 @@ void plPXPhysical::GetSyncState(hsPoint3& pos, hsQuat& rot, hsVector3& linV, hsV

 void plPXPhysical::SetSyncState(hsPoint3* pos, hsQuat* rot, hsVector3* linV, hsVector3* angV)
 {
-	bool initialSync =	plNetClientApp::GetInstance()->IsLoadingInitialAgeState() &&
-						plNetClientApp::GetInstance()->GetJoinOrder() == 0;
-
+	bool isLoading = plNetClientApp::GetInstance()->IsLoadingInitialAgeState();
+	bool isFirstIn = plNetClientApp::GetInstance()->GetJoinOrder() == 0;
+	bool initialSync = isLoading && isFirstIn;
 	// If the physical has fallen out of the sim, and this is initial age state, and we're
 	// the first person in, reset it to the original position.  (ie, prop the default state
 	// we've got right now)
@ -1350,6 +1350,13 @@ void plPXPhysical::SetSyncState(hsPoint3* pos, hsQuat* rot, hsVector3* linV, hsV
 		SetLinearVelocitySim(*linV);
 	if (angV)
 		SetAngularVelocitySim(*angV);
+	// If we're loading the age, then we should ensure the objects stay asleep if they're supposed to be asleep.
+	// NOTE: We should only do this if the objects are not at their initial locations. Otherwise, they might
+	//       sleep inside each other and explode or float randomly in midair
+	if (isLoading && GetProperty(plSimulationInterface::kStartInactive) && !fActor->readBodyFlag(NX_BF_KINEMATIC)) {
+		if (!pos && !rot)
+			fActor->putToSleep();
+	}

 	SendNewLocation(false, true);
 }
--- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp
+++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp
@ -59,8 +59,10 @@ plRegistryKeyList::~plRegistryKeyList()
 	for (int i = 0; i < fStaticKeys.size(); i++)
 	{
 		plKeyImp* keyImp = fStaticKeys[i];
-		if (!keyImp->ObjectIsLoaded())
+		if (keyImp && !keyImp->ObjectIsLoaded()) {
+			fStaticKeys[i] = nullptr;
 			delete keyImp;
+		}
 	}
 }

--- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
+++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
@ -203,6 +203,7 @@ void plRegistryPageNode::UnloadKeys()
 	for (; it != fKeyLists.end(); it++)
 	{
 		plRegistryKeyList* keyList = it->second;
+		it->second = nullptr;
 		delete keyList;
 	}
 	fKeyLists.clear();
--- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
+++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
@ -219,14 +219,20 @@ void plResManager::IShutdown()
 	// Shut down the registry (finally!)
 	ILockPages();

-	PageSet::const_iterator it;
-	for (it = fAllPages.begin(); it != fAllPages.end(); it++)
-		delete *it;
-	fAllPages.clear();
+	// Unload all keys before actually deleting the pages.
+	// When a key's refcount drops to zero, IKeyUnreffed looks up the key's page.
+	// If the page is already deleted at that point, this causes a use after free and potential crash.
+	for (PageSet::const_iterator it = fAllPages.begin(); it != fAllPages.end(); it++) {
+		(*it)->UnloadKeys();
+	}
 	fLoadedPages.clear();
+	fLastFoundPage = nil;
+	for (PageSet::const_iterator it = fAllPages.begin(); it != fAllPages.end(); it++) {
+		delete *it;
+	}
+	fAllPages.clear();

 	IUnlockPages();
-	fLastFoundPage = nil;

 	// Now, kill off the Dispatcher
 	hsRefCnt_SafeUnRef(fDispatch);
@ -1299,7 +1305,7 @@ void plResManager::PageInAge(const char *age)

 hsBool plResManager::VerifyPages()
 {
-	hsTArray<plRegistryPageNode*> invalidPages, newerPages;
+	PageSet invalidPages, newerPages;

 	// Step 1: verify major/minor version changes
 	if (plResMgrSettings::Get().GetFilterNewerPageVersions() ||
@ -1313,7 +1319,7 @@ hsBool plResManager::VerifyPages()

 			if (page->GetPageCondition() == kPageTooNew && plResMgrSettings::Get().GetFilterNewerPageVersions())
 			{
-				newerPages.Append(page);
+				newerPages.insert(page);
 				fAllPages.erase(page);
 			}
 			else if (
@ -1321,21 +1327,21 @@ hsBool plResManager::VerifyPages()
 				page->GetPageCondition() == kPageOutOfDate)
 				&& plResMgrSettings::Get().GetFilterOlderPageVersions())
 			{
-				invalidPages.Append(page);
+				invalidPages.insert(page);
 				fAllPages.erase(page);
 			}
 		}
 	}

 	// Handle all our invalid pages now
-	if (invalidPages.GetCount() > 0)
+	if (!invalidPages.empty())
 	{
 		if (!IDeleteBadPages(invalidPages, false))
 			return false;
 	}

 	// Warn about newer pages
-	if (newerPages.GetCount() > 0)
+	if (!newerPages.empty())
 	{
 		if (!IWarnNewerPages(newerPages))
 			return false;
@ -1343,22 +1349,35 @@ hsBool plResManager::VerifyPages()

 	// Step 2 of verification: make sure no sequence numbers conflict
 	PageSet::iterator it = fAllPages.begin();
-	for (; it != fAllPages.end(); it++)
+	for (; it != fAllPages.end();)
 	{
 		plRegistryPageNode* page = *it;

 		PageSet::iterator itUp = it;
 		itUp++;
-		for (; itUp != fAllPages.end(); itUp++)
+		bool amValid = true;
+		for (; itUp != fAllPages.end();)
 		{
 			plRegistryPageNode* upPage = *itUp;
-			if (page->GetPageInfo().GetLocation() == upPage->GetPageInfo().GetLocation())
-			{
-				invalidPages.Append(upPage);
-				fAllPages.erase(itUp);
-				break;
+			if (page->GetPageInfo().GetLocation() == upPage->GetPageInfo().GetLocation()) {
+				invalidPages.insert(upPage);
+				itUp = fAllPages.erase(itUp);
+				amValid = false;
+			} else {
+				itUp++;
 			}
 		}
+
+		// Delete *all* conflicting pages, not just conflicting - 1.
+		// If we leave in a single conflicting page, a new conflict can trivially
+		// be introduced if the page we leave behind is defunct and a new version
+		// is later downloaded from the FileSrv.
+		if (!amValid) {
+			invalidPages.insert(page);
+			it = fAllPages.erase(it);
+		} else {
+			it++;
+		}
 	}

 	// Redo our loaded pages list, since Verify() might force the page's keys to load or unload
@ -1374,7 +1393,7 @@ hsBool plResManager::VerifyPages()
 	}

 	// Handle all our conflicting pages now
-	if (invalidPages.GetCount() > 0)
+	if (!invalidPages.empty())
 		return IDeleteBadPages(invalidPages, true);

 	return true;
@ -1384,9 +1403,10 @@ hsBool plResManager::VerifyPages()
 //	Given an array of pages that are invalid (major version out-of-date or
 //	whatnot), asks the user what we should do about them.

-static void ICatPageNames(hsTArray<plRegistryPageNode*>& pages, char* buf, int bufSize)
+static void ICatPageNames(const std::set<plRegistryPageNode*>& pages, char* buf, int bufSize)
 {
-	for (int i = 0; i < pages.GetCount(); i++)
+	int i = 0;
+	for (auto it = pages.cbegin(); it != pages.cend(); ++it, ++i)
 	{
 		if (i >= 25)
 		{
@ -1394,7 +1414,7 @@ static void ICatPageNames(hsTArray<plRegistryPageNode*>& pages, char* buf, int b
 			break;
 		}

-		const char* pagePath = pages[i]->GetPagePath();
+		const char* pagePath = (*it)->GetPagePath();
 		const char* pageFile = plFileUtils::GetFileName(pagePath);

 		if (strlen(buf) + strlen(pageFile) > bufSize - 5)
@ -1408,7 +1428,7 @@ static void ICatPageNames(hsTArray<plRegistryPageNode*>& pages, char* buf, int b
 	}
 }

-hsBool plResManager::IDeleteBadPages(hsTArray<plRegistryPageNode*>& invalidPages, hsBool conflictingSeqNums)
+hsBool plResManager::IDeleteBadPages(PageSet& invalidPages, hsBool conflictingSeqNums)
 {
 #ifndef PLASMA_EXTERNAL_RELEASE
 	if (!hsMessageBox_SuppressPrompts)
@ -1430,12 +1450,12 @@ hsBool plResManager::IDeleteBadPages(hsTArray<plRegistryPageNode*>& invalidPages
 #endif // PLASMA_EXTERNAL_RELEASE

 	// Delete 'em
-	for (int i = 0; i < invalidPages.GetCount(); i++)
+	for (PageSet::iterator it = invalidPages.begin(); it != invalidPages.end(); ++it)
 	{
-		invalidPages[i]->DeleteSource();
-		delete invalidPages[i];
+		(*it)->DeleteSource();
+		delete *it;
 	}
-	invalidPages.Reset();
+	invalidPages.clear();

 	fLastFoundPage = nil;

@ -1447,7 +1467,7 @@ hsBool plResManager::IDeleteBadPages(hsTArray<plRegistryPageNode*>& invalidPages
 //	than the "current" one), warns the user about them but does nothing to
 //	them.

-hsBool plResManager::IWarnNewerPages(hsTArray<plRegistryPageNode*> &newerPages)
+hsBool plResManager::IWarnNewerPages(PageSet &newerPages)
 {
 #ifndef PLASMA_EXTERNAL_RELEASE
 	if (!hsMessageBox_SuppressPrompts)
@ -1465,9 +1485,9 @@ hsBool plResManager::IWarnNewerPages(hsTArray<plRegistryPageNode*> &newerPages)


 	// Not deleting the files, just delete them from memory
-	for (int i = 0; i < newerPages.GetCount(); i++)
-		delete newerPages[i];
-	newerPages.Reset();
+	for (PageSet::iterator it = newerPages.begin(); it != newerPages.end(); ++it)
+		delete *it;
+	newerPages.clear();

 	fLastFoundPage = nil;

--- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.h
+++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.h
@ -61,6 +61,9 @@ typedef	void(*plProgressProc)(plKey key);

 class plResManager : public hsResMgr
 {
+protected:
+	typedef std::set<plRegistryPageNode*> PageSet;
+
 public:
 	plResManager();
 	virtual ~plResManager();
@ -194,8 +197,8 @@ protected:

 	void IUnloadPageKeys(plRegistryPageNode* pageNode, hsBool dontClear = false);

-	hsBool IDeleteBadPages(hsTArray<plRegistryPageNode*>& invalidPages, hsBool conflictingSeqNums);
-	hsBool IWarnNewerPages(hsTArray<plRegistryPageNode*>& newerPages);
+	hsBool IDeleteBadPages(PageSet& invalidPages, hsBool conflictingSeqNums);
+	hsBool IWarnNewerPages(PageSet& newerPages);

 	void ILockPages();
 	void IUnlockPages();
@ -233,7 +236,6 @@ protected:
 	UInt8 fPageListLock;	// Number of locks on the page lists.  If it's greater than zero, they can't be modified
 	hsBool fPagesNeedCleanup;	// True if something modified the page lists while they were locked.

-	typedef std::set<plRegistryPageNode*> PageSet;
 	PageSet fAllPages;		// All the pages, loaded or not
 	PageSet fLoadedPages;	// Just the loaded pages
Author	SHA1	Message	Date
dpogue	f293e06ade	Allow building with VS2010 Express	2024-08-10 20:11:38 -07:00
dpogue	93491a7df4	Fix wrong include in pnDispatchCreatable.h	2024-08-10 20:11:38 -07:00
dpogue	6725fc49f0	Fix Debug_Internal config for pfMoviePlayer	2024-08-10 20:11:37 -07:00
dpogue	e9786f9990	Build SoundDecompress as part of AllClient	2024-08-10 20:11:37 -07:00
dpogue	147f47e31c	Add SoundDecompress tool	2024-08-10 20:11:37 -07:00
rarified	883495c35c	Merge branch 'ticket/53'	2023-10-23 15:12:43 -06:00
rarified	e1306da736	Merge branch 'ticket/52'	2023-10-23 15:12:40 -06:00
rarified	8d1d813df5	Merge branch 'ticket/51'	2023-10-23 15:12:37 -06:00
rarified	65d50895bb	closes #53	2023-10-23 15:12:15 -06:00
rarified	6a41bdbee7	closes #52	2023-10-23 15:11:45 -06:00
rarified	3dcf1c2f26	closes #51	2023-10-23 15:11:03 -06:00
rarified	70449244f4	Merge branch 'ticket/53'	2023-10-02 20:13:56 -06:00
Edmond Mondor	82abcb2f07	remove clearReceivers()	2023-10-02 10:34:28 -07:00
rarified	870d0534df	Merge branch 'ticket/53'	2023-09-29 10:49:27 -06:00
Edmond Mondor	1f09d6c48a	Try without armature changes	2023-09-28 11:48:33 -07:00
rarified	66ce08ed67	Merge branch 'ticket/53'	2023-09-26 10:08:18 -06:00
rarified	1c1d3dd82e	Merge branch 'ticket/52'	2023-09-26 10:08:14 -06:00
Edmond Mondor	4924156ad4	Fix 3 problems with plSubWorldMsg. Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>	2023-09-18 09:50:23 -07:00
Edmond Mondor	13ea0a98de	Don't trust the local machine's system time. Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>	2023-09-18 09:41:33 -07:00
rarified	f9723462d7	Merge branch 'ticket/51'	2023-07-05 15:00:20 -06:00
dgelessus	7d3774a732	Unload all keys of all pages before deleting them (ported from H-uru/Plasma@04d0ac94ea)	2023-06-29 22:04:17 +02:00
dgelessus	ea7e4b2ab5	Fix previous commits not actually nulling out the key I goofed while porting this from H'uru, where the variable is a reference. The previous code actually caused the keys to not get deleted at all.	2023-06-26 00:16:24 +02:00
dgelessus	5d5ba00f7d	Also guard against accessing plRegistryKeyList currently being deleted Co-authored-by: Adam Johnson <AdamJohnso@gmail.com> (ported from H-uru/Plasma@725eeaa288)	2023-06-25 16:50:10 +02:00
dgelessus	af38137822	Fix possible use after free in plRegistryPageNode::UnloadKeys Short explanation: the destructor of plRegistryKeyList may indirectly access other entries of fKeyLists where the plRegistryKeyList has already been deleted, but not yet removed from the map. Long explanation: * Deleting a plRegistryKeyList also deletes all plKeys inside it, which decrements the reference count of the objects they point to. * If one of the deleted keys happens to be the last reference to an object, this also deletes the object itself. * The object's destructor might in turn delete another plKey, which calls SetKeyUnused, which tries to look up the key in its page. * If this second plKey belongs to the page that is currently being unloaded, then its plRegistryKeyList may be partially or completely deleted, but still listed in the fKeyLists map. In this case, the key lookup accesses already freed memory. (ported from H-uru/Plasma@a529e35fd9)	2023-06-25 16:44:35 +02:00
rarified	4b0ab75a79	Merge branch 'ticket/49'	2022-11-12 10:30:24 -07:00
rarified	dcb0309a08	closes #49	2022-11-12 10:29:57 -07:00
rarified	7dde0855dc	Merge branch 'ticket/48'	2022-11-12 10:13:57 -07:00
rarified	44c9b0694d	Merge branch 'ticket/47'	2022-11-12 10:13:53 -07:00
rarified	dedf04ac43	Merge branch 'ticket/45'	2022-11-12 10:13:50 -07:00
rarified	eeb458817f	Merge branch 'ticket/44'	2022-11-12 10:13:43 -07:00
rarified	68c7187155	closes #48	2022-11-12 10:13:17 -07:00
rarified	6fa695a2c3	closes #47	2022-11-12 10:12:53 -07:00
rarified	2a3c1b32ef	closes #45	2022-11-12 10:11:59 -07:00
rarified	d3cbaa94ef	closes #44	2022-11-12 10:11:24 -07:00
rarified	e7758ccc10	Merge branch 'ticket/49'	2022-10-23 10:46:15 -06:00
Adam Johnson	07b92234ad	Fix bug for python SDL variable-length arrays	2022-10-03 21:48:57 -05:00
rarified	7dfa2ba56a	Merge branch 'master' into working	2022-07-19 08:55:00 -06:00
rarified	1a091b7019	Merge branch 'ticket/48'	2022-06-05 15:14:09 -06:00
rarified	104a5ef4ee	Merge branch 'ticket/47'	2022-06-05 15:13:55 -06:00
rarified	19cfaaaea9	Merge branch 'ticket/45'	2022-06-05 15:13:41 -06:00
rarified	dafd190083	Merge branch 'ticket/44'	2022-06-05 15:13:26 -06:00
Edmond Mondor	fdee5a921b	Merge branch 'ticket/47' of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata into ticket/47	2022-05-30 14:23:43 -07:00
Adam Johnson	b322ee094c	Fix compile error	2022-05-30 14:23:20 -07:00
Adam Johnson	54c768d966	PR from Huru to prevent dynamics from moving during age initilization	2022-05-30 14:22:12 -07:00
Edmond Mondor	82159bcb4a	Merge branch 'ticket/47' of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata into ticket/47	2022-05-30 14:04:22 -07:00
Edmond Mondor	b81eb21145	Fix compile error Author: Adam Johnson <AdamJohnso@gmail.com>	2022-05-30 14:03:33 -07:00
Edmond Mondor	e7b4f5c6ba	Fix compile error (cherry picked from commit `202e846a56`)	2022-05-11 15:20:16 -06:00
Edmond Mondor	202e846a56	Fix compile error	2022-05-11 14:16:44 -07:00
ZarothYe	deb4858f3e	Add subtitle and loc key message flags (cherry picked from commit `126e7a76dd`)	2022-05-11 13:58:51 -06:00
Edmond Mondor	bff879abfd	PR from Huru to prevent dynamics from moving during age initilization	2022-05-11 13:58:51 -06:00
Edmond Mondor	fededb574b	Change to prevent crashing when fCurStage is null	2022-05-11 13:58:51 -06:00
ZarothYe	126e7a76dd	Add subtitle and loc key message flags	2022-05-10 20:07:41 -05:00
rarified	26807a8d87	Merge branch 'ticket/47'	2022-05-05 09:45:42 -06:00
Edmond Mondor	f54f14328e	PR from Huru to prevent dynamics from moving during age initilization	2022-05-04 20:16:58 -07:00
rarified	311671e7a2	Merge branch 'ticket/46' closes #46	2022-04-29 14:55:59 -06:00
Edmond Mondor	8aaa98b8b7	Change to prevent crashing when fCurStage is null	2022-04-29 07:46:54 -07:00
Adam Johnson	3489e04463	Fix crash from plMouseDevice::HideCursor if it is called before cursor is created	2022-04-06 19:46:00 -05:00
Adam Johnson	33bbc490be	Minor code quality correction	2022-04-06 19:32:30 -05:00
Adam Johnson	fd0c2a205e	Fix nondeterministic conflicting page processing on startup	2022-04-06 19:18:05 -05:00
rarified	b2521e0777	Merge branch 'ticket/42' closes #42	2022-03-23 09:22:29 -06:00
rarified	f9d629cfc5	Expand thread memory allocations for stack and heap to 1.25MB	2022-03-22 13:52:03 -06:00