Skip to content
This repository was archived by the owner on Mar 22, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Minecraft.Client/ArchiveFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Chunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions Minecraft.Client/Common/Consoles_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -6407,7 +6407,7 @@ void CMinecraftApp::InitialiseTips()
{
// the m_TriviaTipA or the m_GameTipA are out of sync
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
}
}
Expand Down
4 changes: 2 additions & 2 deletions Minecraft.Client/Common/DLC/DLCManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand All @@ -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 )
Expand Down
6 changes: 3 additions & 3 deletions Minecraft.Client/Common/DLC/DLCPack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Common/GameRules/GameRule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameRule::ValueType GameRule::getParameter(const wstring &parameterName)
{
#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];
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Common/GameRules/GameRuleManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *

void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlayer)
{
//__debugbreak();
//// __debugbreak();

app.DebugPrintf( "Player 0x%p leaving.\n",
pSQRPlayer );
Expand Down
38 changes: 19 additions & 19 deletions Minecraft.Client/Common/UI/UIScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -339,7 +339,7 @@ void UIScene::loadMovie()
{
app.DebugPrintf("ERROR: Failed to load iggy scene!\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
app.FatalLoadError();
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -1153,15 +1153,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_number)
{
app.DebugPrintf("Arguments for handlePress were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -1173,15 +1173,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_number)
{
app.DebugPrintf("Arguments for handleFocusChange were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -1193,15 +1193,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_number)
{
app.DebugPrintf("Arguments for handleInitFocus were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -1213,15 +1213,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_boolean)
{
app.DebugPrintf("Arguments for handleCheckboxToggled were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -1233,15 +1233,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_number)
{
app.DebugPrintf("Arguments for handleSliderMove were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -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;
}
Expand All @@ -1265,15 +1265,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number)
{
app.DebugPrintf("Arguments for handleSelectionChanged were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand All @@ -1291,15 +1291,15 @@ 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;
}
if(call->arguments[0].type != IGGY_DATATYPE_number || call->arguments[1].type != IGGY_DATATYPE_boolean)
{
app.DebugPrintf("Arguments for handleRequestMoreData were not of the correct type\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
return;
}
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
break;
#endif

default: __debugbreak();
default: // __debugbreak();
}

bool confirmUser = false;
Expand Down
4 changes: 2 additions & 2 deletions Minecraft.Client/DLCTexturePack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"";
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Durango/Durango_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Durango/Durango_UIController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void ConsoleUIController::init(Microsoft::WRL::ComPtr<ID3D11Device> dev, Microso
{
app.DebugPrintf("Failed to initialise GDraw!\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
// __debugbreak();
#endif
app.FatalLoadError();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl

void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRPlayer)
{
//__debugbreak();
//// __debugbreak();

app.DebugPrintf( "Player 0x%p leaving.\n",
pDQRPlayer );
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/EntityRenderDispatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/EntityTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void EntityTracker::addEntity(shared_ptr<Entity> e, int range, int updateInterva
}
if( e->entityId >= 2048 )
{
__debugbreak();
// __debugbreak();
}
shared_ptr<TrackedEntity> te = shared_ptr<TrackedEntity>( new TrackedEntity(e, range, updateInterval, trackDeltas) );
entities.insert(te);
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/GameRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Loading
Loading