diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp
index f11b6845..2089b1b7 100644
--- a/Minecraft.Client/BufferedImage.cpp
+++ b/Minecraft.Client/BufferedImage.cpp
@@ -93,14 +93,13 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
if(bTitleUpdateTexture)
{
- // Make the content package point to to the UPDATE: drive is needed
wDrive= wstr + L"\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"/Common/";
}
-#elif __PSVITA__
+//#elif __PSVITA__
/*char *pchUsrDir=getUsrDirPath();
@@ -115,20 +114,9 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
{
wDrive= wstr + L"/Common/";
}*/
-
- if(bTitleUpdateTexture)
- {
- // Make the content package point to to the UPDATE: drive is needed
- wDrive= L"Common\\res\\TitleUpdate\\";
- }
- else
- {
- wDrive= L"Common/";
- }
#else
if(bTitleUpdateTexture)
{
- // Make the content package point to to the UPDATE: drive is needed
wDrive= L"Common\\res\\TitleUpdate\\";
}
else
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 74351f74..3db51280 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -637,8 +637,9 @@ void StatsCounter::WipeLeaderboards() {}
#endif
*/
-#ifdef __PS3__
-bool C_4JProfile::IsFullVersion() { return true; }
+//str1k3r - needed on every platform but windows64 until we decomp the other libs
+#ifndef _WINDOWS64
+bool C_4JProfile::IsFullVersion() { return true; }
#endif
#ifdef _WINDOWS64
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 890f1db9..55f93d6b 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -718,6 +718,7 @@
true
$(OutDir)$(ProjectName).pdb
xavatar2d.lib;xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirund.lib;xuirenderd.lib;xuihtmld.lib;xonline.lib;xhvd2.lib;qnetxaudio2d.lib;xpartyd.lib;..\Minecraft.World\Debug\Minecraft.World.lib;xbox\4JLibs\libs\4J_Input_d.lib;xbox\4JLibs\libs\4J_Storage_d.lib;xbox\4JLibs\libs\4J_Profile_d.lib;xbox\4JLibs\libs\4J_Render_d.lib;xsocialpostd.lib;xrnmd.lib;xbox\Sentient\libs\SenCoreD.lib;xbox\Sentient\libs\SenNewsD.lib;xbox\Sentient\libs\SenUGCD.lib;xbox\Sentient\libs\SenBoxArtD.lib;nuiapid.lib;STd.lib;NuiFitnessApid.lib;NuiHandlesd.lib;NuiSpeechd.lib;xhttpd.lib;xauthd.lib;xgetserviceendpointd.lib;xavd.lib;xjsond.lib;xbox\4JLibs\libs\4J_XTMS_d.lib;%(AdditionalDependencies)
+ /FORCE:MULTIPLE %(AdditionalOptions)
powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"
@@ -761,6 +762,7 @@
false
UseLinkTimeCodeGeneration
true
+ /FORCE:MULTIPLE %(AdditionalOptions)
$(ProjectDir)xbox\xex-dev.xml
@@ -1168,6 +1170,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUxapilib.lib
false
false
+ /FORCE:MULTIPLE %(AdditionalOptions)
$(ProjectDir)xbox\xex.xml
@@ -1216,6 +1219,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUxapilib.lib
false
false
+ /FORCE:MULTIPLE %(AdditionalOptions)
$(ProjectDir)xbox\xex.xml
@@ -1264,6 +1268,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUxapilib.lib
false
false
+ /FORCE:MULTIPLE %(AdditionalOptions)
$(ProjectDir)xbox\xex.xml
@@ -1313,6 +1318,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUxapilib.lib
false
false
+ /FORCE:MULTIPLE %(AdditionalOptions)
$(ProjectDir)xbox\xex.xml
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters
index 756b32c2..76ad6dd4 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj.filters
+++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters
@@ -351,9 +351,6 @@
{71d6ccac-7a6e-4399-987b-06b606056f59}
-
- {05765c7e-26d6-4760-b0f6-7aa9f374d163}
-
{02363026-02fd-4efc-a115-6ae3dc652546}
@@ -582,9 +579,6 @@
{3eefa342-44e2-493a-9165-40f85bcef557}
-
- {f88c0f6a-8051-41e7-9bf6-b9d3c7bb2937}
-
{a6b9803b-8dc2-4552-856e-470f78757533}
@@ -3790,9 +3784,6 @@
Common\Source Files\Leaderboards
-
- PSVita
-
Windows64\Source Files
@@ -3805,6 +3796,9 @@
Windows64\Windows64Extras
+
+ PSVita\PSVitaExtras
+
@@ -5940,9 +5934,6 @@
Common\Source Files\Leaderboards
-
- PSVita
-
Xbox
@@ -5952,6 +5943,9 @@
Windows64\Windows64Extras
+
+ PSVita\PSVitaExtras
+
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 70848a94..248c7366 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -224,8 +224,7 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet
// 4J-PB - Removed it from here on Orbis due to it causing a crash with the network init.
// We should work out why...
- //str1k3r - removed on Windows64 as the SoundEngine was starting really late
-#if !(defined __ORBIS__ || _WINDOWS64)
+#ifndef __ORBIS__
this->soundEngine->init(NULL);
#endif
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index dae6e80d..1e36fcf8 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -121,12 +121,22 @@ void DefineActions(void)
// Split into Menu actions, and in-game actions
- InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ if(InputManager.IsSelectBackSwapped())
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL, _360_JOY_BUTTON_A);
+ }
+ else
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
+ }
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_X, _360_JOY_BUTTON_X);
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_Y, _360_JOY_BUTTON_Y);
- InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_UP, _360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_DOWN, _360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_LEFT, _360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -170,12 +180,22 @@ void DefineActions(void)
InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_UP, _360_JOY_BUTTON_DPAD_UP);
InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_DOWN, _360_JOY_BUTTON_DPAD_DOWN);
- InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ if(InputManager.IsSelectBackSwapped())
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL, _360_JOY_BUTTON_A);
+ }
+ else
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
+ }
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_X, _360_JOY_BUTTON_X);
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_Y, _360_JOY_BUTTON_Y);
- InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_UP, _360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_DOWN, _360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_LEFT, _360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -219,12 +239,22 @@ void DefineActions(void)
InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_UP, _360_JOY_BUTTON_DPAD_UP);
InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_DOWN, _360_JOY_BUTTON_DPAD_DOWN);
- InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ if(InputManager.IsSelectBackSwapped())
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL, _360_JOY_BUTTON_A);
+ }
+ else
+ {
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B, _360_JOY_BUTTON_B);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK, _360_JOY_BUTTON_A);
+ InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
+ }
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_X, _360_JOY_BUTTON_X);
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_Y, _360_JOY_BUTTON_Y);
- InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK, _360_JOY_BUTTON_A);
- InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL, _360_JOY_BUTTON_B);
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_UP, _360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_DOWN, _360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_LEFT, _360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -813,9 +843,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
Sleep(10000);
#endif
- //str1k3r - moved here from Minecraft.cpp so the SoundEngine starts faster
- pMinecraft->soundEngine->init(NULL);
-
MSG msg = {0};
while( WM_QUIT != msg.message )
{
@@ -873,7 +900,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
ui.tick();
ui.render();
- //str1k3r - update RenderManager's & gdraw's resolution
+ //str1k3r - update resolution
ui.updateResolution(g_iScreenWidth, g_iScreenHeight);
// Present the frame.
@@ -939,6 +966,10 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
Vec3::resetPool();
}
+ //str1k3r - shutdown server & network manager
+ MinecraftServer::HaltServer();
+ g_NetworkManager.Terminate();
+
//str1k3r - unregister the minecraft window class
UnregisterClass("MinecraftClass", g_hInst);
diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp
index 4ee2e9ac..a2019da6 100644
--- a/Minecraft.Client/Xbox/Xbox_App.cpp
+++ b/Minecraft.Client/Xbox/Xbox_App.cpp
@@ -184,6 +184,9 @@
CConsoleMinecraftApp app;
+//str1k3r - shrug no mo demo hopefully, mrowwwwww
+bool C_4JProfile::IsFullVersion() { return true; }
+
LPCWSTR apwstrLocale[10] =
{
L"", // the default locale
diff --git a/Minecraft.Client/XboxMedia/XZP/Minecraft.xzp b/Minecraft.Client/XboxMedia/XZP/Minecraft.xzp
index 3503d897..1bcf2bdb 100644
Binary files a/Minecraft.Client/XboxMedia/XZP/Minecraft.xzp and b/Minecraft.Client/XboxMedia/XZP/Minecraft.xzp differ