diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp index 1110e7ed..52903958 100644 --- a/Minecraft.Client/Minimap.cpp +++ b/Minecraft.Client/Minimap.cpp @@ -79,7 +79,7 @@ void Minimap::reloadColours() int b = ((color) & 0xff) * br / 255; // 4J - changed BYTE order to save having to reorder later -#if ( defined _DURANGO || defined _WIN64 || __PSVITA__ ) +#if ( defined _DURANGO || defined _WINDOWS64 || __PSVITA__ ) LUT[i] = 255 << 24 | b << 16 | g << 8 | r; #elif defined _XBOX LUT[i] = 255 << 24 | r << 16 | g << 8 | b; diff --git a/Minecraft.Client/Tesselator.cpp b/Minecraft.Client/Tesselator.cpp index be7486ed..a7c4619c 100644 --- a/Minecraft.Client/Tesselator.cpp +++ b/Minecraft.Client/Tesselator.cpp @@ -944,7 +944,7 @@ void Tesselator::vertex(float x, float y, float z) pShortData[5] = (static_cast(v * 8192.0f)&0xffff); int16_t u2 = ((int16_t*)&_tex2)[0]; int16_t v2 = ((int16_t*)&_tex2)[1]; -#if defined _XBOX_ONE || defined __ORBIS__ +#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64 // 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/Libs/4JLibs/libs/4J_Input.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input.lib index ae10ae6c..bf0614d1 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input_d.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input_d.lib index 1d761630..49001105 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input_d.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Input_d.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile.lib index 1d15c8cd..57673016 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile_d.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile_d.lib index 1be0d2c3..9364c704 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile_d.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Profile_d.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib index 27b51571..f85dfde8 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib index 3f91e568..897d0e99 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage.lib index 49cf9b6a..143849f8 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage.lib differ diff --git a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib index c3a41c80..ed6d9494 100644 Binary files a/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib and b/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib differ