fix: missing stuff from last commit
This commit is contained in:
1 parent
1a903c65dc
commit
1763155fc6
3 files changed
+43
-20
No files matched your search
@@ -2386,7 +2386,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
|
|||||||
// Remove the debug settings in the content package build
|
// Remove the debug settings in the content package build
|
||||||
//
|
//
|
||||||
////////////////////////////
|
////////////////////////////
|
||||||
#ifdef _DEBUG_MENUS_ENABLED
|
#ifndef _DEBUG_MENUS_ENABLED
|
||||||
unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
|
unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2399,9 +2399,7 @@ void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal)
|
|||||||
void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
|
void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
|
unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
|
||||||
{
|
{
|
||||||
if(iPad==-1)
|
if(iPad==-1)
|
||||||
@@ -3843,11 +3841,7 @@ void CMinecraftApp::HandleXuiActions(void)
|
|||||||
break;
|
break;
|
||||||
case eAppAction_SetDefaultOptions:
|
case eAppAction_SetDefaultOptions:
|
||||||
SetAction(i,eAppAction_Idle);
|
SetAction(i,eAppAction_Idle);
|
||||||
#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
|
SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);
|
||||||
SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);
|
|
||||||
#else
|
|
||||||
SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// if the profile data has been changed, then force a profile write
|
// if the profile data has been changed, then force a profile write
|
||||||
// It seems we're allowed to break the 5 minute rule if it's the result of a user action
|
// It seems we're allowed to break the 5 minute rule if it's the result of a user action
|
||||||
@@ -6455,7 +6449,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
|
|||||||
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN ) );
|
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN ) );
|
||||||
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT ) );
|
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT ) );
|
||||||
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT ) );
|
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT ) );
|
||||||
#if defined _XBOX_ONE || defined __PSVITA__
|
#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
|
||||||
text = replaceAll(text, L"{*CONTROLLER_VK_START*}", GetVKReplacement(VK_PAD_START ) );
|
text = replaceAll(text, L"{*CONTROLLER_VK_START*}", GetVKReplacement(VK_PAD_START ) );
|
||||||
text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}", GetVKReplacement(VK_PAD_BACK ) );
|
text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}", GetVKReplacement(VK_PAD_BACK ) );
|
||||||
#endif
|
#endif
|
||||||
@@ -6578,8 +6572,16 @@ wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned char ucAction)
|
|||||||
#ifdef __PS3__
|
#ifdef __PS3__
|
||||||
int size = 30;
|
int size = 30;
|
||||||
#elif defined _WIN64
|
#elif defined _WIN64
|
||||||
int size = 45;
|
int size;
|
||||||
if(ui.getScreenWidth() < 1920) size = 30;
|
|
||||||
|
if(ui.getScreenWidth() >= 1920)
|
||||||
|
{
|
||||||
|
size = 45;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
size = 30;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
int size = 45;
|
int size = 45;
|
||||||
#endif
|
#endif
|
||||||
@@ -6691,7 +6693,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
|
|||||||
case VK_PAD_RTHUMB_DOWNLEFT :
|
case VK_PAD_RTHUMB_DOWNLEFT :
|
||||||
replacement = L"ButtonRightStick";
|
replacement = L"ButtonRightStick";
|
||||||
break;
|
break;
|
||||||
#if defined _XBOX_ONE || defined __PSVITA__
|
#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
|
||||||
case VK_PAD_START:
|
case VK_PAD_START:
|
||||||
replacement = L"ButtonStart";
|
replacement = L"ButtonStart";
|
||||||
break;
|
break;
|
||||||
@@ -6707,8 +6709,16 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
|
|||||||
#ifdef __PS3__
|
#ifdef __PS3__
|
||||||
int size = 30;
|
int size = 30;
|
||||||
#elif defined _WIN64
|
#elif defined _WIN64
|
||||||
int size = 45;
|
int size;
|
||||||
if(ui.getScreenWidth() < 1920) size = 30;
|
|
||||||
|
if(ui.getScreenWidth() >= 1920)
|
||||||
|
{
|
||||||
|
size = 45;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
size = 30;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
int size = 45;
|
int size = 45;
|
||||||
#endif
|
#endif
|
||||||
@@ -6738,8 +6748,16 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
|
|||||||
#ifdef __PS3__
|
#ifdef __PS3__
|
||||||
int size = 22;
|
int size = 22;
|
||||||
#elif defined _WIN64
|
#elif defined _WIN64
|
||||||
int size = 33;
|
int size;
|
||||||
if(ui.getScreenWidth() < 1920) size = 22;
|
|
||||||
|
if(ui.getScreenWidth() >= 1920)
|
||||||
|
{
|
||||||
|
int size = 33;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int size = 22;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
int size = 33;
|
int size = 33;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WINDOWS64
|
#ifdef _WINDOWS64
|
||||||
C4JStorage StorageManager;
|
|
||||||
C_4JProfile ProfileManager;
|
C_4JProfile ProfileManager;
|
||||||
#endif
|
#endif
|
||||||
CSentientManager SentientManager;
|
CSentientManager SentientManager;
|
||||||
|
|||||||
@@ -1407,7 +1407,8 @@ void Minecraft::run_middle()
|
|||||||
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_RIGHT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_CHANGE_SKIN;
|
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_RIGHT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_CHANGE_SKIN;
|
||||||
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_UP)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_FLY_TOGGLE;
|
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_UP)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_FLY_TOGGLE;
|
||||||
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_DOWN)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
|
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_DOWN)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
|
||||||
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
|
//if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
|
||||||
|
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@@ -3475,8 +3476,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
|
|||||||
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG)) )
|
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG)) )
|
||||||
{
|
{
|
||||||
#ifndef _CONTENT_PACKAGE
|
#ifndef _CONTENT_PACKAGE
|
||||||
|
|
||||||
options->renderDebug = !options->renderDebug;
|
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
app.EnableDebugOverlay(options->renderDebug,iPad);
|
app.EnableDebugOverlay(options->renderDebug,iPad);
|
||||||
#else
|
#else
|
||||||
@@ -3486,6 +3485,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN)) )
|
||||||
|
{
|
||||||
|
options->renderDebug = !options->renderDebug;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if 0 //str1k3r - replaced this DPAD bind for opening the F3 Debug Menu
|
||||||
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_SPAWN_CREEPER)) && app.GetMobsDontAttackEnabled())
|
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_SPAWN_CREEPER)) && app.GetMobsDontAttackEnabled())
|
||||||
{
|
{
|
||||||
//shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(Creeper::_class->newInstance( level ));
|
//shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(Creeper::_class->newInstance( level ));
|
||||||
@@ -3494,6 +3499,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
|
|||||||
mob->moveTo(player->x+1, player->y, player->z+1, level->random->nextFloat() * 360, 0);
|
mob->moveTo(player->x+1, player->y, player->z+1, level->random->nextFloat() * 360, 0);
|
||||||
level->addEntity(mob);
|
level->addEntity(mob);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if( (player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_FLY_TOGGLE)) )
|
if( (player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_FLY_TOGGLE)) )
|
||||||
|
|||||||
Reference in new issue
Block a user