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

Merge pull request #3 from Tuff-CWC/DebugBreakRemoval

Browse source 
comment debugbreak out
This commit is contained in:
Tuff CWC 2026-03-09 15:41:12 +01:00 committed by GitHub
parent f6eda305ac 0b5b33d28d
commit 13d15593f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
64 changed files with 106 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/ArchiveFile.cpp
View file

@ -104,7 +104,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
app.DebugPrintf("Couldn't find file in archive\n"); app.DebugPrintf("Couldn't find file in archive\n");
app.DebugPrintf("Failed to find file '%ls' in archive\n", filename.c_str()); app.DebugPrintf("Failed to find file '%ls' in archive\n", filename.c_str());
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
app.FatalLoadError(); app.FatalLoadError();
} }

2
Minecraft.Client/Chunk.cpp
View file

@ -1015,7 +1015,7 @@ bool Chunk::isEmpty()
void Chunk::setDirty() void Chunk::setDirty()
{ {
// 4J - not used, but if this starts being used again then we'll need to investigate how best to handle it. // 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); levelRenderer->setGlobalChunkFlag(x, y, z, level, LevelRenderer::CHUNK_FLAG_DIRTY);
} }

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

@ -92,7 +92,7 @@ CMinecraftApp::CMinecraftApp()
// 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES in Xbox_App.h // 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); 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 #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #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 // 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"); app.DebugPrintf("Don't know what to do with this profile version!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
// __debugbreak(); // // __debugbreak();
#endif #endif
GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData; GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
@ -6407,7 +6407,7 @@ void CMinecraftApp::InitialiseTips()
{ {
// the m_TriviaTipA or the m_GameTipA are out of sync // the m_TriviaTipA or the m_GameTipA are out of sync
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
} }
} }

4
Minecraft.Client/Common/DLC/DLCManager.cpp
View file

@ -169,7 +169,7 @@ DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/)
if(index >= m_packs.size()) if(index >= m_packs.size())
{ {
app.DebugPrintf("DLCManager: Trying to access a DLC pack beyond the range of valid packs\n"); app.DebugPrintf("DLCManager: Trying to access a DLC pack beyond the range of valid packs\n");
__debugbreak(); // __debugbreak();
} }
pack = m_packs[index]; pack = m_packs[index];
} }
@ -184,7 +184,7 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D
if(pack == NULL) if(pack == NULL)
{ {
app.DebugPrintf("DLCManager: Attempting to find the index for a NULL pack\n"); app.DebugPrintf("DLCManager: Attempting to find the index for a NULL pack\n");
//__debugbreak(); //// __debugbreak();
return foundIndex; return foundIndex;
} }
if( type != e_DLCType_All ) if( type != e_DLCType_All )

6
Minecraft.Client/Common/DLC/DLCPack.cpp
View file

@ -107,7 +107,7 @@ void DLCPack::addChildPack(DLCPack *childPack)
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(packId < 0 || packId > 15) if(packId < 0 || packId > 15)
{ {
__debugbreak(); // __debugbreak();
} }
#endif #endif
childPack->SetPackId( (packId<<24) | m_packId ); childPack->SetPackId( (packId<<24) | m_packId );
@ -362,7 +362,7 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo
{ {
app.DebugPrintf("Unimplemented\n"); app.DebugPrintf("Unimplemented\n");
#ifndef __CONTENT_PACKAGE #ifndef __CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return 0; return 0;
} }
@ -393,7 +393,7 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
{ {
app.DebugPrintf("Unimplemented\n"); app.DebugPrintf("Unimplemented\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return false; return false;
} }

4
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
View file

@ -122,7 +122,7 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
app.DebugPrintf("ConsoleSchematicFile has read a NULL tile entity\n"); app.DebugPrintf("ConsoleSchematicFile has read a NULL tile entity\n");
__debugbreak(); // __debugbreak();
#endif #endif
} }
else else
@ -635,7 +635,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
} }
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(p!=blockCount) __debugbreak(); if(p!=blockCount) // __debugbreak();
#endif #endif
// We don't know how this will compress - just make a fixed length buffer to initially decompress into // We don't know how this will compress - just make a fixed length buffer to initially decompress into

2
Minecraft.Client/Common/GameRules/GameRule.cpp
View file

@ -24,7 +24,7 @@ GameRule::ValueType GameRule::getParameter(const wstring &parameterName)
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
wprintf(L"WARNING: Parameter %ls was not set before being fetched\n", parameterName.c_str()); wprintf(L"WARNING: Parameter %ls was not set before being fetched\n", parameterName.c_str());
__debugbreak(); // __debugbreak();
#endif #endif
} }
return m_parameters[parameterName]; return m_parameters[parameterName];

