diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index dc813f6e..102fd37e 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -59,7 +59,7 @@ void SoundEngine::playMusicTick() {};
#ifdef _WINDOWS64
char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"music\\"};
-char SoundEngine::m_szRedistName[]={"redist64"};
+char SoundEngine::m_szRedistName[]={"Windows64\\redist64"}; //str1k3r - moved this to a the Windows64 dir so its out of plain view
#elif defined _DURANGO
char SoundEngine::m_szSoundPath[]={"Sound\\"};
char SoundEngine::m_szMusicPath[]={"music\\"};
@@ -791,7 +791,9 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
char *SoundName = (char *)ConvertSoundPathToName(name);
strcat((char *)szSoundName,SoundName);
-// app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#ifdef _DEBUG
+ app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#endif
AUDIO_INFO AudioInfo;
AudioInfo.x=x;
@@ -846,9 +848,11 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
char *SoundName = (char *)ConvertSoundPathToName(name);
strcat((char *)szSoundName,SoundName);
-// app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
- //app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#ifdef _DEBUG
+ app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
+ app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#endif
AUDIO_INFO AudioInfo;
memset(&AudioInfo,0,sizeof(AUDIO_INFO));
@@ -1136,10 +1140,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
SoundEngine *soundEngine = (SoundEngine *)lpParameter;
soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
+#ifdef _DEBUG
if(soundEngine->m_hStream==0)
{
app.DebugPrintf("SoundEngine::OpenStreamThreadProc - Could not open - %s\n",soundEngine->m_szStreamName);
}
+#endif
return 0;
}
diff --git a/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
index 001cfb11..2cc5d756 100644
--- a/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
@@ -26,7 +26,7 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "Common\Media"; Dest = "Common\Media" },
@{ Source = "Common\res"; Dest = "Common\res" },
- @{ Source = "Durango\Sound"; Dest = "Sound" },
+ @{ Source = "DurangoMedia\Sound"; Dest = "Sound" },
@{ Source = "DurangoMedia\DLC"; Dest = "DLC" },
@{ Source = "DurangoMedia\Tutorial"; Dest = "Tutorial" },
@{ Source = "music"; Dest = "music" },
@@ -40,6 +40,8 @@ foreach ($copy in $folderCopies) {
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+ } else {
+ Write-Host "Durango Postbuild: Folder not found, skipping: $src"
}
}
@@ -53,7 +55,9 @@ foreach ($copy in $fileCopies) {
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
Copy-Item -Path $src -Destination $dst -Force
- }
+ } else {
+ Write-Host "Durango Postbuild: File not found, skipping: $src"
+ }
}
$deleteDirs = @(
diff --git a/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
index 45f78399..01bb431a 100644
--- a/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
@@ -22,15 +22,15 @@ foreach ($dir in $directories) {
}
$folderCopies = @(
- @{ Source = "music"; Dest = "PS4_GAME\music" },
- @{ Source = "Common\Media"; Dest = "PS4_GAME\Common\Media" },
- @{ Source = "Common\res"; Dest = "PS4_GAME\Common\res" },
- @{ Source = "Orbis\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
- @{ Source = "OrbisMedia\DLC"; Dest = "PS4_GAME\Orbis\DLC" },
- @{ Source = "Orbis\DLCImages"; Dest = "PS4_GAME\Orbis\DLCImages" },
+ @{ Source = "music"; Dest = "PS4_GAME\music" },
+ @{ Source = "Common\Media"; Dest = "PS4_GAME\Common\Media" },
+ @{ Source = "Common\res"; Dest = "PS4_GAME\Common\res" },
+ @{ Source = "OrbisMedia\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
+ @{ Source = "OrbisMedia\DLC"; Dest = "PS4_GAME\Orbis\DLC" },
+ @{ Source = "Orbis\DLCImages"; Dest = "PS4_GAME\Orbis\DLCImages" },
@{ Source = "OrbisMedia\Tutorial"; Dest = "PS4_GAME\Orbis\Tutorial" },
- @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module"; Dest = "PS4_GAME\sce_module" },
- @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
+ @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module"; Dest = "PS4_GAME\sce_module" },
+ @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
@{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }
)
@@ -44,7 +44,9 @@ foreach ($copy in $folderCopies) {
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
- }
+ } else {
+ Write-Host "Orbis Postbuild: Folder not found, skipping: $src"
+ }
}
$fileCopies = @(
@@ -57,7 +59,9 @@ foreach ($copy in $fileCopies) {
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
Copy-Item -Path $src -Destination $dst -Force
- }
+ } else {
+ Write-Host "Orbis Postbuild: File not found, skipping: $src"
+ }
}
$builtFile = Join-Path $OutDir "Minecraft.Client.elf"
diff --git a/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
index c5158822..b7e8fa5a 100644
--- a/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
@@ -24,18 +24,24 @@ $folderCopies = @(
@{ Source = "Common\Media"; Dest = "PS3_GAME\USRDIR\Common\Media" },
@{ Source = "Common\res"; Dest = "PS3_GAME\USRDIR\Common\res" },
@{ Source = "PS3Media\DLC"; Dest = "PS3_GAME\USRDIR\DLC" },
- @{ Source = "PS3\Sound"; Dest = "PS3_GAME\USRDIR\PS3\Sound" },
+ @{ Source = "PS3Media\Sound"; Dest = "PS3_GAME\USRDIR\PS3\Sound" },
#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" },
@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" }
)
foreach ($copy in $folderCopies) {
- $src = Join-Path $ProjectDir $copy.Source
+ if ([System.IO.Path]::IsPathRooted($copy.Source)) {
+ $src = $copy.Source
+ } else {
+ $src = Join-Path $ProjectDir $copy.Source
+ }
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+ } else {
+ Write-Host "PS3 Postbuild: Folder not found, skipping: $src"
}
}
@@ -57,7 +63,9 @@ foreach ($copy in $fileCopies) {
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
Copy-Item -Path $src -Destination $dst -Force
- }
+ } else {
+ Write-Host "PS3 Postbuild: File not found, skipping: $src"
+ }
}
if ($Configuration -match "ContentPackage") {
diff --git a/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
index 39bc2a37..7db32d2e 100644
--- a/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
@@ -20,14 +20,14 @@ foreach ($dir in $directories) {
}
$folderCopies = @(
- @{ Source = "music"; Dest = "PSVITA_GAME\music" },
- @{ Source = "Common\Media"; Dest = "PSVITA_GAME\Common\Media" },
- @{ Source = "Common\res"; Dest = "PSVITA_GAME\Common\res" },
- @{ Source = "PSVita\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
- @{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" },
- @{ Source = "PSVita\Tutorial"; Dest = "PSVITA_GAME\PSVita\Tutorial" },
- @{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module"; Dest = "PSVITA_GAME\sce_module" },
- @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" }
+ @{ Source = "music"; Dest = "PSVITA_GAME\music" },
+ @{ Source = "Common\Media"; Dest = "PSVITA_GAME\Common\Media" },
+ @{ Source = "Common\res"; Dest = "PSVITA_GAME\Common\res" },
+ @{ Source = "PSVitaMedia\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
+ @{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" },
+ @{ Source = "PSVita\Tutorial"; Dest = "PSVITA_GAME\PSVita\Tutorial" },
+ @{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module"; Dest = "PSVITA_GAME\sce_module" },
+ @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" }
)
foreach ($copy in $folderCopies) {
@@ -40,7 +40,9 @@ foreach ($copy in $folderCopies) {
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
- }
+ } else {
+ Write-Host "PSVita Postbuild: Folder not found, skipping: $src"
+ }
}
$fileCopies = @(
@@ -54,7 +56,9 @@ foreach ($copy in $fileCopies) {
if (Test-Path $src) {
New-Item -ItemType Directory -Path (Split-Path $dst -Parent) -Force | Out-Null
Copy-Item -Path $src -Destination $dst -Force
- }
+ } else {
+ Write-Host "PSVita Postbuild: File not found, skipping: $src"
+ }
}
$builtFile = Join-Path $OutDir "Minecraft.Client.self"
diff --git a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
index 77a84ad2..87538eb9 100644
--- a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
@@ -20,21 +20,27 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "music"; Dest = "music" },
- @{ Source = "Common\Media"; Dest = "Common\Media" },
@{ Source = "Common\res"; Dest = "Common\res" },
+ @{ Source = "Common\Media"; Dest = "Common\Media" },
@{ Source = "DurangoMedia"; Dest = "Windows64Media" },
@{ Source = "Windows64Media"; Dest = "Windows64Media" },
- #@{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
- @{ Source = "Windows64\Sound"; Dest = "Windows64Media\Sound" },
- @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\redist64"; Dest = "redist64" }
+ @{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
+ #@{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
+ @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\redist64"; Dest = "Windows64\redist64" }
)
foreach ($copy in $folderCopies) {
- $src = Join-Path $ProjectDir $copy.Source
+ if ([System.IO.Path]::IsPathRooted($copy.Source)) {
+ $src = $copy.Source
+ } else {
+ $src = Join-Path $ProjectDir $copy.Source
+ }
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+ } else {
+ Write-Host "Windows64 Postbuild: Folder not found, skipping: $src"
}
}
@@ -50,7 +56,7 @@ foreach ($copy in $fileCopies) {
if (Test-Path $src) {
Copy-Item -Path $src -Destination $dst -Force
} else {
- Write-Host "Windows64 Postbuild: source not found, skipping: $src"
+ Write-Host "Windows64 Postbuild: File not found, skipping: $src"
}
}
diff --git a/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
index 12279db5..8da63f72 100644
--- a/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
@@ -24,6 +24,8 @@ foreach ($copy in $copies) {
if (Test-Path $src) {
xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+ } else {
+ Write-Host "Xbox Postbuild: Folder not found, skipping: $src"
}
}
@@ -48,5 +50,7 @@ foreach ($copy in $fileCopies) {
$dst = Join-Path $OutDir $copy.Dest
if (Test-Path $src) {
Copy-Item -Path $src -Destination $dst -Force
- }
+ } else {
+ Write-Host "Xbox Postbuild: File not found, skipping: $src"
+ }
}
\ No newline at end of file
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 34d9a696..18f12ac8 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -482,6 +482,7 @@
$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)..\Minecraft.Client\PSVita\Assert;$(ProjectDir);$(ProjectDir)..\Minecraft.World\x64headers;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras
+ $(OutDir)
true
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
@@ -501,6 +502,7 @@
+ $(OutDir)
false
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
@@ -592,21 +594,25 @@
$(ProjectDir)..\Minecraft.World\x64headers;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras
+ $(OutDir)
false
$(OutDir)default$(TargetExt)
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
+ $(OutDir)
false
$(OutDir)default$(TargetExt)
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
+ $(OutDir)
false
$(OutDir)default$(TargetExt)
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
+ $(OutDir)
false
$(OutDir)default$(TargetExt)
$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)
@@ -932,7 +938,7 @@
true
$(OutDir)$(ProjectName).pdb
- d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)
NotSet
false
@@ -1741,7 +1747,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)default.pdb
true
- d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)
false
@@ -1785,7 +1791,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)default.pdb
true
- d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)
xapilib.lib
false
false
@@ -1824,7 +1830,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU
true
$(OutDir)$(ProjectName).pdb
- d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)
NotSet
false
@@ -1865,7 +1871,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)default.pdb
true
- d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)
xapilib.lib
false
false
diff --git a/Minecraft.Client/Orbis/Sound/Minecraft.msscmp b/Minecraft.Client/OrbisMedia/Sound/Minecraft.msscmp
similarity index 100%
rename from Minecraft.Client/Orbis/Sound/Minecraft.msscmp
rename to Minecraft.Client/OrbisMedia/Sound/Minecraft.msscmp
diff --git a/Minecraft.Client/PS3/Sound/Minecraft.msscmp b/Minecraft.Client/PS3/Sound/Minecraft.msscmp
deleted file mode 100644
index 860c42cc..00000000
Binary files a/Minecraft.Client/PS3/Sound/Minecraft.msscmp and /dev/null differ
diff --git a/Minecraft.Client/Durango/Sound/Minecraft.msscmp b/Minecraft.Client/PS3Media/Sound/Minecraft.msscmp
similarity index 100%
rename from Minecraft.Client/Durango/Sound/Minecraft.msscmp
rename to Minecraft.Client/PS3Media/Sound/Minecraft.msscmp
diff --git a/Minecraft.Client/PSVita/Sound/Minecraft.msscmp b/Minecraft.Client/PSVitaMedia/Sound/Minecraft.msscmp
similarity index 100%
rename from Minecraft.Client/PSVita/Sound/Minecraft.msscmp
rename to Minecraft.Client/PSVitaMedia/Sound/Minecraft.msscmp
diff --git a/Minecraft.Client/Windows64/Sound/Minecraft.msscmp b/Minecraft.Client/Windows64Media/Sound/Minecraft.msscmp
similarity index 84%
rename from Minecraft.Client/Windows64/Sound/Minecraft.msscmp
rename to Minecraft.Client/Windows64Media/Sound/Minecraft.msscmp
index 0d0df508..ba22b635 100644
Binary files a/Minecraft.Client/Windows64/Sound/Minecraft.msscmp and b/Minecraft.Client/Windows64Media/Sound/Minecraft.msscmp differ