diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp index 5d9110d85..2b3b9f8ec 100644 --- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp +++ b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp @@ -121,11 +121,6 @@ int32_t IQNet::JoinGameFromInviteInfo(uint32_t dwUserIndex, uint32_t dwUserMask, void IQNet::HostGame() { _bQNetStubGameRunning = true; } void IQNet::EndGame() { _bQNetStubGameRunning = false; } -void XSetThreadProcessor(void* a, int b) {} -// #if !(0) && !(0) -// bool XCloseHandle(void* a) { return CloseHandle(a); } -// #endif // 0 - uint32_t XUserGetSigninInfo(uint32_t dwUserIndex, uint32_t dwFlags, PXUSER_SIGNIN_INFO pSigninInfo) { return 0; @@ -240,405 +235,3 @@ void XMemDestroyDecompressionContext(XMEMDECOMPRESSION_CONTEXT Context) { uint32_t XGetLanguage() { return 1; } uint32_t XGetLocale() { return 0; } uint32_t XEnableGuestSignin(bool fEnable) { return 0; } - -/////////////////////////////////////////////// Profile library -#if defined(_WINDOWS64) -static void* profileData[4]; -void C_4JProfile::Initialise(std::uint32_t dwTitleID, std::uint32_t dwOfferID, - unsigned short usProfileVersion, - unsigned int uiProfileValuesC, - unsigned int uiProfileSettingsC, - std::uint32_t* pdwProfileSettingsA, - int iGameDefinedDataSizeX4, - unsigned int* puiGameDefinedDataChangedBitmask) { - for (int i = 0; i < 4; i++) { - profileData[i] = new uint8_t[iGameDefinedDataSizeX4 / 4]; - ZeroMemory(profileData[i], - sizeof(uint8_t) * iGameDefinedDataSizeX4 / 4); - - // Set some sane initial values! - GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)profileData[i]; - pGameSettings->ucMenuSensitivity = - 100; // eGameSetting_Sensitivity_InMenu - pGameSettings->ucInterfaceOpacity = - 80; // eGameSetting_Sensitivity_InMenu - pGameSettings->usBitmaskValues |= - 0x0200; // eGameSetting_DisplaySplitscreenGamertags - on - pGameSettings->usBitmaskValues |= 0x0400; // eGameSetting_Hints - on - pGameSettings->usBitmaskValues |= 0x1000; // eGameSetting_Autosave - 2 - pGameSettings->usBitmaskValues |= 0x8000; // eGameSetting_Tooltips - on - pGameSettings->uiBitmaskValues = 0L; // reset - pGameSettings->uiBitmaskValues |= - GAMESETTING_CLOUDS; // eGameSetting_Clouds - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_ONLINE; // eGameSetting_GameSetting_Online - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends - // - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_DISPLAYUPDATEMSG; // eGameSetting_DisplayUpdateMessage - // (counter) - pGameSettings->uiBitmaskValues &= - ~GAMESETTING_BEDROCKFOG; // eGameSetting_BedrockFog - off - pGameSettings->uiBitmaskValues |= - GAMESETTING_DISPLAYHUD; // eGameSetting_DisplayHUD - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_DISPLAYHAND; // eGameSetting_DisplayHand - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_CUSTOMSKINANIM; // eGameSetting_CustomSkinAnim - on - pGameSettings->uiBitmaskValues |= - GAMESETTING_DEATHMESSAGES; // eGameSetting_DeathMessages - on - pGameSettings->uiBitmaskValues |= - (GAMESETTING_UISIZE & 0x00000800); // uisize 2 - pGameSettings->uiBitmaskValues |= - (GAMESETTING_UISIZE_SPLITSCREEN & - 0x00004000); // splitscreen ui size 3 - pGameSettings->uiBitmaskValues |= - GAMESETTING_ANIMATEDCHARACTER; // eGameSetting_AnimatedCharacter - - // on - - // TU12 - // favorite skins added, but only set in TU12 - set to FFs - for (int i = 0; i < MAX_FAVORITE_SKINS; i++) { - pGameSettings->uiFavoriteSkinA[i] = 0xFFFFFFFF; - } - pGameSettings->ucCurrentFavoriteSkinPos = 0; - // Added a bitmask in TU13 to enable/disable display of the Mash-up pack - // worlds in the saves list - pGameSettings->uiMashUpPackWorldsDisplay = 0xFFFFFFFF; - - // PS3DEC13 - pGameSettings->uiBitmaskValues &= - ~GAMESETTING_PS3EULAREAD; // eGameSetting_PS3_EULA_Read - off - - // PS3 1.05 - added Greek - pGameSettings->ucLanguage = - MINECRAFT_LANGUAGE_DEFAULT; // use the system language - - // PS Vita - network mode added - pGameSettings->uiBitmaskValues &= - ~GAMESETTING_PSVITANETWORKMODEADHOC; // eGameSetting_PSVita_NetworkModeAdhoc - // - off - - // Tutorials for most menus, and a few other things - pGameSettings->ucTutorialCompletion[0] = 0xFF; - pGameSettings->ucTutorialCompletion[1] = 0xFF; - pGameSettings->ucTutorialCompletion[2] = 0xF; - - // Has gone halfway through the tutorial - pGameSettings->ucTutorialCompletion[28] |= 1 << 0; - } -} -void C_4JProfile::SetTrialTextStringTable(CXuiStringTable* pStringTable, - int iAccept, int iReject) {} -void C_4JProfile::SetTrialAwardText(EAwardType AwardType, int iTitle, - int iText) {} -int C_4JProfile::GetLockedProfile() { return 0; } -void C_4JProfile::SetLockedProfile(int iProf) {} -bool C_4JProfile::IsSignedIn(int iQuadrant) { return (iQuadrant == 0); } -bool C_4JProfile::IsSignedInLive(int iProf) { return true; } -bool C_4JProfile::IsGuest(int iQuadrant) { return false; } -unsigned int C_4JProfile::RequestSignInUI( - bool bFromInvite, bool bLocalGame, bool bNoGuestsAllowed, - bool bMultiplayerSignIn, bool bAddUser, - int (*Func)(void*, const bool, const int iPad), void* lpParam, - int iQuadrant) { - return 0; -} -unsigned int C_4JProfile::DisplayOfflineProfile(int (*Func)(void*, const bool, - const int iPad), - void* lpParam, int iQuadrant) { - return 0; -} -unsigned int C_4JProfile::RequestConvertOfflineToGuestUI( - int (*Func)(void*, const bool, const int iPad), void* lpParam, - int iQuadrant) { - return 0; -} -void C_4JProfile::SetPrimaryPlayerChanged(bool bVal) {} -bool C_4JProfile::QuerySigninStatus(void) { return true; } -void C_4JProfile::GetXUID(int iPad, PlayerUID* pXuid, bool bOnlineXuid) { - *pXuid = 0xe000d45248242f2e; -} -bool C_4JProfile::AreXUIDSEqual(PlayerUID xuid1, PlayerUID xuid2) { - return false; -} -bool C_4JProfile::XUIDIsGuest(PlayerUID xuid) { return false; } -bool C_4JProfile::AllowedToPlayMultiplayer(int iProf) { return true; } - -void C_4JProfile::StartTrialGame() {} -void C_4JProfile::AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, - bool* allAllowed, - bool* friendsAllowed) {} -bool C_4JProfile::CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, - PPlayerUID pXuids, - unsigned int xuidCount) { - return true; -} -bool C_4JProfile::GetProfileAvatar(int iPad, - int (*Func)(void* lpParam, - std::uint8_t* thumbnailData, - unsigned int thumbnailBytes), - void* lpParam) { - return false; -} -void C_4JProfile::CancelProfileAvatarRequest() {} -int C_4JProfile::GetPrimaryPad() { return 0; } -void C_4JProfile::SetPrimaryPad(int iPad) {} -char* C_4JProfile::GetGamertag(int iPad) { return "PlayerName"; } -std::wstring C_4JProfile::GetDisplayName(int iPad) { return L"PlayerName"; } -void C_4JProfile::SetSignInChangeCallback(void (*Func)(void*, bool, - unsigned int), - void* lpParam) {} -void C_4JProfile::SetNotificationsCallback(void (*Func)(void*, std::uint32_t, - unsigned int), - void* lpParam) {} -bool C_4JProfile::RegionIsNorthAmerica(void) { return false; } -bool C_4JProfile::LocaleIsUSorCanada(void) { return false; } -int32_t C_4JProfile::GetLiveConnectionStatus() { return 0; } -bool C_4JProfile::IsSystemUIDisplayed() { return false; } -void C_4JProfile::SetProfileReadErrorCallback(void (*Func)(void*), - void* lpParam) {} -int (*defaultOptionsCallback)(void*, C_4JProfile::PROFILESETTINGS*, - const int iPad) = nullptr; -void* lpProfileParam = nullptr; -int C_4JProfile::SetDefaultOptionsCallback(int (*Func)(void*, PROFILESETTINGS*, - const int iPad), - void* lpParam) { - defaultOptionsCallback = Func; - lpProfileParam = lpParam; - return 0; -} -int C_4JProfile::SetOldProfileVersionCallback(int (*Func)(void*, unsigned char*, - const unsigned short, - const int), - void* lpParam) { - return 0; -} - -// To store the dashboard preferences for controller flipped, etc. -C_4JProfile::PROFILESETTINGS ProfileSettingsA[XUSER_MAX_COUNT]; - -C_4JProfile::PROFILESETTINGS* C_4JProfile::GetDashboardProfileSettings( - int iPad) { - return &ProfileSettingsA[iPad]; -} -void C_4JProfile::WriteToProfile(int iQuadrant, bool bGameDefinedDataChanged, - bool bOverride5MinuteLimitOnProfileWrites) {} -void C_4JProfile::ForceQueuedProfileWrites(int iPad) {} -void* C_4JProfile::GetGameDefinedProfileData(int iQuadrant) { - // 4J Stu - Don't reset the options when we call this!! - // defaultOptionsCallback(lpProfileParam, (C_4JProfile::PROFILESETTINGS - // *)profileData[iQuadrant], iQuadrant); - // pApp->SetDefaultOptions(pSettings,iPad); - - return profileData[iQuadrant]; -} -void C_4JProfile::ResetProfileProcessState() {} -void C_4JProfile::Tick(void) {} -void C_4JProfile::RegisterAward(int iAwardNumber, int iGamerconfigID, - EAwardType eType, bool bLeaderboardAffected, - CXuiStringTable* pStringTable, int iTitleStr, - int iTextStr, int iAcceptStr, - char* pszThemeName, unsigned int ulThemeSize) {} -int C_4JProfile::GetAwardId(int iAwardNumber) { return 0; } -EAwardType C_4JProfile::GetAwardType(int iAwardNumber) { - return eAwardType_Achievement; -} -bool C_4JProfile::CanBeAwarded(int iQuadrant, int iAwardNumber) { - return false; -} -void C_4JProfile::Award(int iQuadrant, int iAwardNumber, bool bForce) {} -bool C_4JProfile::IsAwardsFlagSet(int iQuadrant, int iAward) { return false; } -void C_4JProfile::RichPresenceInit(int iPresenceCount, int iContextCount) {} -void C_4JProfile::RegisterRichPresenceContext(int iGameConfigContextID) {} -void C_4JProfile::SetRichPresenceContextValue(int iPad, int iContextID, - int iVal) {} -void C_4JProfile::SetCurrentGameActivity(int iPad, int iNewPresence, - bool bSetOthersToIdle) {} - int iUpsellParam) {} -void C_4JProfile::SetUpsellCallback(void (*Func)(void* lpParam, - EUpsellType type, - EUpsellResponse response, - int iUserData), - void* lpParam) {} -void C_4JProfile::SetDebugFullOverride(bool bVal) { -} -void C_4JProfile::ShowProfileCard(int iPad, PlayerUID targetUid) {} - -/////////////////////////////////////////////// Storage library -// #ifdef _WINDOWS64 -// TODO??? -#if defined(__linux__) -C4JStorage::C4JStorage() {} -void C4JStorage::Tick() {} -C4JStorage::EMessageResult C4JStorage::RequestMessageBox( - unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, - unsigned int uiOptionC, unsigned int pad, - int (*Func)(void*, int, const C4JStorage::EMessageResult), void* lpParam, - C4JStringTable* pStringTable, wchar_t* pwchFormatString, - unsigned int focusButton) { - return C4JStorage::EMessage_Undefined; -} -C4JStorage::EMessageResult C4JStorage::GetMessageBoxResult() { - return C4JStorage::EMessage_Undefined; -} -bool C4JStorage::SetSaveDevice(int (*Func)(void*, const bool), void* lpParam, - bool bForceResetOfSaveDevice) { - return true; -} -void C4JStorage::Init(const wchar_t* pwchDefaultSaveName, char* pszSavePackName, - int iMinimumSaveSize, - int (*Func)(void*, const ESavingMessage, int), - void* lpParam) {} -void C4JStorage::ResetSaveData() {} -void C4JStorage::SetDefaultSaveNameForKeyboardDisplay( - const wchar_t* pwchDefaultSaveName) {} -void C4JStorage::SetSaveTitle(const wchar_t* pwchDefaultSaveName) {} -const wchar_t* C4JStorage::GetSaveTitle() { return L""; } -bool C4JStorage::GetSaveUniqueNumber(int32_t* piVal) { return true; } -bool C4JStorage::GetSaveUniqueFilename(char* pszName) { return true; } -void C4JStorage::SetSaveUniqueFilename(char* szFilename) {} -void C4JStorage::SetState(ESaveGameControlState eControlState, - int (*Func)(void*, const bool), void* lpParam) {} -void C4JStorage::SetSaveDisabled(bool bDisable) {} -bool C4JStorage::GetSaveDisabled(void) { return false; } -unsigned int C4JStorage::GetSaveSize() { return 0; } -void C4JStorage::GetSaveData(void* pvData, unsigned int* pulBytes) {} -void* C4JStorage::AllocateSaveData(unsigned int ulBytes) { - return new char[ulBytes]; -} -void C4JStorage::SaveSaveData(unsigned int ulBytes, uint8_t* pbThumbnail, - uint32_t cbThumbnail, uint8_t* pbTextData, - uint32_t dwTextLen) {} -void C4JStorage::CopySaveDataToNewSave(std::uint8_t* pbThumbnail, - unsigned int cbThumbnail, - wchar_t* wchNewName, - int (*Func)(void* lpParam, bool), - void* lpParam) {} -void C4JStorage::SetSaveDeviceSelected(unsigned int uiPad, bool bSelected) {} -bool C4JStorage::GetSaveDeviceSelected(unsigned int iPad) { return true; } -C4JStorage::ELoadGameStatus C4JStorage::DoesSaveExist(bool* pbExists) { - return C4JStorage::ELoadGame_Idle; -} -bool C4JStorage::EnoughSpaceForAMinSaveGame() { return true; } -void C4JStorage::SetSaveMessageVPosition(float fY) {} -// C4JStorage::ESGIStatus -// C4JStorage::GetSavesInfo(int iPad,bool ( *Func)(void*, int, CACHEINFOSTRUCT -// *, int, int32_t),void* lpParam,char *pszSavePackName) { return -// C4JStorage::ESGIStatus_Idle; } -C4JStorage::ESaveGameState C4JStorage::GetSavesInfo( - int iPad, - int (*Func)(void* lpParam, SAVE_DETAILS* pSaveDetails, const bool), - void* lpParam, char* pszSavePackName) { - return C4JStorage::ESaveGame_Idle; -} - -void C4JStorage::GetSaveCacheFileInfo(unsigned int fileIndex, - XCONTENT_DATA& xContentData) {} -void C4JStorage::GetSaveCacheFileInfo(unsigned int fileIndex, - std::uint8_t** ppbImageData, - unsigned int* pImageBytes) {} -C4JStorage::ESaveGameState C4JStorage::LoadSaveData( - PSAVE_INFO pSaveInfo, int (*Func)(void* lpParam, const bool, const bool), - void* lpParam) { - return C4JStorage::ESaveGame_Idle; -} -C4JStorage::EDeleteGameStatus C4JStorage::DeleteSaveData( - PSAVE_INFO pSaveInfo, int (*Func)(void* lpParam, const bool), - void* lpParam) { - return C4JStorage::EDeleteGame_Idle; -} -PSAVE_DETAILS C4JStorage::ReturnSavesInfo() { return nullptr; } - -void C4JStorage::RegisterMarketplaceCountsCallback( - int (*Func)(void* lpParam, C4JStorage::DLC_TMS_DETAILS*, int), - void* lpParam) {} -void C4JStorage::SetDLCPackageRoot(char* pszDLCRoot) {} -C4JStorage::EDLCStatus C4JStorage::GetDLCOffers( - int iPad, int (*Func)(void*, int, std::uint32_t, int), void* lpParam, - std::uint32_t dwOfferTypesBitmaskT) { - return C4JStorage::EDLC_Idle; -} -unsigned int C4JStorage::CancelGetDLCOffers() { return 0; } -void C4JStorage::ClearDLCOffers() {} -XMARKETPLACE_CONTENTOFFER_INFO& C4JStorage::GetOffer(unsigned int dw) { - static XMARKETPLACE_CONTENTOFFER_INFO retval = {0}; - return retval; -} -int C4JStorage::GetOfferCount() { return 0; } -unsigned int C4JStorage::InstallOffer(int iOfferIDC, uint64_t* ullOfferIDA, - int (*Func)(void*, int, int), - void* lpParam, bool bTrial) { - return 0; -} -unsigned int C4JStorage::GetAvailableDLCCount(int iPad) { return 0; } -XCONTENT_DATA& C4JStorage::GetDLC(unsigned int dw) { - static XCONTENT_DATA retval = {0}; - return retval; -} -C4JStorage::EDLCStatus C4JStorage::GetInstalledDLC(int iPad, - int (*Func)(void*, int, int), - void* lpParam) { - return C4JStorage::EDLC_Idle; -} -std::uint32_t C4JStorage::MountInstalledDLC( - int iPad, std::uint32_t dwDLC, - int (*Func)(void*, int, std::uint32_t, std::uint32_t), void* lpParam, - const char* szMountDrive) { - return 0; -} -unsigned int C4JStorage::UnmountInstalledDLC(const char* szMountDrive) { - return 0; -} -C4JStorage::ETMSStatus C4JStorage::ReadTMSFile( - int iQuadrant, eGlobalStorage eStorageFacility, - C4JStorage::eTMS_FileType eFileType, wchar_t* pwchFilename, - std::uint8_t** ppBuffer, unsigned int* pBufferSize, - int (*Func)(void*, wchar_t*, int, bool, int), void* lpParam, int iAction) { - return C4JStorage::ETMSStatus_Idle; -} -bool C4JStorage::WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename, std::uint8_t* pBuffer, - unsigned int bufferSize) { - return true; -} -bool C4JStorage::DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename) { - return true; -} -void C4JStorage::StoreTMSPathName(wchar_t* pwchName) {} -unsigned int C4JStorage::CRC(unsigned char* buf, int len) { return 0; } - -struct PTMSPP_FILEDATA; -C4JStorage::ETMSStatus C4JStorage::TMSPP_ReadFile( - int iPad, C4JStorage::eGlobalStorage eStorageFacility, - C4JStorage::eTMS_FILETYPEVAL eFileTypeVal, const char* szFilename, - int (*Func)(void*, int, int, PTMSPP_FILEDATA, const char*) /*=nullptr*/, - void* lpParam /*=nullptr*/, int iUserData /*=0*/) { - return C4JStorage::ETMSStatus_Idle; -} -#endif - -#endif - -//////////////////////////////////////////////////////// Stats counter - -/* -StatsCounter::StatsCounter() {} -void StatsCounter::award(Stat *stat, unsigned int difficulty, unsigned int -count) {} bool StatsCounter::hasTaken(Achievement *ach) { return true; } bool -StatsCounter::canTake(Achievement *ach) { return true; } unsigned int -StatsCounter::getValue(Stat *stat, unsigned int difficulty) { return 0; } -unsigned int StatsCounter::getTotalValue(Stat *stat) { return 0; } -void StatsCounter::tick(int player) {} -void StatsCounter::parse(void* data) {} -void StatsCounter::clear() {} -void StatsCounter::save(int player, bool force) {} -void StatsCounter::flushLeaderboards() {} -void StatsCounter::saveLeaderboards() {} -void StatsCounter::setupStatBoards() {} -#if defined(_DEBUG) -void StatsCounter::WipeLeaderboards() {} -#endif -*/ diff --git a/minecraft/Minecraft.World/x64headers/extraX64.h b/minecraft/Minecraft.World/x64headers/extraX64.h index b53d0c786..6b5162da6 100644 --- a/minecraft/Minecraft.World/x64headers/extraX64.h +++ b/minecraft/Minecraft.World/x64headers/extraX64.h @@ -216,8 +216,6 @@ public: static IQNetPlayer m_player[4]; }; -void XSetThreadProcessor(void* a, int b); - const int QNET_SENDDATA_LOW_PRIORITY = 0; const int QNET_SENDDATA_SECONDARY = 0; constexpr PlayerUID INVALID_XUID = 0;