2
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -446,7 +446,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
break; break;
default: default:
app.DebugPrintf("Invalid compression type %d found\n", compressionType); app.DebugPrintf("Invalid compression type %d found\n", compressionType);
__debugbreak(); // __debugbreak();
delete [] compressedBuffer.data; delete [] decompressedBuffer.data; delete [] compressedBuffer.data; delete [] decompressedBuffer.data;
dis.close(); bais.reset(); dis.close(); bais.reset();

2
Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
View file

@ -238,7 +238,7 @@ HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId &myNpId, SceNpId* &
{ {
// 4J-JEV: Something terrible must have happend, // 4J-JEV: Something terrible must have happend,
// 'getFriendslist' was supposed to be a synchronous operation. // 'getFriendslist' was supposed to be a synchronous operation.
__debugbreak(); // __debugbreak();
// 4J-JEV: We can at least fall-back to just the players score. // 4J-JEV: We can at least fall-back to just the players score.
len = 1; len = 1;

2
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
View file

@ -247,7 +247,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlayer) void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlayer)
{ {
//__debugbreak(); //// __debugbreak();
app.DebugPrintf( "Player 0x%p leaving.\n", app.DebugPrintf( "Player 0x%p leaving.\n",
pSQRPlayer ); pSQRPlayer );

38
Minecraft.Client/Common/UI/UIScene.cpp
View file

@ -322,7 +322,7 @@ void UIScene::loadMovie()
{ {
app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str()); app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str());
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
app.FatalLoadError(); app.FatalLoadError();
} }
@ -339,7 +339,7 @@ void UIScene::loadMovie()
{ {
app.DebugPrintf("ERROR: Failed to load iggy scene!\n"); app.DebugPrintf("ERROR: Failed to load iggy scene!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
app.FatalLoadError(); 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"); // app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is NULL!\n");
//#ifndef _CONTENT_PACKAGE //#ifndef _CONTENT_PACKAGE
// __debugbreak(); // // __debugbreak();
//#endif //#endif
// } // }
// else // 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"); // app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is NULL!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
// __debugbreak(); // // __debugbreak();
#endif #endif
} }
else else
@ -1153,7 +1153,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handlePress did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handlePress did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1161,7 +1161,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handlePress were not of the correct type\n"); app.DebugPrintf("Arguments for handlePress were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1173,7 +1173,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleFocusChange did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleFocusChange did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1181,7 +1181,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleFocusChange were not of the correct type\n"); app.DebugPrintf("Arguments for handleFocusChange were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1193,7 +1193,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleInitFocus did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleInitFocus did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1201,7 +1201,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleInitFocus were not of the correct type\n"); app.DebugPrintf("Arguments for handleInitFocus were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1213,7 +1213,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleCheckboxToggled did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleCheckboxToggled did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1221,7 +1221,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleCheckboxToggled were not of the correct type\n"); app.DebugPrintf("Arguments for handleCheckboxToggled were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1233,7 +1233,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleSliderMove did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleSliderMove did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1241,7 +1241,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleSliderMove were not of the correct type\n"); app.DebugPrintf("Arguments for handleSliderMove were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1253,7 +1253,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleAnimationEnd did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleAnimationEnd did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1265,7 +1265,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleSelectionChanged did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleSelectionChanged did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1273,7 +1273,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleSelectionChanged were not of the correct type\n"); app.DebugPrintf("Arguments for handleSelectionChanged were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1291,7 +1291,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Callback for handleRequestMoreData did not have the correct number of arguments\n"); app.DebugPrintf("Callback for handleRequestMoreData did not have the correct number of arguments\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }
@ -1299,7 +1299,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16 * call)
{ {
app.DebugPrintf("Arguments for handleRequestMoreData were not of the correct type\n"); app.DebugPrintf("Arguments for handleRequestMoreData were not of the correct type\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }

2
Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
View file

@ -390,7 +390,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
break; break;
#endif #endif
default: __debugbreak(); default: // __debugbreak();
} }
bool confirmUser = false; bool confirmUser = false;

4
Minecraft.Client/DLCTexturePack.cpp
View file

@ -105,7 +105,7 @@ wstring DLCTexturePack::getResource(const wstring& name)
{ {
// 4J Stu - We should never call this function // 4J Stu - We should never call this function
#ifndef __CONTENT_PACKAGE #ifndef __CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return L""; return L"";
} }
@ -114,7 +114,7 @@ InputStream *DLCTexturePack::getResourceImplementation(const wstring &name) //th
{ {
// 4J Stu - We should never call this function // 4J Stu - We should never call this function
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
if(hasFile(name)) return NULL; if(hasFile(name)) return NULL;
#endif #endif
return NULL; //resource; return NULL; //resource;

2
Minecraft.Client/Durango/Durango_App.cpp
View file

@ -640,7 +640,7 @@ int CConsoleMinecraftApp::Callback_TMSPPReadDLCFile(void *pParam,int iPad, int i
{ {
DWORD error = GetLastError(); DWORD error = GetLastError();
app.DebugPrintf("Failed to open DLCXbox1.cmp with error code %d (%x)\n", error, error); app.DebugPrintf("Failed to open DLCXbox1.cmp with error code %d (%x)\n", error, error);
__debugbreak(); // __debugbreak();
return 0; return 0;
} }

2
Minecraft.Client/Durango/Durango_UIController.cpp
View file

@ -20,7 +20,7 @@ void ConsoleUIController::init(Microsoft::WRL::ComPtr<ID3D11Device> dev, Microso
{ {
app.DebugPrintf("Failed to initialise GDraw!\n"); app.DebugPrintf("Failed to initialise GDraw!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
app.FatalLoadError(); app.FatalLoadError();
} }

2
Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
View file

@ -187,7 +187,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl
void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRPlayer) void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRPlayer)
{ {
//__debugbreak(); //// __debugbreak();
app.DebugPrintf( "Player 0x%p leaving.\n", app.DebugPrintf( "Player 0x%p leaving.\n",
pDQRPlayer ); pDQRPlayer );

2
Minecraft.Client/EntityRenderDispatcher.cpp
View file

@ -187,7 +187,7 @@ EntityRenderer *EntityRenderDispatcher::getRenderer(eINSTANCEOF e)
{ {
app.DebugPrintf("Couldn't find renderer for entity of type %d\n", e); app.DebugPrintf("Couldn't find renderer for entity of type %d\n", e);
// New renderer mapping required in above table // 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 /* 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) if (it == renderers.end() && e != Entity::_class)

2
Minecraft.Client/EntityTracker.cpp
View file

@ -83,7 +83,7 @@ void EntityTracker::addEntity(shared_ptr<Entity> e, int range, int updateInterva
} }
if( e->entityId >= 2048 ) if( e->entityId >= 2048 )
{ {
__debugbreak(); // __debugbreak();
} }
shared_ptr<TrackedEntity> te = shared_ptr<TrackedEntity>( new TrackedEntity(e, range, updateInterval, trackDeltas) ); shared_ptr<TrackedEntity> te = shared_ptr<TrackedEntity>( new TrackedEntity(e, range, updateInterval, trackDeltas) );
entities.insert(te); entities.insert(te);

2
Minecraft.Client/GameRenderer.cpp
View file

@ -2116,7 +2116,7 @@ void GameRenderer::setupFog(int i, float alpha)
if (i == 999) if (i == 999)
{ {
__debugbreak(); // __debugbreak();
// 4J TODO // 4J TODO
/* /*
glFog(GL_FOG_COLOR, getBuffer(0, 0, 0, 1)); glFog(GL_FOG_COLOR, getBuffer(0, 0, 0, 1));

2
Minecraft.Client/LocalPlayer.cpp
View file

@ -518,7 +518,7 @@ void LocalPlayer::changeDimension(int i)
//minecraft.setScreen(new WinScreen()); //minecraft.setScreen(new WinScreen());
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
app.DebugPrintf("LocalPlayer::changeDimension from 1 to 1 but WinScreen has not been implemented.\n"); app.DebugPrintf("LocalPlayer::changeDimension from 1 to 1 but WinScreen has not been implemented.\n");
__debugbreak(); // __debugbreak();
#endif #endif
} }
else else

2
Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
View file

@ -245,7 +245,7 @@ bool OrbisLeaderboardManager::getScoreByIds()
{ {
// 4J-JEV: Something terrible must have happend, // 4J-JEV: Something terrible must have happend,
// 'getFriendslist' was supposed to be a synchronous operation. // 'getFriendslist' was supposed to be a synchronous operation.
__debugbreak(); // __debugbreak();
// 4J-JEV: We can at least fall-back to just the players score. // 4J-JEV: We can at least fall-back to just the players score.
num = 1; num = 1;

2
Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h
View file

@ -127,7 +127,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);
#define MAX_PATH 260 #define MAX_PATH 260
void __debugbreak(); void // __debugbreak();
VOID DebugBreak(VOID); VOID DebugBreak(VOID);

2
Minecraft.Client/PS3/PS3Extras/Ps3Stubs.h
View file

@ -132,7 +132,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);
#define MAX_PATH 260 #define MAX_PATH 260
void __debugbreak(); void // __debugbreak();
VOID DebugBreak(VOID); VOID DebugBreak(VOID);

2
Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h
View file

@ -174,7 +174,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);
#define MAX_PATH 260 #define MAX_PATH 260
void __debugbreak(); void // __debugbreak();
VOID DebugBreak(VOID); VOID DebugBreak(VOID);

4
Minecraft.Client/Particle.cpp
View file

@ -218,7 +218,7 @@ void Particle::setTex(Textures *textures, Icon *icon)
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Invalid call to Particle.setTex, use coordinate methods\n"); printf("Invalid call to Particle.setTex, use coordinate methods\n");
__debugbreak(); // __debugbreak();
#endif #endif
//throw new RuntimeException("Invalid call to Particle.setTex, use coordinate methods"); //throw new RuntimeException("Invalid call to Particle.setTex, use coordinate methods");
} }
@ -230,7 +230,7 @@ void Particle::setMiscTex(int slotIndex)
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Invalid call to Particle.setMixTex\n"); printf("Invalid call to Particle.setMixTex\n");
__debugbreak(); // __debugbreak();
//throw new RuntimeException("Invalid call to Particle.setMiscTex"); //throw new RuntimeException("Invalid call to Particle.setMiscTex");
#endif #endif
} }

2
Minecraft.Client/PreStitchedTextureMap.cpp
View file

@ -227,7 +227,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack *texturePack, Stitch
if(first->getWidth() != tex->getWidth() || first->getHeight() != tex->getHeight()) 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()); 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 #endif

2
Minecraft.Client/Stitcher.cpp
View file

@ -87,7 +87,7 @@ void Stitcher::stitch()
{ {
app.DebugPrintf("Stitcher exception!\n"); app.DebugPrintf("Stitcher exception!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
//throw new StitcherException(textureHolder); //throw new StitcherException(textureHolder);
} }

2
Minecraft.Client/TextureMap.cpp
View file

@ -214,7 +214,7 @@ Icon *TextureMap::registerIcon(const wstring &name)
{ {
app.DebugPrintf("Don't register NULL\n"); app.DebugPrintf("Don't register NULL\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
//new RuntimeException("Don't register null!").printStackTrace(); //new RuntimeException("Don't register null!").printStackTrace();
} }

2
Minecraft.Client/TexturePackRepository.cpp
View file

@ -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); app.DebugPrintf("Failed to select texture pack %d as it is not in the list\n", id);
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
// TODO - 4J Stu: We should report this to the player in some way // TODO - 4J Stu: We should report this to the player in some way
//__debugbreak(); //// __debugbreak();
#endif #endif
// Fail safely // Fail safely
if( selectSkin( DEFAULT_TEXTURE_PACK ) ) if( selectSkin( DEFAULT_TEXTURE_PACK ) )

2
Minecraft.Client/Windows64/Windows64_UIController.cpp
View file

@ -24,7 +24,7 @@ void ConsoleUIController::init(ID3D11Device *dev, ID3D11DeviceContext *ctx, ID3D
{ {
app.DebugPrintf("Failed to initialise GDraw!\n"); app.DebugPrintf("Failed to initialise GDraw!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
app.FatalLoadError(); app.FatalLoadError();
} }

2
Minecraft.Client/Xbox/Audio/SoundEngine.cpp
View file

@ -487,7 +487,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
#ifdef _DEBUG #ifdef _DEBUG
__debugbreak(); // __debugbreak();
#endif #endif
//wprintf(L"WARNING: Sound cue not found - %ls\n", name.c_str() ); //wprintf(L"WARNING: Sound cue not found - %ls\n", name.c_str() );
app.DebugPrintf("Not found: %s\n",xboxName); app.DebugPrintf("Not found: %s\n",xboxName);

2
Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
View file

@ -183,7 +183,7 @@ bool XboxLeaderboardManager::WriteStats(unsigned int viewCount, ViewIn views)
// some debug code to catch the leaderboard write with 7 views // some debug code to catch the leaderboard write with 7 views
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(viewCount>5) __debugbreak(); if(viewCount>5) // __debugbreak();
#endif #endif
// 4J Stu - If we are online we already have a session, so use that // 4J Stu - If we are online we already have a session, so use that

2
Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
View file

@ -211,7 +211,7 @@ VOID CPlatformNetworkManagerXbox::NotifyPlayerLeaving(
__in IQNetPlayer * pQNetPlayer __in IQNetPlayer * pQNetPlayer
) )
{ {
//__debugbreak(); //// __debugbreak();
app.DebugPrintf( "Player 0x%p \"%ls\" leaving.\n", app.DebugPrintf( "Player 0x%p \"%ls\" leaving.\n",
pQNetPlayer, pQNetPlayer,

2
Minecraft.Client/Xbox/Xbox_Minecraft.cpp
View file

@ -315,7 +315,7 @@ int __cdecl main()
HRESULT hr; HRESULT hr;
static bool bTrialTimerDisplayed=true; static bool bTrialTimerDisplayed=true;
//__debugbreak(); //// __debugbreak();
#ifdef MEMORY_TRACKING #ifdef MEMORY_TRACKING
ResetMem(); ResetMem();

2
Minecraft.World/ArmorItem.cpp
View file

@ -208,7 +208,7 @@ void ArmorItem::setColor(shared_ptr<ItemInstance> item, int color)
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Can't dye non-leather!"); printf("Can't dye non-leather!");
__debugbreak(); // __debugbreak();
#endif #endif
//throw new UnsupportedOperationException("Can't dye non-leather!"); //throw new UnsupportedOperationException("Can't dye non-leather!");
} }

2
Minecraft.World/BiomeDecorator.cpp
View file

@ -23,7 +23,7 @@ void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
{ {
app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n"); app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
//throw new RuntimeException("Already decorating!!"); //throw new RuntimeException("Already decorating!!");
#endif #endif
} }

4
Minecraft.World/BiomeOverrideLayer.cpp
View file

@ -32,7 +32,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup)
{ {
#ifdef _DURANGO #ifdef _DURANGO
__debugbreak(); // TODO // __debugbreak(); // TODO
DWORD bytesRead,dwFileSize = 0; DWORD bytesRead,dwFileSize = 0;
#else #else
DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
@ -40,7 +40,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup)
if(dwFileSize > m_biomeOverride.length) if(dwFileSize > m_biomeOverride.length)
{ {
app.DebugPrintf("Biomemap binary is too large!!\n"); app.DebugPrintf("Biomemap binary is too large!!\n");
__debugbreak(); // __debugbreak();
} }
BOOL bSuccess = ReadFile(file,m_biomeOverride.data,dwFileSize,&bytesRead,NULL); BOOL bSuccess = ReadFile(file,m_biomeOverride.data,dwFileSize,&bytesRead,NULL);

2
Minecraft.World/BiomeSource.cpp
View file

@ -184,7 +184,7 @@ void BiomeSource::getRawBiomeBlock(BiomeArray &biomes, int x, int z, int w, int
if(biomes[i] == NULL) if(biomes[i] == NULL)
{ {
app.DebugPrintf("Tried to assign null biome %d\n", result[i]); app.DebugPrintf("Tried to assign null biome %d\n", result[i]);
__debugbreak(); // __debugbreak();
} }
#endif #endif
} }

2
Minecraft.World/Class.h
View file

@ -598,7 +598,7 @@ public:
if ( (m_falsePositives.size() > 0) || (m_falseNegatives.size() > 0) ) if ( (m_falsePositives.size() > 0) || (m_falseNegatives.size() > 0) )
{ {
__debugbreak(); // __debugbreak();
} }
} }
}; };

2
Minecraft.World/CompoundTag.h
View file

@ -36,7 +36,7 @@ public:
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Tried to read NBT tag with too high complexity, depth > %d" , MAX_DEPTH); printf("Tried to read NBT tag with too high complexity, depth > %d" , MAX_DEPTH);
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }

2
Minecraft.World/CompressedTileStorage.cpp
View file

@ -1056,7 +1056,7 @@ void CompressedTileStorage::compress(int upgradeBlock/*=-1*/)
#ifndef _DURANGO #ifndef _DURANGO
MEMORYSTATUS memStatus; MEMORYSTATUS memStatus;
GlobalMemoryStatus(&memStatus); GlobalMemoryStatus(&memStatus);
__debugbreak(); // __debugbreak();
#endif #endif
} }
unsigned char *pucData = newIndicesAndData + 1024; unsigned char *pucData = newIndicesAndData + 1024;

10
Minecraft.World/ConsoleSaveFileOriginal.cpp
View file

@ -68,7 +68,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
if( pagesCommitted != 0 ) if( pagesCommitted != 0 )
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
} }
@ -79,7 +79,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
// Out of physical memory // Out of physical memory
__debugbreak(); // __debugbreak();
#endif #endif
} }
pagesCommitted = pagesRequired; pagesCommitted = pagesRequired;
@ -184,7 +184,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
if( pvRet == NULL ) if( pvRet == NULL )
{ {
// Out of physical memory // Out of physical memory
__debugbreak(); // __debugbreak();
} }
pagesCommitted = pagesRequired; pagesCommitted = pagesRequired;
} }
@ -475,7 +475,7 @@ void ConsoleSaveFileOriginal::finalizeWrite()
void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE);
if( pvRet == NULL ) if( pvRet == NULL )
{ {
__debugbreak(); // __debugbreak();
} }
pagesCommitted = pagesRequired; pagesCommitted = pagesRequired;
} }
@ -509,7 +509,7 @@ void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, DWORD nNumberOfByt
if( pvRet == NULL ) if( pvRet == NULL )
{ {
// Out of physical memory // Out of physical memory
__debugbreak(); // __debugbreak();
} }
pagesCommitted = pagesRequired; pagesCommitted = pagesRequired;
} }

