mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-13 15:47:13 +00:00
refactor: split App_Defines.h up by concern and drop the umbrella
This commit is contained in:
parent
875039a6dd
commit
d7eca58551
|
|
@ -24,6 +24,7 @@ global_cpp_defs = [
|
|||
'-D_LARGE_WORLDS',
|
||||
'-D_EXTENDED_ACHIEVEMENTS',
|
||||
'-D_FORTIFY_SOURCE=2',
|
||||
'-DMULTITHREAD_ENABLE', # always-on threading flag (formerly in App_Defines.h)
|
||||
]
|
||||
|
||||
# Debug-only defines: keep for debug + debugoptimized so iteration is unchanged.
|
||||
|
|
|
|||
|
|
@ -1,135 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
// 4J Stu - For non-splitscreen menus, default to this screen
|
||||
#define DEFAULT_XUI_MENU_USER 0
|
||||
#define MULTITHREAD_ENABLE
|
||||
#define MAX_CAPENAME_SIZE 32
|
||||
#define MAX_BANNERNAME_SIZE 32
|
||||
#define MAX_TMSFILENAME_SIZE 40
|
||||
#define MAX_TYPE_SIZE 32
|
||||
#define MAX_EXTENSION_TYPES 3
|
||||
|
||||
#define MAX_LOCAL_PLAYERS 4
|
||||
|
||||
// 4J Stu - Required for sentient reporting of whether the volume level has been
|
||||
// changed or not
|
||||
#define DEFAULT_VOLUME_LEVEL 100
|
||||
|
||||
#define GAME_HOST_OPTION_BITMASK_DIFFICULTY 0x00000003 // 0 - 3
|
||||
#define GAME_HOST_OPTION_BITMASK_FRIENDSOFFRIENDS 0x00000004
|
||||
#define GAME_HOST_OPTION_BITMASK_GAMERTAGS 0x00000008
|
||||
#define GAME_HOST_OPTION_BITMASK_GAMETYPE 0x00000030
|
||||
#define GAME_HOST_OPTION_BITMASK_LEVELTYPE 0x00000040
|
||||
#define GAME_HOST_OPTION_BITMASK_STRUCTURES 0x00000080
|
||||
#define GAME_HOST_OPTION_BITMASK_BONUSCHEST 0x00000100
|
||||
#define GAME_HOST_OPTION_BITMASK_BEENINCREATIVE 0x00000200
|
||||
#define GAME_HOST_OPTION_BITMASK_PVP 0x00000400
|
||||
#define GAME_HOST_OPTION_BITMASK_TRUSTPLAYERS 0x00000800
|
||||
#define GAME_HOST_OPTION_BITMASK_TNT 0x00001000
|
||||
#define GAME_HOST_OPTION_BITMASK_FIRESPREADS 0x00002000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTFLY 0x00004000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTHUNGER 0x00008000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE 0x00010000
|
||||
#define GAME_HOST_OPTION_BITMASK_BEDROCKFOG 0x00020000
|
||||
#define GAME_HOST_OPTION_BITMASK_DISABLESAVE 0x00040000
|
||||
#define GAME_HOST_OPTION_BITMASK_NOTOWNER 0x00080000
|
||||
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE \
|
||||
0x00700000 // 3 bits, 5 values (unset(0), classic(1), small(2), medium(3),
|
||||
// large(4))
|
||||
#define GAME_HOST_OPTION_BITMASK_MOBGRIEFING 0x00800000
|
||||
#define GAME_HOST_OPTION_BITMASK_KEEPINVENTORY 0x01000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOMOBSPAWNING 0x02000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOMOBLOOT 0x04000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOTILEDROPS 0x08000000
|
||||
#define GAME_HOST_OPTION_BITMASK_NATURALREGEN 0x10000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE 0x20000000
|
||||
#define GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF
|
||||
|
||||
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT 20
|
||||
|
||||
enum EGameHostOptionWorldSize {
|
||||
e_worldSize_Unknown = 0,
|
||||
e_worldSize_Classic,
|
||||
e_worldSize_Small,
|
||||
e_worldSize_Medium,
|
||||
e_worldSize_Large
|
||||
};
|
||||
|
||||
#define PROFILE_VERSION_8 10
|
||||
#define PROFILE_VERSION_9 11
|
||||
|
||||
#define PROFILE_VERSION_10 12
|
||||
|
||||
// 4J-JEV: New Statistics and Achievements for 'NexGen' platforms.
|
||||
#define PROFILE_VERSION_11 13
|
||||
|
||||
// Java 1.6.4
|
||||
#define PROFILE_VERSION_12 14
|
||||
|
||||
#define PROFILE_VERSION_CURRENT PROFILE_VERSION_12
|
||||
|
||||
#define MAX_FAVORITE_SKINS \
|
||||
10 // these are stored in the profile data so keep it small
|
||||
|
||||
// defines for game settings - uiBitmaskValues
|
||||
|
||||
#define GAMESETTING_CLOUDS 0x00000001
|
||||
#define GAMESETTING_ONLINE 0x00000002
|
||||
#define GAMESETTING_INVITEONLY 0x00000004
|
||||
#define GAMESETTING_FRIENDSOFFRIENDS 0x00000008
|
||||
#define GAMESETTING_DISPLAYUPDATEMSG 0x00000030
|
||||
#define GAMESETTING_BEDROCKFOG 0x00000040
|
||||
#define GAMESETTING_DISPLAYHUD 0x00000080
|
||||
#define GAMESETTING_DISPLAYHAND 0x00000100
|
||||
#define GAMESETTING_CUSTOMSKINANIM 0x00000200
|
||||
#define GAMESETTING_DEATHMESSAGES 0x00000400
|
||||
#define GAMESETTING_UISIZE 0x00001800
|
||||
#define GAMESETTING_UISIZE_SPLITSCREEN 0x00006000
|
||||
#define GAMESETTING_ANIMATEDCHARACTER 0x00008000
|
||||
#define GAMESETTING_PS3EULAREAD 0x00010000
|
||||
#define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
|
||||
|
||||
// defines for languages
|
||||
|
||||
#define MINECRAFT_LANGUAGE_DEFAULT 0x00
|
||||
#define MINECRAFT_LANGUAGE_ENGLISH 0x01
|
||||
#define MINECRAFT_LANGUAGE_JAPANESE 0x02
|
||||
#define MINECRAFT_LANGUAGE_GERMAN 0x03
|
||||
#define MINECRAFT_LANGUAGE_FRENCH 0x04
|
||||
#define MINECRAFT_LANGUAGE_SPANISH 0x05
|
||||
#define MINECRAFT_LANGUAGE_ITALIAN 0x06
|
||||
#define MINECRAFT_LANGUAGE_KOREAN 0x07
|
||||
#define MINECRAFT_LANGUAGE_TCHINESE 0x08
|
||||
#define MINECRAFT_LANGUAGE_PORTUGUESE 0x09
|
||||
#define MINECRAFT_LANGUAGE_BRAZILIAN 0x0A
|
||||
#define MINECRAFT_LANGUAGE_RUSSIAN 0x0B
|
||||
#define MINECRAFT_LANGUAGE_DUTCH 0x0C
|
||||
#define MINECRAFT_LANGUAGE_FINISH 0x0D
|
||||
#define MINECRAFT_LANGUAGE_SWEDISH 0x0E
|
||||
#define MINECRAFT_LANGUAGE_DANISH 0x0F
|
||||
#define MINECRAFT_LANGUAGE_NORWEGIAN 0x10
|
||||
#define MINECRAFT_LANGUAGE_POLISH 0x11
|
||||
#define MINECRAFT_LANGUAGE_TURKISH 0x12
|
||||
#define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13
|
||||
#define MINECRAFT_LANGUAGE_GREEK 0x14
|
||||
|
||||
/* Match these
|
||||
|
||||
const int XC_LANGUAGE_ENGLISH =1; const int XC_LANGUAGE_JAPANESE
|
||||
=2; const int XC_LANGUAGE_GERMAN
|
||||
=3; const int XC_LANGUAGE_FRENCH
|
||||
=4; const int XC_LANGUAGE_SPANISH
|
||||
=5; const int XC_LANGUAGE_ITALIAN
|
||||
=6; const int XC_LANGUAGE_KOREAN
|
||||
=7; const int XC_LANGUAGE_TCHINESE
|
||||
=8; const int XC_LANGUAGE_PORTUGUESE =9; const int XC_LANGUAGE_BRAZILIAN
|
||||
=10; const int XC_LANGUAGE_RUSSIAN
|
||||
=11; const int XC_LANGUAGE_DUTCH
|
||||
=12; const int XC_LANGUAGE_FINISH
|
||||
=13; const int XC_LANGUAGE_SWEDISH
|
||||
=14; const int XC_LANGUAGE_DANISH
|
||||
=15; const int XC_LANGUAGE_NORWEGIAN =16; const int XC_LANGUAGE_POLISH
|
||||
=17; const int XC_LANGUAGE_TURKISH
|
||||
=18; const int XC_LANGUAGE_LATINAMERICANSPANISH =19;
|
||||
const int XC_LANGUAGE_GREEK =20;
|
||||
*/
|
||||
|
|
@ -3,7 +3,8 @@
|
|||
#include <cstdint>
|
||||
|
||||
#include "platform/storage/storage.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "app/common/Tutorial/TutorialEnum.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include <vector>
|
||||
|
||||
#include "platform/PlatformTypes.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/PlatformTypes.h"
|
||||
#include "app/common/Audio/Consoles_SoundEngine.h"
|
||||
#include "app/linux/Iggy/include/rrCore.h"
|
||||
#include "app/linux/LinuxGame.h"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ class Random;
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/PlatformTypes.h"
|
||||
#include "app/common/Audio/Consoles_SoundEngine.h"
|
||||
#include "app/linux/Iggy/include/rrCore.h"
|
||||
#include "minecraft/sounds/SoundTypes.h"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "platform/storage/storage.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/App_structs.h"
|
||||
#include "app/common/Console_Debug_enum.h"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
#include "app/common/GameSettingsManager.h"
|
||||
|
||||
#include "app/common/Game.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/Console_Debug_enum.h"
|
||||
#include "app/common/Network/GameNetworkManager.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "app/common/DLC/DLCManager.h"
|
||||
#include "app/common/Game.h"
|
||||
#include "app/common/GameRules/GameRuleManager.h"
|
||||
|
|
|
|||
|
|
@ -17,11 +17,9 @@ typedef struct {
|
|||
#define TUTORIAL_NO_TEXT -1
|
||||
#define TUTORIAL_NO_ICON -1
|
||||
|
||||
// If you want to make these bigger, be aware that that will affect what is
|
||||
// stored after the tutorial data in the profile data See Xbox_App.h for the
|
||||
// struct
|
||||
#define TUTORIAL_PROFILE_STORAGE_BITS 512
|
||||
#define TUTORIAL_PROFILE_STORAGE_BYTES (TUTORIAL_PROFILE_STORAGE_BITS / 8)
|
||||
// TUTORIAL_PROFILE_STORAGE_BITS / TUTORIAL_PROFILE_STORAGE_BYTES moved to
|
||||
// platform/profile/ProfileConstants.h since they describe profile data
|
||||
// layout. Anything that needs them should include that header directly.
|
||||
|
||||
// 4J Stu - The total number of eTutorial_State and eTutorial_Hint must be less
|
||||
// than 512, as we only have 512 bits of profile data to flag whether or not the
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <functional>
|
||||
|
||||
#include "platform/storage/storage.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "UIEnums.h"
|
||||
#include "platform/C4JThread.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
#include "platform/PlatformTypes.h"
|
||||
#include "platform/input/input.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/DLC/DLCManager.h"
|
||||
#include "app/common/DLC/DLCPack.h"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include "platform/PlatformTypes.h"
|
||||
#include "platform/input/input.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/UI/Controls/UIControl_Button.h"
|
||||
#include "app/common/UI/Controls/UIControl_DynamicLabel.h"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "app/common/Network/GameNetworkManager.h"
|
||||
#include "app/common/Network/SessionInfo.h"
|
||||
#include "app/common/UI/All Platforms/UIStructs.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
#include "platform/input/input.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/UI/Controls/UIControl_CheckBox.h"
|
||||
#include "app/common/UI/Controls/UIControl_HTMLLabel.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
#include "platform/PlatformTypes.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/DLC/DLCManager.h"
|
||||
#include "app/common/DLC/DLCPack.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include "platform/input/input.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/DLC/DLCManager.h"
|
||||
#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
#include "platform/PlatformTypes.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "platform/PlatformTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/Network/GameNetworkManager.h"
|
||||
#include "app/common/UI/All Platforms/UIStructs.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "app/common/UI/Controls/UIControl_Button.h"
|
||||
#include "app/common/UI/Controls/UIControl_DynamicLabel.h"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
#include "platform/PlatformTypes.h"
|
||||
#include "platform/input/input.h"
|
||||
#include "platform/profile/profile.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "app/common/UI/Controls/UIControl_Button.h"
|
||||
#include "app/common/UI/Controls/UIControl_Label.h"
|
||||
#include "app/common/UI/UILayer.h"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include "UIScene_TrialExitUpsell.h"
|
||||
|
||||
#include "platform/profile/profile.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "app/common/UI/UIScene.h"
|
||||
#include "app/linux/LinuxGame.h"
|
||||
#include "app/linux/Linux_UIController.h"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "app/common/UI/All Platforms/UIEnums.h"
|
||||
#include "app/common/UI/Controls/UIControl.h"
|
||||
#include "app/common/UI/Controls/UIControl_ButtonList.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "app/common/Minecraft_Macros.h"
|
||||
#include "app/common/DLC/DLCManager.h"
|
||||
#include "app/common/DLC/DLCPack.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "UIScene_Keyboard.h"
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameTypes.h"
|
||||
#include "app/common/UI/Controls/UIControl_Button.h"
|
||||
#include "app/common/UI/Controls/UIControl_Label.h"
|
||||
#include "app/common/UI/Controls/UIControl_TextInput.h"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ static void sigsegv_handler(int sig) {
|
|||
#include "platform/profile/profile.h"
|
||||
#include "platform/renderer/renderer.h"
|
||||
#include "platform/storage/storage.h"
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/profile/ProfileConstants.h"
|
||||
#include "app/common/Audio/SoundEngine.h"
|
||||
#include "app/common/Network/GameNetworkManager.h"
|
||||
#include "app/linux/LinuxGame.h"
|
||||
|
|
|
|||
|
|
@ -2,12 +2,53 @@
|
|||
|
||||
#include <cstdint>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
|
||||
// Stateless bitfield utilities - no app dependency.
|
||||
// The global-state overloads (get/set with no settings arg) have moved
|
||||
// to IgameServices().getGameHostOption / setGameHostOption.
|
||||
// Bitmask layout for the game host option settings word, plus the
|
||||
// stateless bitfield utilities used to read and write it.
|
||||
//
|
||||
// The global-state overloads (get/set with no settings arg) have moved to
|
||||
// IGameServices::getGameHostOption / setGameHostOption.
|
||||
|
||||
#define GAME_HOST_OPTION_BITMASK_DIFFICULTY 0x00000003 // 0 - 3
|
||||
#define GAME_HOST_OPTION_BITMASK_FRIENDSOFFRIENDS 0x00000004
|
||||
#define GAME_HOST_OPTION_BITMASK_GAMERTAGS 0x00000008
|
||||
#define GAME_HOST_OPTION_BITMASK_GAMETYPE 0x00000030
|
||||
#define GAME_HOST_OPTION_BITMASK_LEVELTYPE 0x00000040
|
||||
#define GAME_HOST_OPTION_BITMASK_STRUCTURES 0x00000080
|
||||
#define GAME_HOST_OPTION_BITMASK_BONUSCHEST 0x00000100
|
||||
#define GAME_HOST_OPTION_BITMASK_BEENINCREATIVE 0x00000200
|
||||
#define GAME_HOST_OPTION_BITMASK_PVP 0x00000400
|
||||
#define GAME_HOST_OPTION_BITMASK_TRUSTPLAYERS 0x00000800
|
||||
#define GAME_HOST_OPTION_BITMASK_TNT 0x00001000
|
||||
#define GAME_HOST_OPTION_BITMASK_FIRESPREADS 0x00002000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTFLY 0x00004000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTHUNGER 0x00008000
|
||||
#define GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE 0x00010000
|
||||
#define GAME_HOST_OPTION_BITMASK_BEDROCKFOG 0x00020000
|
||||
#define GAME_HOST_OPTION_BITMASK_DISABLESAVE 0x00040000
|
||||
#define GAME_HOST_OPTION_BITMASK_NOTOWNER 0x00080000
|
||||
// 3 bits, 5 values: unset(0), classic(1), small(2), medium(3), large(4)
|
||||
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE 0x00700000
|
||||
#define GAME_HOST_OPTION_BITMASK_MOBGRIEFING 0x00800000
|
||||
#define GAME_HOST_OPTION_BITMASK_KEEPINVENTORY 0x01000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOMOBSPAWNING 0x02000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOMOBLOOT 0x04000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DOTILEDROPS 0x08000000
|
||||
#define GAME_HOST_OPTION_BITMASK_NATURALREGEN 0x10000000
|
||||
#define GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE 0x20000000
|
||||
#define GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF
|
||||
|
||||
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT 20
|
||||
|
||||
enum EGameHostOptionWorldSize {
|
||||
e_worldSize_Unknown = 0,
|
||||
e_worldSize_Classic,
|
||||
e_worldSize_Small,
|
||||
e_worldSize_Medium,
|
||||
e_worldSize_Large
|
||||
};
|
||||
|
||||
namespace GameHostOptions {
|
||||
|
||||
unsigned int get(unsigned int settings, eGameHostOption option);
|
||||
|
|
|
|||
|
|
@ -4,9 +4,22 @@
|
|||
|
||||
#include "minecraft/GameEnums.h"
|
||||
|
||||
#ifndef MAX_CAPENAME_SIZE
|
||||
// Vocabulary types and small game constants shared across minecraft/.
|
||||
// Anything that used to live in app/common/App_Defines.h and represents a
|
||||
// game-side concept (asset name sizes, default control indices, etc.) lives
|
||||
// here.
|
||||
|
||||
#define MAX_CAPENAME_SIZE 32
|
||||
#endif
|
||||
#define MAX_BANNERNAME_SIZE 32
|
||||
#define MAX_TMSFILENAME_SIZE 40
|
||||
#define MAX_TYPE_SIZE 32
|
||||
#define MAX_EXTENSION_TYPES 3
|
||||
|
||||
// Default UI controller index for non-splitscreen menus.
|
||||
#define DEFAULT_XUI_MENU_USER 0
|
||||
|
||||
// Default sound/music volume level (0-100).
|
||||
#define DEFAULT_VOLUME_LEVEL 100
|
||||
|
||||
struct MOJANG_DATA {
|
||||
eXUID eXuid;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
#include <mutex>
|
||||
#include <vector>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "platform/C4JThread.h"
|
||||
#include "minecraft/client/resources/ResourceLocation.h"
|
||||
#include "minecraft/util/SmoothFloat.h"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
||||
#include "app/common/App_Defines.h"
|
||||
#include "minecraft/GameEnums.h"
|
||||
#include "minecraft/GameHostOptions.h"
|
||||
#include "app/linux/LinuxGame.h"
|
||||
#include "java/System.h"
|
||||
#include "minecraft/world/level/GameRules.h"
|
||||
|
|
|
|||
|
|
@ -74,6 +74,11 @@ inline constexpr int XUSER_MAX_COUNT = 4;
|
|||
inline constexpr int XUSER_NAME_SIZE = 32;
|
||||
inline constexpr int XUSER_INDEX_FOCUS = 254;
|
||||
|
||||
// Maximum local (split-screen) players. Same as XUSER_MAX_COUNT; kept as a
|
||||
// separate name because gameplay code talks about "local players" rather
|
||||
// than Xbox user slots.
|
||||
#define MAX_LOCAL_PLAYERS 4
|
||||
|
||||
using PlayerUID = unsigned long long;
|
||||
using PPlayerUID = PlayerUID*;
|
||||
inline constexpr PlayerUID INVALID_XUID = 0;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,71 @@
|
|||
#pragma once
|
||||
|
||||
// Profile data storage layout, schema versioning, and game settings stored
|
||||
// in profile data. Owned by the platform/profile layer because the profile
|
||||
// data structure is what defines these.
|
||||
|
||||
#define TITLEID_MINECRAFT 0x584111F7
|
||||
|
||||
// Tutorial completion bits stored in profile data. The exact byte count is
|
||||
// load-bearing for ProfileGameSettings layout in StubProfile.cpp.
|
||||
#define TUTORIAL_PROFILE_STORAGE_BITS 512
|
||||
#define TUTORIAL_PROFILE_STORAGE_BYTES (TUTORIAL_PROFILE_STORAGE_BITS / 8)
|
||||
|
||||
// Profile data schema versions
|
||||
#define PROFILE_VERSION_8 10
|
||||
#define PROFILE_VERSION_9 11
|
||||
#define PROFILE_VERSION_10 12
|
||||
// 4J-JEV: New Statistics and Achievements for 'NexGen' platforms.
|
||||
#define PROFILE_VERSION_11 13
|
||||
// Java 1.6.4
|
||||
#define PROFILE_VERSION_12 14
|
||||
#define PROFILE_VERSION_CURRENT PROFILE_VERSION_12
|
||||
|
||||
// Maximum favourite skins stored in profile data; keep small.
|
||||
#define MAX_FAVORITE_SKINS 10
|
||||
|
||||
// Bitmask values for ProfileGameSettings::uiBitmaskValues.
|
||||
#define GAMESETTING_CLOUDS 0x00000001
|
||||
#define GAMESETTING_ONLINE 0x00000002
|
||||
#define GAMESETTING_INVITEONLY 0x00000004
|
||||
#define GAMESETTING_FRIENDSOFFRIENDS 0x00000008
|
||||
#define GAMESETTING_DISPLAYUPDATEMSG 0x00000030
|
||||
#define GAMESETTING_BEDROCKFOG 0x00000040
|
||||
#define GAMESETTING_DISPLAYHUD 0x00000080
|
||||
#define GAMESETTING_DISPLAYHAND 0x00000100
|
||||
#define GAMESETTING_CUSTOMSKINANIM 0x00000200
|
||||
#define GAMESETTING_DEATHMESSAGES 0x00000400
|
||||
#define GAMESETTING_UISIZE 0x00001800
|
||||
#define GAMESETTING_UISIZE_SPLITSCREEN 0x00006000
|
||||
#define GAMESETTING_ANIMATEDCHARACTER 0x00008000
|
||||
#define GAMESETTING_PS3EULAREAD 0x00010000
|
||||
#define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
|
||||
|
||||
// Profile-stored language IDs (ucLanguage). Match the Xbox XC_LANGUAGE_*
|
||||
// values defined in XboxStubs.h.
|
||||
#define MINECRAFT_LANGUAGE_DEFAULT 0x00
|
||||
#define MINECRAFT_LANGUAGE_ENGLISH 0x01
|
||||
#define MINECRAFT_LANGUAGE_JAPANESE 0x02
|
||||
#define MINECRAFT_LANGUAGE_GERMAN 0x03
|
||||
#define MINECRAFT_LANGUAGE_FRENCH 0x04
|
||||
#define MINECRAFT_LANGUAGE_SPANISH 0x05
|
||||
#define MINECRAFT_LANGUAGE_ITALIAN 0x06
|
||||
#define MINECRAFT_LANGUAGE_KOREAN 0x07
|
||||
#define MINECRAFT_LANGUAGE_TCHINESE 0x08
|
||||
#define MINECRAFT_LANGUAGE_PORTUGUESE 0x09
|
||||
#define MINECRAFT_LANGUAGE_BRAZILIAN 0x0A
|
||||
#define MINECRAFT_LANGUAGE_RUSSIAN 0x0B
|
||||
#define MINECRAFT_LANGUAGE_DUTCH 0x0C
|
||||
#define MINECRAFT_LANGUAGE_FINISH 0x0D
|
||||
#define MINECRAFT_LANGUAGE_SWEDISH 0x0E
|
||||
#define MINECRAFT_LANGUAGE_DANISH 0x0F
|
||||
#define MINECRAFT_LANGUAGE_NORWEGIAN 0x10
|
||||
#define MINECRAFT_LANGUAGE_POLISH 0x11
|
||||
#define MINECRAFT_LANGUAGE_TURKISH 0x12
|
||||
#define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13
|
||||
#define MINECRAFT_LANGUAGE_GREEK 0x14
|
||||
|
||||
|
||||
#define CONTEXT_GAME_STATE 0
|
||||
#define CONTEXT_GAME_STATE_BLANK 0
|
||||
#define CONTEXT_GAME_STATE_RIDING_PIG 1
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
|
||||
#include "../ProfileConstants.h"
|
||||
#include "input/input.h"
|
||||
#include "../../../app/common/Tutorial/TutorialEnum.h" // 4jcraft TODO
|
||||
#include "../../../app/common/App_Defines.h" // 4jcraft TODO
|
||||
|
||||
StubProfile stub_profile_instance;
|
||||
IPlatformProfile& PlatformProfile = stub_profile_instance;
|
||||
|
|
|
|||
Loading…
Reference in a new issue