backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bitmask collision: move Java flight defines to bits 24-26

Browse source
This commit is contained in:
MCbabel 2026-03-07 18:36:11 +01:00
parent 2344d9c5dd
commit 9cd70fee07
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/Common/App_Defines.h
View file

@ -104,7 +104,6 @@ enum EGameHostOptionWorldSize
#define GAMESETTING_ANIMATEDCHARACTER 0x00008000 #define GAMESETTING_ANIMATEDCHARACTER 0x00008000
#define GAMESETTING_PS3EULAREAD 0x00010000 #define GAMESETTING_PS3EULAREAD 0x00010000
#define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000 #define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
#define GAMESETTING_JAVAFLIGHTCONTROLS 0x00040000
// defines for languages // defines for languages

10
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -2308,13 +2308,6 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
GameSettingsA[iPad]->bSettingsChanged=true; GameSettingsA[iPad]->bSettingsChanged=true;
} }
break; break;
case eGameSetting_JavaFlightControls:
if(ucVal==1)
GameSettingsA[iPad]->uiBitmaskValues|=GAMESETTING_JAVAFLIGHTCONTROLS;
else
GameSettingsA[iPad]->uiBitmaskValues&=~GAMESETTING_JAVAFLIGHTCONTROLS;
GameSettingsA[iPad]->bSettingsChanged=true;
break;
} }
} }
@ -2451,9 +2444,6 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
case eGameSetting_PSVita_NetworkModeAdhoc: case eGameSetting_PSVita_NetworkModeAdhoc:
return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)>>17; return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)>>17;
case eGameSetting_JavaFlightControls:
return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_JAVAFLIGHTCONTROLS)?1:0;
} }
return 0; return 0;
} }