8
Minecraft.World/CustomLevelSource.cpp
View file

@ -41,7 +41,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt
{ {
#ifdef _DURANGO #ifdef _DURANGO
__debugbreak(); // TODO // __debugbreak(); // TODO
DWORD bytesRead,dwFileSize = 0; DWORD bytesRead,dwFileSize = 0;
#else #else
DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
@ -49,7 +49,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt
if(dwFileSize > m_heightmapOverride.length) if(dwFileSize > m_heightmapOverride.length)
{ {
app.DebugPrintf("Heightmap binary is too large!!\n"); app.DebugPrintf("Heightmap binary is too large!!\n");
__debugbreak(); // __debugbreak();
} }
BOOL bSuccess = ReadFile(file,m_heightmapOverride.data,dwFileSize,&bytesRead,NULL); 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 #ifdef _DURANGO
__debugbreak(); // TODO // __debugbreak(); // TODO
DWORD bytesRead,dwFileSize = 0; DWORD bytesRead,dwFileSize = 0;
#else #else
DWORD bytesRead,dwFileSize = GetFileSize(file,NULL); DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
@ -91,7 +91,7 @@ CustomLevelSource::CustomLevelSource(Level *level, int64_t seed, bool generateSt
if(dwFileSize > m_waterheightOverride.length) if(dwFileSize > m_waterheightOverride.length)
{ {
app.DebugPrintf("waterheight binary is too large!!\n"); app.DebugPrintf("waterheight binary is too large!!\n");
__debugbreak(); // __debugbreak();
} }
BOOL bSuccess = ReadFile(file,m_waterheightOverride.data,dwFileSize,&bytesRead,NULL); BOOL bSuccess = ReadFile(file,m_waterheightOverride.data,dwFileSize,&bytesRead,NULL);

2
Minecraft.World/CustomPayloadPacket.cpp
View file

@ -31,7 +31,7 @@ CustomPayloadPacket::CustomPayloadPacket(const wstring &identifier, byteArray da
{ {
app.DebugPrintf("Payload may not be larger than 32K\n"); app.DebugPrintf("Payload may not be larger than 32K\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
//throw new IllegalArgumentException("Payload may not be larger than 32k"); //throw new IllegalArgumentException("Payload may not be larger than 32k");
} }

4
Minecraft.World/DirectoryLevelStorage.cpp
View file

@ -43,7 +43,7 @@ int _MapDataMappings::getDimension(int id)
default: default:
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Read invalid dimension from MapDataMapping\n"); printf("Read invalid dimension from MapDataMapping\n");
__debugbreak(); // __debugbreak();
#endif #endif
break; break;
} }
@ -72,7 +72,7 @@ void _MapDataMappings::setMapping(int id, PlayerUID xuid, int dimension)
default: default:
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Trinyg to set a MapDataMapping for an invalid dimension.\n"); printf("Trinyg to set a MapDataMapping for an invalid dimension.\n");
__debugbreak(); // __debugbreak();
#endif #endif
break; break;
} }

2
Minecraft.World/Enchantment.cpp
View file

@ -83,7 +83,7 @@ void Enchantment::_init(int id)
{ {
app.DebugPrintf("Duplicate enchantment id!"); app.DebugPrintf("Duplicate enchantment id!");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
//throw new IllegalArgumentException("Duplicate enchantment id!"); //throw new IllegalArgumentException("Duplicate enchantment id!");
} }

2
Minecraft.World/Entity.cpp
View file

@ -97,7 +97,7 @@ int Entity::getSmallId()
} }
app.DebugPrintf("Out of small entity Ids... possible leak?\n"); app.DebugPrintf("Out of small entity Ids... possible leak?\n");
__debugbreak(); // __debugbreak();
return -1; return -1;
} }

