From 0b5b33d28d879d8a19452566a78766bde08a2223 Mon Sep 17 00:00:00 2001 From: Tuff-CWC Date: Mon, 9 Mar 2026 15:36:35 +0100 Subject: [PATCH] comment debugbreak out --- Minecraft.Client/ArchiveFile.cpp | 2 +- Minecraft.Client/Chunk.cpp | 2 +- Minecraft.Client/Common/Consoles_App.cpp | 6 +-- Minecraft.Client/Common/DLC/DLCManager.cpp | 4 +- Minecraft.Client/Common/DLC/DLCPack.cpp | 6 +-- .../Common/GameRules/ConsoleSchematicFile.cpp | 4 +- .../Common/GameRules/GameRule.cpp | 2 +- .../Common/GameRules/GameRuleManager.cpp | 2 +- .../Leaderboards/SonyLeaderboardManager.cpp | 2 +- .../Sony/PlatformNetworkManagerSony.cpp | 2 +- Minecraft.Client/Common/UI/UIScene.cpp | 38 +++++++++---------- .../Common/UI/UIScene_MainMenu.cpp | 2 +- Minecraft.Client/DLCTexturePack.cpp | 4 +- Minecraft.Client/Durango/Durango_App.cpp | 2 +- .../Durango/Durango_UIController.cpp | 2 +- .../Network/PlatformNetworkManagerDurango.cpp | 2 +- Minecraft.Client/EntityRenderDispatcher.cpp | 2 +- Minecraft.Client/EntityTracker.cpp | 2 +- Minecraft.Client/GameRenderer.cpp | 2 +- Minecraft.Client/LocalPlayer.cpp | 2 +- .../Leaderboards/OrbisLeaderboardManager.cpp | 2 +- .../Orbis/OrbisExtras/OrbisStubs.h | 2 +- Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h | 2 +- .../PSVita/PSVitaExtras/PSVitaStubs.h | 2 +- Minecraft.Client/Particle.cpp | 4 +- Minecraft.Client/PreStitchedTextureMap.cpp | 2 +- Minecraft.Client/Stitcher.cpp | 2 +- Minecraft.Client/TextureMap.cpp | 2 +- Minecraft.Client/TexturePackRepository.cpp | 2 +- .../Windows64/Windows64_UIController.cpp | 2 +- Minecraft.Client/Xbox/Audio/SoundEngine.cpp | 2 +- .../Leaderboards/XboxLeaderboardManager.cpp | 2 +- .../Network/PlatformNetworkManagerXbox.cpp | 2 +- Minecraft.Client/Xbox/Xbox_Minecraft.cpp | 2 +- Minecraft.World/ArmorItem.cpp | 2 +- Minecraft.World/BiomeDecorator.cpp | 2 +- Minecraft.World/BiomeOverrideLayer.cpp | 4 +- Minecraft.World/BiomeSource.cpp | 2 +- Minecraft.World/Class.h | 2 +- Minecraft.World/CompoundTag.h | 2 +- Minecraft.World/CompressedTileStorage.cpp | 2 +- Minecraft.World/ConsoleSaveFileOriginal.cpp | 10 ++--- Minecraft.World/CustomLevelSource.cpp | 8 ++-- Minecraft.World/CustomPayloadPacket.cpp | 2 +- Minecraft.World/DirectoryLevelStorage.cpp | 4 +- Minecraft.World/Enchantment.cpp | 2 +- Minecraft.World/Entity.cpp | 2 +- Minecraft.World/File.cpp | 2 +- Minecraft.World/FileHeader.cpp | 2 +- Minecraft.World/FileInputStream.cpp | 2 +- Minecraft.World/GameCommandPacket.cpp | 2 +- Minecraft.World/Level.cpp | 2 +- Minecraft.World/ListTag.h | 2 +- Minecraft.World/MoveEntityPacket.cpp | 2 +- Minecraft.World/MoveEntityPacketSmall.cpp | 10 ++--- Minecraft.World/Packet.cpp | 4 +- Minecraft.World/PressurePlateTile.cpp | 2 +- Minecraft.World/RegionFile.cpp | 2 +- Minecraft.World/SavedDataStorage.cpp | 2 +- Minecraft.World/Scoreboard.cpp | 2 +- Minecraft.World/SetPlayerTeamPacket.cpp | 4 +- Minecraft.World/StrongholdFeature.cpp | 2 +- Minecraft.World/Tag.cpp | 2 +- Minecraft.World/WeighedRandom.cpp | 4 +- 64 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp index 2e57a5bb7b..e9cee8d797 100644 --- a/Minecraft.Client/ArchiveFile.cpp +++ b/Minecraft.Client/ArchiveFile.cpp @@ -104,7 +104,7 @@ byteArray ArchiveFile::getFile(const wstring &filename) app.DebugPrintf("Couldn't find file in archive\n"); app.DebugPrintf("Failed to find file '%ls' in archive\n", filename.c_str()); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif app.FatalLoadError(); } diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index 850b79fb34..6e7b700555 100644 --- a/Minecraft.Client/Chunk.cpp +++ b/Minecraft.Client/Chunk.cpp @@ -1015,7 +1015,7 @@ bool Chunk::isEmpty() void Chunk::setDirty() { // 4J - not used, but if this starts being used again then we'll need to investigate how best to handle it. - __debugbreak(); + // __debugbreak(); levelRenderer->setGlobalChunkFlag(x, y, z, level, LevelRenderer::CHUNK_FLAG_DIRTY); } diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 43cf73e15f..865748be2f 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -92,7 +92,7 @@ CMinecraftApp::CMinecraftApp() // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES in Xbox_App.h DebugPrintf("WARNING: The size of the profile GAME_SETTINGS struct has changed, so all stat data is likely incorrect. Is: %d, Should be: %d\n",sizeof(GAME_SETTINGS),GAME_SETTINGS_PROFILE_DATA_BYTES); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif } @@ -1279,7 +1279,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat // This might be from a version during testing of new profile updates app.DebugPrintf("Don't know what to do with this profile version!\n"); #ifndef _CONTENT_PACKAGE - // __debugbreak(); + // // __debugbreak(); #endif GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData; @@ -6407,7 +6407,7 @@ void CMinecraftApp::InitialiseTips() { // the m_TriviaTipA or the m_GameTipA are out of sync #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif } } diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp index dd34e67f92..aec5b61634 100644 --- a/Minecraft.Client/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Common/DLC/DLCManager.cpp @@ -169,7 +169,7 @@ DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/) if(index >= m_packs.size()) { app.DebugPrintf("DLCManager: Trying to access a DLC pack beyond the range of valid packs\n"); - __debugbreak(); + // __debugbreak(); } pack = m_packs[index]; } @@ -184,7 +184,7 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D if(pack == NULL) { app.DebugPrintf("DLCManager: Attempting to find the index for a NULL pack\n"); - //__debugbreak(); + //// __debugbreak(); return foundIndex; } if( type != e_DLCType_All ) diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp index ea8a270fd7..5283bd6600 100644 --- a/Minecraft.Client/Common/DLC/DLCPack.cpp +++ b/Minecraft.Client/Common/DLC/DLCPack.cpp @@ -107,7 +107,7 @@ void DLCPack::addChildPack(DLCPack *childPack) #ifndef _CONTENT_PACKAGE if(packId < 0 || packId > 15) { - __debugbreak(); + // __debugbreak(); } #endif childPack->SetPackId( (packId<<24) | m_packId ); @@ -362,7 +362,7 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo { app.DebugPrintf("Unimplemented\n"); #ifndef __CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return 0; } @@ -393,7 +393,7 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path) { app.DebugPrintf("Unimplemented\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return false; } diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp index 7b69c4b4eb..ef0ac7ed09 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp +++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp @@ -122,7 +122,7 @@ void ConsoleSchematicFile::load(DataInputStream *dis) { #ifndef _CONTENT_PACKAGE app.DebugPrintf("ConsoleSchematicFile has read a NULL tile entity\n"); - __debugbreak(); + // __debugbreak(); #endif } else @@ -635,7 +635,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l } #ifndef _CONTENT_PACKAGE - if(p!=blockCount) __debugbreak(); + if(p!=blockCount) // __debugbreak(); #endif // We don't know how this will compress - just make a fixed length buffer to initially decompress into diff --git a/Minecraft.Client/Common/GameRules/GameRule.cpp b/Minecraft.Client/Common/GameRules/GameRule.cpp index b37df84d71..9449f44ce2 100644 --- a/Minecraft.Client/Common/GameRules/GameRule.cpp +++ b/Minecraft.Client/Common/GameRules/GameRule.cpp @@ -24,7 +24,7 @@ GameRule::ValueType GameRule::getParameter(const wstring ¶meterName) { #ifndef _CONTENT_PACKAGE wprintf(L"WARNING: Parameter %ls was not set before being fetched\n", parameterName.c_str()); - __debugbreak(); + // __debugbreak(); #endif } return m_parameters[parameterName]; diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp index 0606808cba..8fcde25571 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp @@ -446,7 +446,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT break; default: app.DebugPrintf("Invalid compression type %d found\n", compressionType); - __debugbreak(); + // __debugbreak(); delete [] compressedBuffer.data; delete [] decompressedBuffer.data; dis.close(); bais.reset(); diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp index 78d62568c9..76a6a17dd9 100644 --- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -238,7 +238,7 @@ HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId &myNpId, SceNpId* & { // 4J-JEV: Something terrible must have happend, // 'getFriendslist' was supposed to be a synchronous operation. - __debugbreak(); + // __debugbreak(); // 4J-JEV: We can at least fall-back to just the players score. len = 1; diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp index a9799d265f..242a53788e 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp @@ -247,7 +247,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer * void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlayer) { - //__debugbreak(); + //// __debugbreak(); app.DebugPrintf( "Player 0x%p leaving.\n", pSQRPlayer ); diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index 3f204414f6..51fda4635a 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Common/UI/UIScene.cpp @@ -322,7 +322,7 @@ void UIScene::loadMovie() { app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str()); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif app.FatalLoadError(); } @@ -339,7 +339,7 @@ void UIScene::loadMovie() { app.DebugPrintf("ERROR: Failed to load iggy scene!\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif app.FatalLoadError(); } @@ -901,7 +901,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt // { // app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is NULL!\n"); //#ifndef _CONTENT_PACKAGE -// __debugbreak(); +// // __debugbreak(); //#endif // } // else @@ -921,7 +921,7 @@ void UIScene::navigateBack() { // app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is NULL!\n"); #ifndef _CONTENT_PACKAGE -// __debugbreak(); +// // __debugbreak(); #endif } else @@ -1153,7 +1153,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handlePress did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1161,7 +1161,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handlePress were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1173,7 +1173,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleFocusChange did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1181,7 +1181,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleFocusChange were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1193,7 +1193,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleInitFocus did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1201,7 +1201,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleInitFocus were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1213,7 +1213,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleCheckboxToggled did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1221,7 +1221,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleCheckboxToggled were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1233,7 +1233,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleSliderMove did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1241,7 +1241,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleSliderMove were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1253,7 +1253,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleAnimationEnd did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1265,7 +1265,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleSelectionChanged did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1273,7 +1273,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleSelectionChanged were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1291,7 +1291,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Callback for handleRequestMoreData did not have the correct number of arguments\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } @@ -1299,7 +1299,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call) { app.DebugPrintf("Arguments for handleRequestMoreData were not of the correct type\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return; } diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index fe743adc21..d9a213628b 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -390,7 +390,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) break; #endif - default: __debugbreak(); + default: // __debugbreak(); } bool confirmUser = false; diff --git a/Minecraft.Client/DLCTexturePack.cpp b/Minecraft.Client/DLCTexturePack.cpp index 553128d963..5879b44fd5 100644 --- a/Minecraft.Client/DLCTexturePack.cpp +++ b/Minecraft.Client/DLCTexturePack.cpp @@ -105,7 +105,7 @@ wstring DLCTexturePack::getResource(const wstring& name) { // 4J Stu - We should never call this function #ifndef __CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return L""; } @@ -114,7 +114,7 @@ InputStream *DLCTexturePack::getResourceImplementation(const wstring &name) //th { // 4J Stu - We should never call this function #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); if(hasFile(name)) return NULL; #endif return NULL; //resource; diff --git a/Minecraft.Client/Durango/Durango_App.cpp b/Minecraft.Client/Durango/Durango_App.cpp index 672d6435c3..f19e2d65d1 100644 --- a/Minecraft.Client/Durango/Durango_App.cpp +++ b/Minecraft.Client/Durango/Durango_App.cpp @@ -640,7 +640,7 @@ int CConsoleMinecraftApp::Callback_TMSPPReadDLCFile(void *pParam,int iPad, int i { DWORD error = GetLastError(); app.DebugPrintf("Failed to open DLCXbox1.cmp with error code %d (%x)\n", error, error); - __debugbreak(); + // __debugbreak(); return 0; } diff --git a/Minecraft.Client/Durango/Durango_UIController.cpp b/Minecraft.Client/Durango/Durango_UIController.cpp index 446ab87e31..855401c68f 100644 --- a/Minecraft.Client/Durango/Durango_UIController.cpp +++ b/Minecraft.Client/Durango/Durango_UIController.cpp @@ -20,7 +20,7 @@ void ConsoleUIController::init(Microsoft::WRL::ComPtr dev, Microso { app.DebugPrintf("Failed to initialise GDraw!\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif app.FatalLoadError(); } diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp index 925a37a8ef..142375c48f 100644 --- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp +++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp @@ -187,7 +187,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRPlayer) { - //__debugbreak(); + //// __debugbreak(); app.DebugPrintf( "Player 0x%p leaving.\n", pDQRPlayer ); diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp index 5bb98eadb8..4239fc5c29 100644 --- a/Minecraft.Client/EntityRenderDispatcher.cpp +++ b/Minecraft.Client/EntityRenderDispatcher.cpp @@ -187,7 +187,7 @@ EntityRenderer *EntityRenderDispatcher::getRenderer(eINSTANCEOF e) { app.DebugPrintf("Couldn't find renderer for entity of type %d\n", e); // New renderer mapping required in above table - __debugbreak(); + // __debugbreak(); } /* 4J - not doing this hierarchical search anymore. We need to explicitly add renderers for any eINSTANCEOF type that we want to be able to render if (it == renderers.end() && e != Entity::_class) diff --git a/Minecraft.Client/EntityTracker.cpp b/Minecraft.Client/EntityTracker.cpp index db175542eb..ad042074d8 100644 --- a/Minecraft.Client/EntityTracker.cpp +++ b/Minecraft.Client/EntityTracker.cpp @@ -83,7 +83,7 @@ void EntityTracker::addEntity(shared_ptr e, int range, int updateInterva } if( e->entityId >= 2048 ) { - __debugbreak(); + // __debugbreak(); } shared_ptr te = shared_ptr( new TrackedEntity(e, range, updateInterval, trackDeltas) ); entities.insert(te); diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp index be38921166..e3b7a80d0c 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -2116,7 +2116,7 @@ void GameRenderer::setupFog(int i, float alpha) if (i == 999) { - __debugbreak(); + // __debugbreak(); // 4J TODO /* glFog(GL_FOG_COLOR, getBuffer(0, 0, 0, 1)); diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index d743543e53..1745c784d0 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -518,7 +518,7 @@ void LocalPlayer::changeDimension(int i) //minecraft.setScreen(new WinScreen()); #ifndef _CONTENT_PACKAGE app.DebugPrintf("LocalPlayer::changeDimension from 1 to 1 but WinScreen has not been implemented.\n"); - __debugbreak(); + // __debugbreak(); #endif } else diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp index b76621970f..e19ef48b50 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -245,7 +245,7 @@ bool OrbisLeaderboardManager::getScoreByIds() { // 4J-JEV: Something terrible must have happend, // 'getFriendslist' was supposed to be a synchronous operation. - __debugbreak(); + // __debugbreak(); // 4J-JEV: We can at least fall-back to just the players score. num = 1; diff --git a/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h b/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h index 390a08976e..d840048844 100644 --- a/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h +++ b/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h @@ -127,7 +127,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName); #define MAX_PATH 260 -void __debugbreak(); +void // __debugbreak(); VOID DebugBreak(VOID); diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h b/Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h index 8f1b489d84..d6d99f9920 100644 --- a/Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h +++ b/Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h @@ -132,7 +132,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName); #define MAX_PATH 260 -void __debugbreak(); +void // __debugbreak(); VOID DebugBreak(VOID); diff --git a/Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h b/Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h index de405e2698..10f593b0f9 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h +++ b/Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h @@ -174,7 +174,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName); #define MAX_PATH 260 -void __debugbreak(); +void // __debugbreak(); VOID DebugBreak(VOID); diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp index 1091a26aa4..e39bc8a13c 100644 --- a/Minecraft.Client/Particle.cpp +++ b/Minecraft.Client/Particle.cpp @@ -218,7 +218,7 @@ void Particle::setTex(Textures *textures, Icon *icon) { #ifndef _CONTENT_PACKAGE printf("Invalid call to Particle.setTex, use coordinate methods\n"); - __debugbreak(); + // __debugbreak(); #endif //throw new RuntimeException("Invalid call to Particle.setTex, use coordinate methods"); } @@ -230,7 +230,7 @@ void Particle::setMiscTex(int slotIndex) { #ifndef _CONTENT_PACKAGE printf("Invalid call to Particle.setMixTex\n"); - __debugbreak(); + // __debugbreak(); //throw new RuntimeException("Invalid call to Particle.setMiscTex"); #endif } diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp index 0956e53cd4..02f1001f1a 100644 --- a/Minecraft.Client/PreStitchedTextureMap.cpp +++ b/Minecraft.Client/PreStitchedTextureMap.cpp @@ -227,7 +227,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack *texturePack, Stitch if(first->getWidth() != tex->getWidth() || first->getHeight() != tex->getHeight()) { app.DebugPrintf("%ls - first w - %d, h - %d, tex w - %d, h - %d\n",textureFileName.c_str(),first->getWidth(),tex->getWidth(),first->getHeight(),tex->getHeight()); - //__debugbreak(); + //// __debugbreak(); } #endif diff --git a/Minecraft.Client/Stitcher.cpp b/Minecraft.Client/Stitcher.cpp index d52954c445..ef9e37ed44 100644 --- a/Minecraft.Client/Stitcher.cpp +++ b/Minecraft.Client/Stitcher.cpp @@ -87,7 +87,7 @@ void Stitcher::stitch() { app.DebugPrintf("Stitcher exception!\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif //throw new StitcherException(textureHolder); } diff --git a/Minecraft.Client/TextureMap.cpp b/Minecraft.Client/TextureMap.cpp index 9aefbb6370..d559ccb882 100644 --- a/Minecraft.Client/TextureMap.cpp +++ b/Minecraft.Client/TextureMap.cpp @@ -214,7 +214,7 @@ Icon *TextureMap::registerIcon(const wstring &name) { app.DebugPrintf("Don't register NULL\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif //new RuntimeException("Don't register null!").printStackTrace(); } diff --git a/Minecraft.Client/TexturePackRepository.cpp b/Minecraft.Client/TexturePackRepository.cpp index 6bb3ccccb5..71d97cc18c 100644 --- a/Minecraft.Client/TexturePackRepository.cpp +++ b/Minecraft.Client/TexturePackRepository.cpp @@ -338,7 +338,7 @@ bool TexturePackRepository::selectTexturePackById(DWORD id) app.DebugPrintf("Failed to select texture pack %d as it is not in the list\n", id); #ifndef _CONTENT_PACKAGE // TODO - 4J Stu: We should report this to the player in some way - //__debugbreak(); + //// __debugbreak(); #endif // Fail safely if( selectSkin( DEFAULT_TEXTURE_PACK ) ) diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp index 10ae20afff..21c9816d56 100644 --- a/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -24,7 +24,7 @@ void ConsoleUIController::init(ID3D11Device *dev, ID3D11DeviceContext *ctx, ID3D { app.DebugPrintf("Failed to initialise GDraw!\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif app.FatalLoadError(); } diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp index b088150c95..3167984cb5 100644 --- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp @@ -487,7 +487,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa { #ifndef _CONTENT_PACKAGE #ifdef _DEBUG - __debugbreak(); + // __debugbreak(); #endif //wprintf(L"WARNING: Sound cue not found - %ls\n", name.c_str() ); app.DebugPrintf("Not found: %s\n",xboxName); diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp index efa8a3dae3..59c3e33e73 100644 --- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp +++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp @@ -183,7 +183,7 @@ bool XboxLeaderboardManager::WriteStats(unsigned int viewCount, ViewIn views) // some debug code to catch the leaderboard write with 7 views #ifndef _CONTENT_PACKAGE - if(viewCount>5) __debugbreak(); + if(viewCount>5) // __debugbreak(); #endif // 4J Stu - If we are online we already have a session, so use that diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp index 4731714635..77705c12be 100644 --- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp +++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp @@ -211,7 +211,7 @@ VOID CPlatformNetworkManagerXbox::NotifyPlayerLeaving( __in IQNetPlayer * pQNetPlayer ) { - //__debugbreak(); + //// __debugbreak(); app.DebugPrintf( "Player 0x%p \"%ls\" leaving.\n", pQNetPlayer, diff --git a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp index 04e4a8d5a1..404b53d16b 100644 --- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp @@ -315,7 +315,7 @@ int __cdecl main() HRESULT hr; static bool bTrialTimerDisplayed=true; - //__debugbreak(); + //// __debugbreak(); #ifdef MEMORY_TRACKING ResetMem(); diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp index 114b200b9c..9a6f016c03 100644 --- a/Minecraft.World/ArmorItem.cpp +++ b/Minecraft.World/ArmorItem.cpp @@ -208,7 +208,7 @@ void ArmorItem::setColor(shared_ptr item, int color) { #ifndef _CONTENT_PACKAGE printf("Can't dye non-leather!"); - __debugbreak(); + // __debugbreak(); #endif //throw new UnsupportedOperationException("Can't dye non-leather!"); } diff --git a/Minecraft.World/BiomeDecorator.cpp b/Minecraft.World/BiomeDecorator.cpp index a3cbf546c3..aae9cb128f 100644 --- a/Minecraft.World/BiomeDecorator.cpp +++ b/Minecraft.World/BiomeDecorator.cpp @@ -23,7 +23,7 @@ void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo) { app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); //throw new RuntimeException("Already decorating!!"); #endif } diff --git a/Minecraft.World/BiomeOverrideLayer.cpp b/Minecraft.World/BiomeOverrideLayer.cpp index a44295dc2d..d3959c3ab6 100644 --- a/Minecraft.World/BiomeOverrideLayer.cpp +++ b/Minecraft.World/BiomeOverrideLayer.cpp @@ -32,7 +32,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { #ifdef _DURANGO - __debugbreak(); // TODO + // __debugbreak(); // TODO DWORD bytesRead,dwFileSize = 0; #else DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); @@ -40,7 +40,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) if(dwFileSize > m_biomeOverride.length) { app.DebugPrintf("Biomemap binary is too large!!\n"); - __debugbreak(); + // __debugbreak(); } BOOL bSuccess = ReadFile(file,m_biomeOverride.data,dwFileSize,&bytesRead,NULL); diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp index 2ab6182e6e..144ac663b3 100644 --- a/Minecraft.World/BiomeSource.cpp +++ b/Minecraft.World/BiomeSource.cpp @@ -184,7 +184,7 @@ void BiomeSource::getRawBiomeBlock(BiomeArray &biomes, int x, int z, int w, int if(biomes[i] == NULL) { app.DebugPrintf("Tried to assign null biome %d\n", result[i]); - __debugbreak(); + // __debugbreak(); } #endif } diff --git a/Minecraft.World/Class.h b/Minecraft.World/Class.h index 25802c3ffc..5cfba5ea10 100644 --- a/Minecraft.World/Class.h +++ b/Minecraft.World/Class.h @@ -598,7 +598,7 @@ class SubClass if ( (m_falsePositives.size() > 0) || (m_falseNegatives.size() > 0) ) { - __debugbreak(); + // __debugbreak(); } } }; diff --git a/Minecraft.World/CompoundTag.h b/Minecraft.World/CompoundTag.h index 83a6108f0c..bef484efb8 100644 --- a/Minecraft.World/CompoundTag.h +++ b/Minecraft.World/CompoundTag.h @@ -36,7 +36,7 @@ class CompoundTag : public Tag { #ifndef _CONTENT_PACKAGE printf("Tried to read NBT tag with too high complexity, depth > %d" , MAX_DEPTH); - __debugbreak(); + // __debugbreak(); #endif return; } diff --git a/Minecraft.World/CompressedTileStorage.cpp b/Minecraft.World/CompressedTileStorage.cpp index eb1b784a05..6a70ddbb81 100644 --- a/Minecraft.World/CompressedTileStorage.cpp +++ b/Minecraft.World/CompressedTileStorage.cpp @@ -1056,7 +1056,7 @@ void CompressedTileStorage::compress(int upgradeBlock/*=-1*/) #ifndef _DURANGO MEMORYSTATUS memStatus; GlobalMemoryStatus(&memStatus); - __debugbreak(); + // __debugbreak(); #endif } unsigned char *pucData = newIndicesAndData + 1024; diff --git a/Minecraft.World/ConsoleSaveFileOriginal.cpp b/Minecraft.World/ConsoleSaveFileOriginal.cpp index 0b7c8d663f..bd03d33903 100644 --- a/Minecraft.World/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/ConsoleSaveFileOriginal.cpp @@ -68,7 +68,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID if( pagesCommitted != 0 ) { #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif } @@ -79,7 +79,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID { #ifndef _CONTENT_PACKAGE // Out of physical memory - __debugbreak(); + // __debugbreak(); #endif } pagesCommitted = pagesRequired; @@ -184,7 +184,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID if( pvRet == NULL ) { // Out of physical memory - __debugbreak(); + // __debugbreak(); } pagesCommitted = pagesRequired; } @@ -475,7 +475,7 @@ void ConsoleSaveFileOriginal::finalizeWrite() void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if( pvRet == NULL ) { - __debugbreak(); + // __debugbreak(); } pagesCommitted = pagesRequired; } @@ -509,7 +509,7 @@ void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, DWORD nNumberOfByt if( pvRet == NULL ) { // Out of physical memory - __debugbreak(); + // __debugbreak(); } pagesCommitted = pagesRequired; } diff --git a/Minecraft.World/CustomLevelSource.cpp b/Minecraft.World/CustomLevelSource.cpp index 0f4c6479f2..49cd5b07e9 100644 --- a/Minecraft.World/CustomLevelSource.cpp +++ b/Minecraft.World/CustomLevelSource.cpp @@ -41,7 +41,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt { #ifdef _DURANGO - __debugbreak(); // TODO + // __debugbreak(); // TODO DWORD bytesRead,dwFileSize = 0; #else DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); @@ -49,7 +49,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt if(dwFileSize > m_heightmapOverride.length) { app.DebugPrintf("Heightmap binary is too large!!\n"); - __debugbreak(); + // __debugbreak(); } BOOL bSuccess = ReadFile(file,m_heightmapOverride.data,dwFileSize,&bytesRead,NULL); @@ -83,7 +83,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt { #ifdef _DURANGO - __debugbreak(); // TODO + // __debugbreak(); // TODO DWORD bytesRead,dwFileSize = 0; #else DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); @@ -91,7 +91,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt if(dwFileSize > m_waterheightOverride.length) { app.DebugPrintf("waterheight binary is too large!!\n"); - __debugbreak(); + // __debugbreak(); } BOOL bSuccess = ReadFile(file,m_waterheightOverride.data,dwFileSize,&bytesRead,NULL); diff --git a/Minecraft.World/CustomPayloadPacket.cpp b/Minecraft.World/CustomPayloadPacket.cpp index 29e2828ee6..42e4504f6d 100644 --- a/Minecraft.World/CustomPayloadPacket.cpp +++ b/Minecraft.World/CustomPayloadPacket.cpp @@ -31,7 +31,7 @@ CustomPayloadPacket::CustomPayloadPacket(const wstring &identifier, byteArray da { app.DebugPrintf("Payload may not be larger than 32K\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif //throw new IllegalArgumentException("Payload may not be larger than 32k"); } diff --git a/Minecraft.World/DirectoryLevelStorage.cpp b/Minecraft.World/DirectoryLevelStorage.cpp index 150df21619..4c0a705a43 100644 --- a/Minecraft.World/DirectoryLevelStorage.cpp +++ b/Minecraft.World/DirectoryLevelStorage.cpp @@ -43,7 +43,7 @@ int _MapDataMappings::getDimension(int id) default: #ifndef _CONTENT_PACKAGE printf("Read invalid dimension from MapDataMapping\n"); - __debugbreak(); + // __debugbreak(); #endif break; } @@ -72,7 +72,7 @@ void _MapDataMappings::setMapping(int id, PlayerUID xuid, int dimension) default: #ifndef _CONTENT_PACKAGE printf("Trinyg to set a MapDataMapping for an invalid dimension.\n"); - __debugbreak(); + // __debugbreak(); #endif break; } diff --git a/Minecraft.World/Enchantment.cpp b/Minecraft.World/Enchantment.cpp index ae638b27ee..f10a93933d 100644 --- a/Minecraft.World/Enchantment.cpp +++ b/Minecraft.World/Enchantment.cpp @@ -83,7 +83,7 @@ void Enchantment::_init(int id) { app.DebugPrintf("Duplicate enchantment id!"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif //throw new IllegalArgumentException("Duplicate enchantment id!"); } diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index e82331402d..f94e9a7df8 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -97,7 +97,7 @@ int Entity::getSmallId() } app.DebugPrintf("Out of small entity Ids... possible leak?\n"); - __debugbreak(); + // __debugbreak(); return -1; } diff --git a/Minecraft.World/File.cpp b/Minecraft.World/File.cpp index 82e593dc2d..8eef5428cb 100644 --- a/Minecraft.World/File.cpp +++ b/Minecraft.World/File.cpp @@ -239,7 +239,7 @@ bool File::renameTo(File dest) std::string sourcePath = wstringtofilename(getPath()); const char *destPath = wstringtofilename(dest.getPath()); #ifdef _DURANGO - __debugbreak(); // TODO + // __debugbreak(); // TODO BOOL result = false; #else BOOL result = MoveFile(sourcePath.c_str(), destPath); diff --git a/Minecraft.World/FileHeader.cpp b/Minecraft.World/FileHeader.cpp index 0a47e043e1..1cddd7c65b 100644 --- a/Minecraft.World/FileHeader.cpp +++ b/Minecraft.World/FileHeader.cpp @@ -298,7 +298,7 @@ void FileHeader::ReadHeader( LPVOID saveMem, ESavePlatform plat /*= SAVE_FILE_PL default: #ifndef _CONTENT_PACKAGE app.DebugPrintf("********** Invalid save version %d\n",m_saveVersion); - __debugbreak(); + // __debugbreak(); #endif break; } diff --git a/Minecraft.World/FileInputStream.cpp b/Minecraft.World/FileInputStream.cpp index 5e0f6ca56b..fe9b003c96 100644 --- a/Minecraft.World/FileInputStream.cpp +++ b/Minecraft.World/FileInputStream.cpp @@ -44,7 +44,7 @@ FileInputStream::FileInputStream(const File &file) if( m_fileHandle == INVALID_HANDLE_VALUE ) { // TODO 4J Stu - Any form of error/exception handling - //__debugbreak(); + //// __debugbreak(); app.FatalLoadError(); } } diff --git a/Minecraft.World/GameCommandPacket.cpp b/Minecraft.World/GameCommandPacket.cpp index 98cdd3121f..3a025bb201 100644 --- a/Minecraft.World/GameCommandPacket.cpp +++ b/Minecraft.World/GameCommandPacket.cpp @@ -23,7 +23,7 @@ GameCommandPacket::GameCommandPacket(EGameCommand command, byteArray data) { app.DebugPrintf("Payload may not be larger than 32K\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif //throw new IllegalArgumentException("Payload may not be larger than 32k"); } diff --git a/Minecraft.World/Level.cpp b/Minecraft.World/Level.cpp index ef79fb397a..e06dae7798 100644 --- a/Minecraft.World/Level.cpp +++ b/Minecraft.World/Level.cpp @@ -2412,7 +2412,7 @@ void Level::tickEntities() { if(isClientSide) { - __debugbreak(); + // __debugbreak(); } it = tileEntityList.erase(it); } diff --git a/Minecraft.World/ListTag.h b/Minecraft.World/ListTag.h index 69e51aee1f..e5f992dbc8 100644 --- a/Minecraft.World/ListTag.h +++ b/Minecraft.World/ListTag.h @@ -30,7 +30,7 @@ template class ListTag : public Tag { #ifndef _CONTENT_PACKAGE printf("Tried to read NBT tag with too high complexity, depth > %d", MAX_DEPTH); - __debugbreak(); + // __debugbreak(); #endif return; } diff --git a/Minecraft.World/MoveEntityPacket.cpp b/Minecraft.World/MoveEntityPacket.cpp index b52482f5e9..3ecd2ce21b 100644 --- a/Minecraft.World/MoveEntityPacket.cpp +++ b/Minecraft.World/MoveEntityPacket.cpp @@ -38,7 +38,7 @@ void MoveEntityPacket::write(DataOutputStream *dos) //throws IOException if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } dos->writeShort((short)id); } diff --git a/Minecraft.World/MoveEntityPacketSmall.cpp b/Minecraft.World/MoveEntityPacketSmall.cpp index 8216478fa3..80a91b1342 100644 --- a/Minecraft.World/MoveEntityPacketSmall.cpp +++ b/Minecraft.World/MoveEntityPacketSmall.cpp @@ -22,7 +22,7 @@ MoveEntityPacketSmall::MoveEntityPacketSmall(int id) if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } this->id = id; @@ -45,7 +45,7 @@ void MoveEntityPacketSmall::write(DataOutputStream *dos) //throws IOException if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } dos->writeShort((short)id); } @@ -102,7 +102,7 @@ void MoveEntityPacketSmall::PosRot::write(DataOutputStream *dos) //throws IOExce if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } short idAndRot = id | yRot << 11; dos->writeShort(idAndRot); @@ -141,7 +141,7 @@ void MoveEntityPacketSmall::Pos::write(DataOutputStream *dos) //throws IOExcepti if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } short idAndY = id | ya << 11; dos->writeShort(idAndY); @@ -179,7 +179,7 @@ void MoveEntityPacketSmall::Rot::write(DataOutputStream *dos) //throws IOExcepti if( (id < 0 ) || (id >= 2048 ) ) { // We shouln't be tracking an entity that doesn't have a short type of id - __debugbreak(); + // __debugbreak(); } short idAndRot = id | yRot << 11; dos->writeShort(idAndRot); diff --git a/Minecraft.World/Packet.cpp b/Minecraft.World/Packet.cpp index 61e3cc63cc..4970a9ffc6 100644 --- a/Minecraft.World/Packet.cpp +++ b/Minecraft.World/Packet.cpp @@ -284,7 +284,7 @@ byteArray Packet::readBytes(DataInputStream *datainputstream) { app.DebugPrintf("Key was smaller than nothing! Weird key!"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return byteArray(); //throw new IOException("Key was smaller than nothing! Weird key!"); @@ -330,7 +330,7 @@ shared_ptr Packet::readPacket(DataInputStream *dis, bool isServer) // th if ((isServer && serverReceivedPackets.find(id) == serverReceivedPackets.end()) || (!isServer && clientReceivedPackets.find(id) == clientReceivedPackets.end())) { //app.DebugPrintf("Bad packet id %d\n", id); - __debugbreak(); + // __debugbreak(); assert(false); // throw new IOException(wstring(L"Bad packet id ") + std::to_wstring(id)); } diff --git a/Minecraft.World/PressurePlateTile.cpp b/Minecraft.World/PressurePlateTile.cpp index beed308ac2..8c23ab6003 100644 --- a/Minecraft.World/PressurePlateTile.cpp +++ b/Minecraft.World/PressurePlateTile.cpp @@ -28,7 +28,7 @@ int PressurePlateTile::getSignalStrength(Level *level, int x, int y, int z) if (sensitivity == everything) entities = level->getEntities(nullptr, getSensitiveAABB(x, y, z)); else if (sensitivity == mobs) entities = level->getEntitiesOfClass(typeid(LivingEntity), getSensitiveAABB(x, y, z)); else if (sensitivity == players) entities = level->getEntitiesOfClass(typeid(Player), getSensitiveAABB(x, y, z)); - else __debugbreak(); // 4J-JEV: We're going to delete something at a random location. + else // __debugbreak(); // 4J-JEV: We're going to delete something at a random location. if (entities != NULL && !entities->empty()) { diff --git a/Minecraft.World/RegionFile.cpp b/Minecraft.World/RegionFile.cpp index 5c29f94e20..c289eeaad8 100644 --- a/Minecraft.World/RegionFile.cpp +++ b/Minecraft.World/RegionFile.cpp @@ -299,7 +299,7 @@ void RegionFile::write(int x, int z, byte *data, int length) // TODO - was sync #ifndef _CONTENT_PACKAGE if(sectorNumber < 0) { - __debugbreak(); + // __debugbreak(); } #endif diff --git a/Minecraft.World/SavedDataStorage.cpp b/Minecraft.World/SavedDataStorage.cpp index 422b66dcad..7bcc3bdd9b 100644 --- a/Minecraft.World/SavedDataStorage.cpp +++ b/Minecraft.World/SavedDataStorage.cpp @@ -50,7 +50,7 @@ shared_ptr SavedDataStorage::get(const type_info& clazz, const wstrin else { // Handling of new SavedData class required - __debugbreak(); + // __debugbreak(); } ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(levelStorage->getSaveFile(), file); diff --git a/Minecraft.World/Scoreboard.cpp b/Minecraft.World/Scoreboard.cpp index 5c6f2ebd73..db7ddee881 100644 --- a/Minecraft.World/Scoreboard.cpp +++ b/Minecraft.World/Scoreboard.cpp @@ -15,7 +15,7 @@ Objective *Scoreboard::addObjective(const wstring &name, ObjectiveCriteria *crit // if (objective != NULL) // { //#indef _CONTENT_PACKAGE -// __debugbreak(); +// // __debugbreak(); //#endif // //throw new IllegalArgumentException("An objective with the name '" + name + "' already exists!"); // } diff --git a/Minecraft.World/SetPlayerTeamPacket.cpp b/Minecraft.World/SetPlayerTeamPacket.cpp index fe36bfff54..53d7483200 100644 --- a/Minecraft.World/SetPlayerTeamPacket.cpp +++ b/Minecraft.World/SetPlayerTeamPacket.cpp @@ -39,14 +39,14 @@ SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam *team, vector *play { app.DebugPrintf("Method must be join or leave for player constructor"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif } if (playerNames == NULL || playerNames->empty()) { app.DebugPrintf("Players cannot be null/empty"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif } diff --git a/Minecraft.World/StrongholdFeature.cpp b/Minecraft.World/StrongholdFeature.cpp index fa85dc4292..5f2405b43c 100644 --- a/Minecraft.World/StrongholdFeature.cpp +++ b/Minecraft.World/StrongholdFeature.cpp @@ -148,7 +148,7 @@ bool StrongholdFeature::isFeatureChunk(int x, int z,bool bIsSuperflat) #ifndef _CONTENT_PACKAGE if(position->x > 2560 || position->x < -2560 || position->z > 2560 || position->z < -2560) { - __debugbreak(); + // __debugbreak(); } #endif diff --git a/Minecraft.World/Tag.cpp b/Minecraft.World/Tag.cpp index aa988e029c..66e62101b1 100644 --- a/Minecraft.World/Tag.cpp +++ b/Minecraft.World/Tag.cpp @@ -92,7 +92,7 @@ Tag *Tag::readNamedTag(DataInput *dis, int tagDepth) { app.DebugPrintf("readNamedTag read a type of 255\n"); #ifndef _CONTENT_PACKAGE - __debugbreak(); + // __debugbreak(); #endif return new EndTag(); } diff --git a/Minecraft.World/WeighedRandom.cpp b/Minecraft.World/WeighedRandom.cpp index 0c27bf32a6..8451e66098 100644 --- a/Minecraft.World/WeighedRandom.cpp +++ b/Minecraft.World/WeighedRandom.cpp @@ -15,7 +15,7 @@ WeighedRandomItem *WeighedRandom::getRandomItem(Random *random, vectornextInt(totalWeight); @@ -50,7 +50,7 @@ WeighedRandomItem *WeighedRandom::getRandomItem(Random *random, WeighedRandomIte { if (totalWeight <= 0) { - __debugbreak(); + // __debugbreak(); } int selection = random->nextInt(totalWeight);