diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h index 40bca2709..91303e362 100644 --- a/Minecraft.Client/Platform/Common/App_structs.h +++ b/Minecraft.Client/Platform/Common/App_structs.h @@ -2,228 +2,205 @@ #include -typedef struct -{ - wchar_t *wchFilename; - eFileExtensionType eEXT; - eTMSFileType eTMSType; - std::uint8_t *pbData; - unsigned int uiSize; - int iConfig; // used for texture pack data files -} -TMS_FILE; +typedef struct { + wchar_t* wchFilename; + eFileExtensionType eEXT; + eTMSFileType eTMSType; + std::uint8_t* pbData; + unsigned int uiSize; + int iConfig; // used for texture pack data files +} TMS_FILE; -typedef struct -{ - std::uint8_t *pbData; - unsigned int byteCount; - std::uint8_t ucRefCount; -} -MEMDATA,*PMEMDATA; +typedef struct { + std::uint8_t* pbData; + unsigned int byteCount; + std::uint8_t ucRefCount; +} MEMDATA, *PMEMDATA; -typedef struct -{ - unsigned int dwNotification; - unsigned int uiParam; -} -NOTIFICATION,*PNOTIFICATION; +typedef struct { + unsigned int dwNotification; + unsigned int uiParam; +} NOTIFICATION, *PNOTIFICATION; -typedef struct -{ - bool bSettingsChanged; - unsigned char ucMusicVolume; - unsigned char ucSoundFXVolume; - unsigned char ucSensitivity; - unsigned char ucGamma; - unsigned char ucPad01; // 1 byte of padding inserted here - unsigned short usBitmaskValues; // bit 0,1 - difficulty - // bit 2 - view bob - // bit 3 - player visible in a map - // bit 4,5 - control scheme - // bit 6 - invert look - // bit 7 - southpaw - // bit 8 - splitscreen vertical +typedef struct { + bool bSettingsChanged; + unsigned char ucMusicVolume; + unsigned char ucSoundFXVolume; + unsigned char ucSensitivity; + unsigned char ucGamma; + unsigned char ucPad01; // 1 byte of padding inserted here + unsigned short usBitmaskValues; // bit 0,1 - difficulty + // bit 2 - view bob + // bit 3 - player visible in a map + // bit 4,5 - control scheme + // bit 6 - invert look + // bit 7 - southpaw + // bit 8 - splitscreen vertical - // 4J-PB - Adding new values for interim TU for 1.6.6 - // bit 9 - Display gamertags in splitscreen - // bit 10 - Disable/Enable hints - // bit 11,12,13,14 - Autosave frequency - 0 = Off, 8 = (8*15 minutes) = 2 hours - // bit 15 Tooltips + // 4J-PB - Adding new values for interim TU for 1.6.6 + // bit 9 - Display gamertags in splitscreen + // bit 10 - Disable/Enable hints + // bit 11,12,13,14 - Autosave frequency - 0 = Off, 8 = (8*15 minutes) + // = 2 hours bit 15 Tooltips - // debug values - unsigned int uiDebugBitmask; + // debug values + unsigned int uiDebugBitmask; - // block off space to use for whatever we want (e.g bitflags for storing things the player has done in the game, so we can flag the first time they do things, such as sleep) - union - { - struct - { - unsigned char ucTutorialCompletion[TUTORIAL_PROFILE_STORAGE_BYTES]; - // adding new flags for interim TU to 1.6.6 + // block off space to use for whatever we want (e.g bitflags for storing + // things the player has done in the game, so we can flag the first time + // they do things, such as sleep) + union { + struct { + unsigned char ucTutorialCompletion[TUTORIAL_PROFILE_STORAGE_BYTES]; + // adding new flags for interim TU to 1.6.6 - // A value that encodes the skin that the player has set as their default - std::uint32_t dwSelectedSkin; + // A value that encodes the skin that the player has set as their + // default + std::uint32_t dwSelectedSkin; - // In-Menu sensitivity - unsigned char ucMenuSensitivity; - unsigned char ucInterfaceOpacity; - unsigned char ucPad02;//2 bytes of padding added here - unsigned char usPad03; + // In-Menu sensitivity + unsigned char ucMenuSensitivity; + unsigned char ucInterfaceOpacity; + unsigned char ucPad02; // 2 bytes of padding added here + unsigned char usPad03; - // Adding another bitmask flag for more settings for 1.8.2 - unsigned int uiBitmaskValues; // 0x00000001 - eGameSetting_Clouds - on - // 0x00000002 - eGameSetting_GameSetting_Online - on - // 0x00000004 - eGameSetting_GameSetting_Invite - off - // 0x00000008 - eGameSetting_GameSetting_FriendsOfFriends - on - // 0x00000010 - eGameSetting_PSVita_NetworkModeAdhoc - on + // Adding another bitmask flag for more settings for 1.8.2 + unsigned int + uiBitmaskValues; // 0x00000001 - eGameSetting_Clouds - on + // 0x00000002 - eGameSetting_GameSetting_Online - on + // 0x00000004 - eGameSetting_GameSetting_Invite - off + // 0x00000008 - eGameSetting_GameSetting_FriendsOfFriends - on + // 0x00000010 - eGameSetting_PSVita_NetworkModeAdhoc - on - // TU 5 - // 0x00000030 - eGameSetting_DisplayUpdateMessage - 3 - counts down to zero - // TU 6 - // 0x00000040 - eGameSetting_BedrockFog - off - // 0x00000080 - eGameSetting_DisplayHUD - on - // 0x00000100 - eGameSetting_DisplayHand - on - // TU 7 - // 0x00000200 - eGameSetting_CustomSkinAnim - on + // TU 5 + // 0x00000030 - eGameSetting_DisplayUpdateMessage - 3 - counts down + // to zero TU 6 0x00000040 - eGameSetting_BedrockFog - off + // 0x00000080 - eGameSetting_DisplayHUD - on + // 0x00000100 - eGameSetting_DisplayHand - on + // TU 7 + // 0x00000200 - eGameSetting_CustomSkinAnim - on - // TU9 // 0x00000400 - eGameSetting_DeathMessages - on + // TU9 + // // 0x00000400 - eGameSetting_DeathMessages - on - // Adding another bitmask to store "special" completion tasks for the tutorial - unsigned int uiSpecialTutorialBitmask; + // Adding another bitmask to store "special" completion tasks for + // the tutorial + unsigned int uiSpecialTutorialBitmask; - // A value that encodes the cape that the player has set - std::uint32_t dwSelectedCape; + // A value that encodes the cape that the player has set + std::uint32_t dwSelectedCape; - unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS]; - unsigned char ucCurrentFavoriteSkinPos; - - // TU13 - unsigned int uiMashUpPackWorldsDisplay; // bitmask to enable/disable the display of the individual mash-up pack worlds + unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS]; + unsigned char ucCurrentFavoriteSkinPos; - // PS3 1.05 - Adding Greek, so need a language - unsigned char ucLanguage; - // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES below - // was 192 - //unsigned char ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(DWORD)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(LONG)-sizeof(LONG)-sizeof(DWORD)]; - // 4J-PB - don't need to define the padded space, the union with ucReservedSpace will make the sizeof GAME_SETTINGS correct - }; + // TU13 + unsigned int + uiMashUpPackWorldsDisplay; // bitmask to enable/disable the + // display of the individual mash-up + // pack worlds - unsigned char ucReservedSpace[192]; + // PS3 1.05 - Adding Greek, so need a language + unsigned char ucLanguage; + // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES below + // was 192 + // unsigned char + // ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(DWORD)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(LONG)-sizeof(LONG)-sizeof(DWORD)]; + // 4J-PB - don't need to define the padded space, the union with + // ucReservedSpace will make the sizeof GAME_SETTINGS correct + }; - - }; -} -GAME_SETTINGS; + unsigned char ucReservedSpace[192]; + }; +} GAME_SETTINGS; #ifdef _XBOX_ONE -typedef struct -{ - WCHAR wchPlayerUID[64]; - char pszLevelName[14]; -} -BANNEDLISTDATA,*PBANNEDLISTDATA; +typedef struct { + WCHAR wchPlayerUID[64]; + char pszLevelName[14]; +} BANNEDLISTDATA, *PBANNEDLISTDATA; #else -typedef struct -{ - PlayerUID xuid; - char pszLevelName[14]; -} -BANNEDLISTDATA,*PBANNEDLISTDATA; +typedef struct { + PlayerUID xuid; + char pszLevelName[14]; +} BANNEDLISTDATA, *PBANNEDLISTDATA; #endif -typedef std::vector VBANNEDLIST; +typedef std::vector VBANNEDLIST; -typedef struct -{ - int iPad; - eXuiAction action; -} -XuiActionParam; +typedef struct { + int iPad; + eXuiAction action; +} XuiActionParam; // tips -typedef struct -{ - int iSortValue; - int uiStringID; -} -TIPSTRUCT; +typedef struct { + int iSortValue; + int uiStringID; +} TIPSTRUCT; +typedef struct { + eXUID eXuid; + WCHAR wchCape[MAX_CAPENAME_SIZE]; + WCHAR wchSkin[MAX_CAPENAME_SIZE]; +} MOJANG_DATA; -typedef struct -{ - eXUID eXuid; - WCHAR wchCape[MAX_CAPENAME_SIZE]; - WCHAR wchSkin[MAX_CAPENAME_SIZE]; -} -MOJANG_DATA; - -typedef struct -{ - eDLCContentType eDLCType; -#if defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__) - char chImageURL[256];//SCE_NP_COMMERCE2_URL_LEN +typedef struct { + eDLCContentType eDLCType; +#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) + char chImageURL[256]; // SCE_NP_COMMERCE2_URL_LEN #else #ifdef _XBOX_ONE - std::wstring wsProductId; - std::wstring wsDisplayName; + std::wstring wsProductId; + std::wstring wsDisplayName; - // add a store for the local DLC image - std::uint8_t *pbImageData; - unsigned int dwImageBytes; + // add a store for the local DLC image + std::uint8_t* pbImageData; + unsigned int dwImageBytes; #else - ULONGLONG ullOfferID_Full; - ULONGLONG ullOfferID_Trial; + ULONGLONG ullOfferID_Full; + ULONGLONG ullOfferID_Trial; #endif - WCHAR wchBanner[MAX_BANNERNAME_SIZE]; - WCHAR wchDataFile[MAX_BANNERNAME_SIZE]; - int iGender; + WCHAR wchBanner[MAX_BANNERNAME_SIZE]; + WCHAR wchDataFile[MAX_BANNERNAME_SIZE]; + int iGender; #endif - int iConfig; - unsigned int uiSortIndex; -} -DLC_INFO; + int iConfig; + unsigned int uiSortIndex; +} DLC_INFO; - -typedef struct -{ - int x,z; - _eTerrainFeatureType eTerrainFeature; -} -FEATURE_DATA; +typedef struct { + int x, z; + _eTerrainFeatureType eTerrainFeature; +} FEATURE_DATA; // banned list -typedef struct -{ - std::uint8_t *pBannedList; - unsigned int byteCount; -} -BANNEDLIST; +typedef struct { + std::uint8_t* pBannedList; + unsigned int byteCount; +} BANNEDLIST; -typedef struct _DLCRequest -{ - std::uint32_t dwType; - eDLCContentState eState; -} -DLCRequest; +typedef struct _DLCRequest { + std::uint32_t dwType; + eDLCContentState eState; +} DLCRequest; -typedef struct _TMSPPRequest -{ - eTMSContentState eState; - eDLCContentType eType; - C4JStorage::eGlobalStorage eStorageFacility; - C4JStorage::eTMS_FILETYPEVAL eFileTypeVal; - //char szFilename[MAX_TMSFILENAME_SIZE]; +typedef struct _TMSPPRequest { + eTMSContentState eState; + eDLCContentType eType; + C4JStorage::eGlobalStorage eStorageFacility; + C4JStorage::eTMS_FILETYPEVAL eFileTypeVal; + // char szFilename[MAX_TMSFILENAME_SIZE]; #ifdef _XBOX_ONE - int( *CallbackFunc)(void *,int,int,void *, WCHAR *); + int (*CallbackFunc)(void*, int, int, void*, WCHAR*); #else - int( *CallbackFunc)(void *,int,int,C4JStorage::PTMSPP_FILEDATA, LPCSTR szFilename); + int (*CallbackFunc)(void*, int, int, C4JStorage::PTMSPP_FILEDATA, + LPCSTR szFilename); #endif - WCHAR wchFilename[MAX_TMSFILENAME_SIZE]; + WCHAR wchFilename[MAX_TMSFILENAME_SIZE]; - void *lpCallbackParam; -} -TMSPPRequest; + void* lpCallbackParam; +} TMSPPRequest; typedef std::pair SceneStackPair;