diff --git a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 index bad16d61..17415f94 100644 --- a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 @@ -24,7 +24,7 @@ $folderCopies = @( @{ Source = "DurangoMedia"; Dest = "Windows64Media" }, @{ Source = "Windows64Media"; Dest = "Windows64Media" }, @{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, - @{ Source = "Windows64Media\music"; Dest = "Windows64Media\music" }, + @{ Source = "music"; Dest = "Windows64Media\music" }, @{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" }, @{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" } ) diff --git a/Minecraft.Client/Tesselator.cpp b/Minecraft.Client/Tesselator.cpp index ea9e4709..7fea8c03 100644 --- a/Minecraft.Client/Tesselator.cpp +++ b/Minecraft.Client/Tesselator.cpp @@ -832,7 +832,7 @@ void Tesselator::vertex(float x, float y, float z) pShortData[5] = (((int)(v * 8192.0f))&0xffff); int16_t u2 = ((int16_t*)&_tex2)[0]; int16_t v2 = ((int16_t*)&_tex2)[1]; -#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64 +#if defined _XBOX_ONE || defined __ORBIS__ // Optimisation - pack the second UVs into a single short (they could actually go in a byte), which frees up a short to store the x offset for this chunk in the vertex itself. // This means that when rendering chunks, we don't need to update the vertex constants that specify the location for a chunk, when only the x offset has changed. pShortData[6] = ( u2 << 8 ) | v2; diff --git a/Minecraft.Client/Windows64/Sound/Minecraft.msscmp b/Minecraft.Client/Windows64/Sound/Minecraft.msscmp new file mode 100644 index 00000000..0d0df508 Binary files /dev/null and b/Minecraft.Client/Windows64/Sound/Minecraft.msscmp differ