2
Minecraft.World/File.cpp
View file

@ -239,7 +239,7 @@ bool File::renameTo(File dest)
std::string sourcePath = wstringtofilename(getPath()); std::string sourcePath = wstringtofilename(getPath());
const char *destPath = wstringtofilename(dest.getPath()); const char *destPath = wstringtofilename(dest.getPath());
#ifdef _DURANGO #ifdef _DURANGO
__debugbreak(); // TODO // __debugbreak(); // TODO
BOOL result = false; BOOL result = false;
#else #else
BOOL result = MoveFile(sourcePath.c_str(), destPath); BOOL result = MoveFile(sourcePath.c_str(), destPath);

2
Minecraft.World/FileHeader.cpp
View file

@ -298,7 +298,7 @@ void FileHeader::ReadHeader( LPVOID saveMem, ESavePlatform plat /*= SAVE_FILE_PL
default: default:
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
app.DebugPrintf("********** Invalid save version %d\n",m_saveVersion); app.DebugPrintf("********** Invalid save version %d\n",m_saveVersion);
__debugbreak(); // __debugbreak();
#endif #endif
break; break;
} }

2
Minecraft.World/FileInputStream.cpp
View file

@ -44,7 +44,7 @@ FileInputStream::FileInputStream(const File &file)
if( m_fileHandle == INVALID_HANDLE_VALUE ) if( m_fileHandle == INVALID_HANDLE_VALUE )
{ {
// TODO 4J Stu - Any form of error/exception handling // TODO 4J Stu - Any form of error/exception handling
//__debugbreak(); //// __debugbreak();
app.FatalLoadError(); app.FatalLoadError();
} }
} }

2
Minecraft.World/GameCommandPacket.cpp
View file

@ -23,7 +23,7 @@ GameCommandPacket::GameCommandPacket(EGameCommand command, byteArray data)
{ {
app.DebugPrintf("Payload may not be larger than 32K\n"); app.DebugPrintf("Payload may not be larger than 32K\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
//throw new IllegalArgumentException("Payload may not be larger than 32k"); //throw new IllegalArgumentException("Payload may not be larger than 32k");
} }

2
Minecraft.World/Level.cpp
View file

@ -2412,7 +2412,7 @@ void Level::tickEntities()
{ {
if(isClientSide) if(isClientSide)
{ {
__debugbreak(); // __debugbreak();
} }
it = tileEntityList.erase(it); it = tileEntityList.erase(it);
} }

2
Minecraft.World/ListTag.h
View file

@ -30,7 +30,7 @@ public:
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
printf("Tried to read NBT tag with too high complexity, depth > %d", MAX_DEPTH); printf("Tried to read NBT tag with too high complexity, depth > %d", MAX_DEPTH);
__debugbreak(); // __debugbreak();
#endif #endif
return; return;
} }

2
Minecraft.World/MoveEntityPacket.cpp
View file

@ -38,7 +38,7 @@ void MoveEntityPacket::write(DataOutputStream *dos) //throws IOException
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
dos->writeShort((short)id); dos->writeShort((short)id);
} }

10
Minecraft.World/MoveEntityPacketSmall.cpp
View file

@ -22,7 +22,7 @@ MoveEntityPacketSmall::MoveEntityPacketSmall(int id)
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
this->id = id; this->id = id;
@ -45,7 +45,7 @@ void MoveEntityPacketSmall::write(DataOutputStream *dos) //throws IOException
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
dos->writeShort((short)id); dos->writeShort((short)id);
} }
@ -102,7 +102,7 @@ void MoveEntityPacketSmall::PosRot::write(DataOutputStream *dos) //throws IOExce
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
short idAndRot = id | yRot << 11; short idAndRot = id | yRot << 11;
dos->writeShort(idAndRot); dos->writeShort(idAndRot);
@ -141,7 +141,7 @@ void MoveEntityPacketSmall::Pos::write(DataOutputStream *dos) //throws IOExcepti
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
short idAndY = id | ya << 11; short idAndY = id | ya << 11;
dos->writeShort(idAndY); dos->writeShort(idAndY);
@ -179,7 +179,7 @@ void MoveEntityPacketSmall::Rot::write(DataOutputStream *dos) //throws IOExcepti
if( (id < 0 ) || (id >= 2048 ) ) if( (id < 0 ) || (id >= 2048 ) )
{ {
// We shouln't be tracking an entity that doesn't have a short type of id // We shouln't be tracking an entity that doesn't have a short type of id
__debugbreak(); // __debugbreak();
} }
short idAndRot = id | yRot << 11; short idAndRot = id | yRot << 11;
dos->writeShort(idAndRot); dos->writeShort(idAndRot);

4
Minecraft.World/Packet.cpp
View file

@ -284,7 +284,7 @@ byteArray Packet::readBytes(DataInputStream *datainputstream)
{ {
app.DebugPrintf("Key was smaller than nothing! Weird key!"); app.DebugPrintf("Key was smaller than nothing! Weird key!");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return byteArray(); return byteArray();
//throw new IOException("Key was smaller than nothing! Weird key!"); //throw new IOException("Key was smaller than nothing! Weird key!");
@ -330,7 +330,7 @@ shared_ptr<Packet> Packet::readPacket(DataInputStream *dis, bool isServer) // th
if ((isServer && serverReceivedPackets.find(id) == serverReceivedPackets.end()) || (!isServer && clientReceivedPackets.find(id) == clientReceivedPackets.end())) if ((isServer && serverReceivedPackets.find(id) == serverReceivedPackets.end()) || (!isServer && clientReceivedPackets.find(id) == clientReceivedPackets.end()))
{ {
//app.DebugPrintf("Bad packet id %d\n", id); //app.DebugPrintf("Bad packet id %d\n", id);
__debugbreak(); // __debugbreak();
assert(false); assert(false);
// throw new IOException(wstring(L"Bad packet id ") + std::to_wstring(id)); // throw new IOException(wstring(L"Bad packet id ") + std::to_wstring(id));
} }

2
Minecraft.World/PressurePlateTile.cpp
View file

@ -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)); 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 == mobs) entities = level->getEntitiesOfClass(typeid(LivingEntity), getSensitiveAABB(x, y, z));
else if (sensitivity == players) entities = level->getEntitiesOfClass(typeid(Player), 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()) if (entities != NULL && !entities->empty())
{ {

2
Minecraft.World/RegionFile.cpp
View file

@ -299,7 +299,7 @@ void RegionFile::write(int x, int z, byte *data, int length) // TODO - was sync
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(sectorNumber < 0) if(sectorNumber < 0)
{ {
__debugbreak(); // __debugbreak();
} }
#endif #endif

2
Minecraft.World/SavedDataStorage.cpp
View file

@ -50,7 +50,7 @@ shared_ptr<SavedData> SavedDataStorage::get(const type_info& clazz, const wstrin
else else
{ {
// Handling of new SavedData class required // Handling of new SavedData class required
__debugbreak(); // __debugbreak();
} }
ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(levelStorage->getSaveFile(), file); ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(levelStorage->getSaveFile(), file);

2
Minecraft.World/Scoreboard.cpp
View file

@ -15,7 +15,7 @@ Objective *Scoreboard::addObjective(const wstring &name, ObjectiveCriteria *crit
// if (objective != NULL) // if (objective != NULL)
// { // {
//#indef _CONTENT_PACKAGE //#indef _CONTENT_PACKAGE
// __debugbreak(); // // __debugbreak();
//#endif //#endif
// //throw new IllegalArgumentException("An objective with the name '" + name + "' already exists!"); // //throw new IllegalArgumentException("An objective with the name '" + name + "' already exists!");
// } // }

4
Minecraft.World/SetPlayerTeamPacket.cpp
View file

@ -39,14 +39,14 @@ SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam *team, vector<wstring> *play
{ {
app.DebugPrintf("Method must be join or leave for player constructor"); app.DebugPrintf("Method must be join or leave for player constructor");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
} }
if (playerNames == NULL || playerNames->empty()) if (playerNames == NULL || playerNames->empty())
{ {
app.DebugPrintf("Players cannot be null/empty"); app.DebugPrintf("Players cannot be null/empty");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
} }

2
Minecraft.World/StrongholdFeature.cpp
View file

@ -148,7 +148,7 @@ bool StrongholdFeature::isFeatureChunk(int x, int z,bool bIsSuperflat)
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(position->x > 2560 || position->x < -2560 || position->z > 2560 || position->z < -2560) if(position->x > 2560 || position->x < -2560 || position->z > 2560 || position->z < -2560)
{ {
__debugbreak(); // __debugbreak();
} }
#endif #endif

2
Minecraft.World/Tag.cpp
View file

@ -92,7 +92,7 @@ Tag *Tag::readNamedTag(DataInput *dis, int tagDepth)
{ {
app.DebugPrintf("readNamedTag read a type of 255\n"); app.DebugPrintf("readNamedTag read a type of 255\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
__debugbreak(); // __debugbreak();
#endif #endif
return new EndTag(); return new EndTag();
} }

4
Minecraft.World/WeighedRandom.cpp
View file

@ -15,7 +15,7 @@ WeighedRandomItem *WeighedRandom::getRandomItem(Random *random, vector<WeighedRa
{ {
if (totalWeight <= 0) if (totalWeight <= 0)
{ {
__debugbreak(); // __debugbreak();
} }
int selection = random->nextInt(totalWeight); int selection = random->nextInt(totalWeight);
@ -50,7 +50,7 @@ WeighedRandomItem *WeighedRandom::getRandomItem(Random *random, WeighedRandomIte
{ {
if (totalWeight <= 0) if (totalWeight <= 0)
{ {
__debugbreak(); // __debugbreak();
} }
int selection = random->nextInt(totalWeight); int selection = random->nextInt(totalWeight);