diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h index 1e1bc9a64..f35d84749 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h @@ -1,7 +1,9 @@ #pragma once + #include "../../Common/UI/UIEnums.h" -#include "../../Xbox/Sentient/SentientTelemetryCommon.h" +// #include "../../Xbox/Sentient/SentientTelemetryCommon.h" +// #include "stdafx.h" enum ETelemetryChallenges { diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h index b52457341..4220f980a 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -280,18 +280,18 @@ typedef XUID GameSessionUID; #include "Windows64\Iggy\gdraw\gdraw_d3d11.h" #include "Windows64\Windows64_UIController.h" #elif defined __linux__ - #include "Windows64/Sentient/MinecraftTelemetry.h" + // #include "Windows64/Sentient/MinecraftTelemetry.h" #include "Windows64Media/strings.h" - #include "Windows64/Windows64_App.h" - #include "Windows64/Sentient/DynamicConfigurations.h" - #include "Windows64/Sentient/SentientTelemetryCommon.h" - #include "Windows64/GameConfig/Minecraft.spa.h" - #include "Windows64/XML/ATGXmlParser.h" - #include "Windows64/Social/SocialManager.h" - #include "Common/Audio/SoundEngine.h" - #include "Windows64/Iggy/include/iggy.h" - #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" - #include "Windows64/Windows64_UIController.h" + // #include "Windows64/Windows64_App.h" + // #include "Windows64/Sentient/DynamicConfigurations.h" + // #include "Windows64/Sentient/SentientTelemetryCommon.h" + // #include "Windows64/GameConfig/Minecraft.spa.h" + // #include "Windows64/XML/ATGXmlParser.h" + // #include "Windows64/Social/SocialManager.h" + // #include "Common/Audio/SoundEngine.h" + // #include "Windows64/Iggy/include/iggy.h" + // #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" + // #include "Windows64/Windows64_UIController.h" #elif defined __PSVITA__ #include "PSVita\PSVita_App.h" #include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this diff --git a/Minecraft.World/BucketItem.cpp b/Minecraft.World/BucketItem.cpp index 21749beed..313fc6da3 100644 --- a/Minecraft.World/BucketItem.cpp +++ b/Minecraft.World/BucketItem.cpp @@ -15,7 +15,7 @@ #include "../Minecraft.Client/LocalPlayer.h" #include "../Minecraft.Client/ServerPlayer.h" #include "../Minecraft.Client/PlayerConnection.h" -#include "..\Minecraft.World\ChatPacket.h" +#include "../Minecraft.World/ChatPacket.h" #include "SoundTypes.h" BucketItem::BucketItem(int id, int content) : Item( id ) diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index 250c8a796..65b2f23af 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -249,7 +249,7 @@ void MemSect(int sect); #include "../Minecraft.Client/Windows64/Windows64_App.h" #include "../Minecraft.Client/Windows64Media/strings.h" #include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h" -#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" +// #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" #else #include "..\Minecraft.Client\Orbis\Orbis_App.h" #include "..\Minecraft.Client\OrbisMedia\strings.h"