chore: clean up

Minecraft.Client/stdafx.h

@@ -14,18 +14,10 @@
 
 // use  - #pragma message(__LOC__"Need to do something here")
 
-// #ifndef _XBOX
-// #ifdef _CONTENT_PACKAGE
-// #define TO_BE_IMPLEMENTED
-// #endif
-// #endif
-
 #ifdef __PS3__
-
 #include "Ps3Types.h"
 #include "Ps3Stubs.h"
 #include "PS3Maths.h"
-
 #elif defined __ORBIS__
 #define AUTO_VAR(_var, _val) auto _var = _val
 #include <stdio.h>
@@ -106,10 +98,18 @@ typedef XUID PlayerUID;
 typedef XNKID SessionID;
 typedef XUID GameSessionUID;
 #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
+#endif
 
-#include "..\Minecraft.Client\xbox\network\extra.h"
+#ifndef _XBOX
+#include "Xbox\GameConfig\Minecraft.spa.h"
+#include "Common\Audio\SoundEngine.h"
+#include "extraX64client.h"
 #else
+#include "..\Minecraft.Client\xbox\network\extra.h"
+#include "Xbox\Audio\SoundEngine.h"
 #include "extraX64.h"
+#include <xonline.h>
+#include <xparty.h>
 #endif
 
 #ifdef __PS3__
@@ -123,7 +123,6 @@ typedef XUID GameSessionUID;
 #include <sysutil/sysutil_common.h>
 #include <sysutil/sysutil_savedata.h>
 #include <sysutil/sysutil_sysparam.h>
-
 #endif
 
 // C RunTime Header Files
@@ -143,11 +142,6 @@ typedef XUID GameSessionUID;
 
 #include <assert.h>
 
-#ifdef _XBOX
-#include <xonline.h>
-#include <xparty.h>
-#endif
-
 #include "..\Minecraft.World\Definitions.h"
 #include "..\Minecraft.World\class.h"
 #include "..\Minecraft.World\ArrayWithLength.h"
@@ -163,7 +157,6 @@ typedef XUID GameSessionUID;
 	#include "xbox\4JLibs\inc\4J_XTMS.h"
 	#include "xbox\4JLibs\inc\4J_Storage.h"
 #elif defined (__PS3__)
-
 	#include "PS3\4JLibs\inc\4J_Input.h"
 	#include "PS3\4JLibs\inc\4J_Profile.h"
 	#include "PS3\4JLibs\inc\4J_Render.h"
@@ -210,12 +203,11 @@ typedef XUID GameSessionUID;
 
 #include "Common\UI\UIEnums.h"
 #include "Common\UI\UIStructs.h"
-// #ifdef _XBOX
 #include "Common\App_defines.h"
 #include "Common\App_enums.h"
 #include "Common\Tutorial\TutorialEnum.h"
 #include "Common\App_structs.h"
-//#endif
+
 
 #include "Common\Consoles_App.h"
 #include "Common\Minecraft_Macros.h"
@@ -233,21 +225,16 @@ typedef XUID GameSessionUID;
 	#include "Xbox\XML\ATGXmlParser.h"
 	#include "Xbox\Leaderboards\XboxLeaderboardManager.h"
 	#include "Xbox\Social\SocialManager.h"
-	#include "Xbox\Audio\SoundEngine.h"
 	#include "Xbox\Xbox_UIController.h"
-
 #elif defined (__PS3__)
-	#include "extraX64client.h"
 	#include "PS3\Sentient\MinecraftTelemetry.h"
 	#include "PS3\Sentient\DynamicConfigurations.h"
 	#include "PS3\Sentient\SentientTelemetryCommon.h"
 	#include "PS3Media\strings.h"
 	#include "PS3\PS3_App.h"
-	#include "PS3\GameConfig\Minecraft.spa.h"
 	#include "PS3Media\4J_strings.h"
 	#include "PS3\XML\ATGXmlParser.h"
 	#include "PS3\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
 	#include "PS3\Iggy\include\iggy.h"
 	#include "PS3\Iggy\gdraw\gdraw_ps3gcm.h"
 	#include "PS3\PS3_UIController.h"
@@ -262,7 +249,6 @@ typedef XUID GameSessionUID;
 	#include "DurangoMedia\4J_strings.h"
 	#include "Durango\XML\ATGXmlParser.h"
 	#include "Durango\Social\SocialManager.h"
-#include "Common\Audio\SoundEngine.h"
 	#include "Durango\Iggy\include\iggy.h"
 	#include "Durango\Iggy\gdraw\gdraw_d3d11.h"
 	#include "Durango\Durango_UIController.h"
@@ -272,7 +258,6 @@ typedef XUID GameSessionUID;
 	#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"
@@ -281,24 +266,21 @@ typedef XUID GameSessionUID;
 	#include "Windows64\Windows64_UIController.h"
 #elif defined __PSVITA__
 	#include "PSVita\PSVita_App.h"
-	#include "PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
+	#include "PSVitaMedia\strings.h"
 	#include "PSVita\Sentient\SentientManager.h"
 	#include "PSVita\Sentient\MinecraftTelemetry.h"
 	#include "PSVita\Sentient\DynamicConfigurations.h"
-	#include "PSVita\GameConfig\Minecraft.spa.h"
 	#include "PSVita\XML\ATGXmlParser.h"
 	#include "PSVita\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
 	#include "PSVita\Iggy\include\iggy.h"
 	#include "PSVita\Iggy\gdraw\gdraw_psp2.h"
 	#include "PSVita\PSVita_UIController.h"
-#else
+#elif __ORBIS__
 	#include "Orbis\Sentient\MinecraftTelemetry.h"
 	#include "OrbisMedia\strings.h"
 	#include "Orbis\Orbis_App.h"
 	#include "Orbis\Sentient\SentientTelemetryCommon.h"
 	#include "Orbis\Sentient\DynamicConfigurations.h"
-	#include "Orbis\GameConfig\Minecraft.spa.h"
 	#include "OrbisMedia\4J_strings.h"
 	#include "Orbis\XML\ATGXmlParser.h"	
 	#include "Windows64\Social\SocialManager.h"
@@ -332,14 +314,7 @@ typedef XUID GameSessionUID;
 #include "Common\DLC\DLCPack.h"
 #include "Common\Telemetry\TelemetryManager.h"
 
-#ifdef _XBOX
-//#include "Xbox\Xbox_App.h"
-#elif !defined(__PS3__)
-#include "extraX64client.h"
-#endif
-
-
-
+#ifndef _WINDOWS64
 #ifdef _FINAL_BUILD
 #define printf BREAKTHECOMPILE
 #define wprintf BREAKTHECOMPILE
@@ -348,5 +323,6 @@ typedef XUID GameSessionUID;
 #define OutputDebugStringA BREAKTHECOMPILE
 #define OutputDebugStringW BREAKTHECOMPILE
 #endif
+#endif
 
 void MemSect(int sect);