From 8395a7a8714affeb7341a21426c3db18f4343cc9 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 17:50:03 +0100 Subject: [PATCH 1/6] Changed core. --- Core/GameEngine/Source/GameClient/Credits.cpp | 2 +- .../Source/GameClient/GUI/GameWindowTransitions.cpp | 4 ++-- Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 6 +++--- Core/GameEngine/Source/GameClient/GameText.cpp | 12 ++++++------ Core/GameEngine/Source/GameClient/GlobalLanguage.cpp | 2 +- Core/GameEngine/Source/GameClient/MapUtil.cpp | 2 +- Core/GameEngine/Source/GameNetwork/GameInfo.cpp | 2 +- Core/GameEngine/Source/GameNetwork/LANAPI.cpp | 6 +++--- .../Source/GameNetwork/LANAPICallbacks.cpp | 2 +- .../GameEngine/Source/GameNetwork/LANAPIhandlers.cpp | 4 ++-- .../Source/GameNetwork/NetMessageStream.cpp | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Core/GameEngine/Source/GameClient/Credits.cpp b/Core/GameEngine/Source/GameClient/Credits.cpp index fc23c65eac8..f732f0a546f 100644 --- a/Core/GameEngine/Source/GameClient/Credits.cpp +++ b/Core/GameEngine/Source/GameClient/Credits.cpp @@ -460,7 +460,7 @@ void CreditsManager::addText( AsciiString text ) } break; default: - DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it. Style is %d", m_currentStyle) ); + DEBUG_CRASH( ("CreditsManager::addText we tried to add a credit text with the wrong style before it. Style is %d", m_currentStyle) ); delete cLine; } diff --git a/Core/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/Core/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index fc99b16ba8b..cd2205a44a2 100644 --- a/Core/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -135,7 +135,7 @@ Transition *getTransitionForStyle( Int style ) return NEW ScoreScaleUpTransition; default: - DEBUG_ASSERTCRASH(FALSE, ("getTransitionForStyle:: An invalid style was passed in. Style = %d", style)); + DEBUG_CRASH(("getTransitionForStyle:: An invalid style was passed in. Style = %d", style)); return nullptr; } return nullptr; @@ -532,7 +532,7 @@ TransitionGroup *GameWindowTransitionsHandler::getNewGroup( AsciiString name ) // test to see if we're trying to add an already existing group. if(findGroup(name)) { - DEBUG_ASSERTCRASH(FALSE, ("GameWindowTransitionsHandler::getNewGroup - We already have a group %s", name.str())); + DEBUG_CRASH(("GameWindowTransitionsHandler::getNewGroup - We already have a group %s", name.str())); return nullptr; } TransitionGroup *g = NEW TransitionGroup; diff --git a/Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 59154f13f45..e646b216c26 100644 --- a/Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -1472,7 +1472,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1) { - DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId)); + DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId)); return; } //DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId])); @@ -1831,7 +1831,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1) { - DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId)); + DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId)); return; } //DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId])); @@ -1969,7 +1969,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1) { - DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId)); + DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId)); return; } diff --git a/Core/GameEngine/Source/GameClient/GameText.cpp b/Core/GameEngine/Source/GameClient/GameText.cpp index 0015e3a3fc9..27f15985361 100644 --- a/Core/GameEngine/Source/GameClient/GameText.cpp +++ b/Core/GameEngine/Source/GameClient/GameText.cpp @@ -1037,7 +1037,7 @@ Bool GameTextManager::parseStringFile( const char *filename ) { if ( stricmp ( m_stringInfo[i].label.str(), m_buffer ) == 0) { - DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer )); + DEBUG_CRASH ( ("String label '%s' multiply defined!", m_buffer )); } } @@ -1055,7 +1055,7 @@ Bool GameTextManager::parseStringFile( const char *filename ) { if (!readLine ( m_buffer, sizeof(m_buffer)-1, file )) { - DEBUG_ASSERTCRASH (FALSE, ("Unexpected end of string file")); + DEBUG_CRASH (("Unexpected end of string file")); ok = FALSE; goto quit; } @@ -1073,7 +1073,7 @@ Bool GameTextManager::parseStringFile( const char *filename ) if ( readString ) { // only one string per label allows - DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str())); + DEBUG_CRASH ( ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str())); } else { @@ -1168,7 +1168,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename ) { if ( stricmp ( m_mapStringInfo[i].label.str(), m_buffer ) == 0) { - DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer )); + DEBUG_CRASH ( ("String label '%s' multiply defined!", m_buffer )); } } @@ -1186,7 +1186,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename ) { if (!readLine ( m_buffer, sizeof(m_buffer)-1, file )) { - DEBUG_ASSERTCRASH (FALSE, ("Unexpected end of string file")); + DEBUG_CRASH (("Unexpected end of string file")); ok = FALSE; goto quit; } @@ -1204,7 +1204,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename ) if ( readString ) { // only one string per label allowed - DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str())); + DEBUG_CRASH ( ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str())); } else { diff --git a/Core/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Core/GameEngine/Source/GameClient/GlobalLanguage.cpp index 73ae562e885..9bb9425e1ca 100644 --- a/Core/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/Core/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -162,7 +162,7 @@ void GlobalLanguage::init() AsciiString font = *it; if(AddFontResource(font.str()) == 0) { - DEBUG_ASSERTCRASH(FALSE,("GlobalLanguage::init Failed to add font %s", font.str())); + DEBUG_CRASH(("GlobalLanguage::init Failed to add font %s", font.str())); } else { diff --git a/Core/GameEngine/Source/GameClient/MapUtil.cpp b/Core/GameEngine/Source/GameClient/MapUtil.cpp index 1a12c47e344..11437d403e3 100644 --- a/Core/GameEngine/Source/GameClient/MapUtil.cpp +++ b/Core/GameEngine/Source/GameClient/MapUtil.cpp @@ -1256,7 +1256,7 @@ Image *getMapPreviewImage( AsciiString mapName ) // Read the waypoints. file.registerParser( "MapPreview", AsciiString::TheEmptyString, parseMapPreviewChunk ); if (!file.parse(nullptr)) { - DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info.")); + DEBUG_CRASH(("Unable to read MapPreview info.")); deleteInstance(mapPreviewImage); return nullptr; } diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index 0b5370f0947..648c13d3354 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -978,7 +978,7 @@ AsciiString GameInfoToAsciiString( const GameInfo *game ) } else { - DEBUG_ASSERTCRASH(false, ("Bad slot type")); + DEBUG_CRASH(("Bad slot type")); str = "X:"; } optionsString.concat(str); diff --git a/Core/GameEngine/Source/GameNetwork/LANAPI.cpp b/Core/GameEngine/Source/GameNetwork/LANAPI.cpp index c7671fdc5c5..be01cd197fc 100644 --- a/Core/GameEngine/Source/GameNetwork/LANAPI.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANAPI.cpp @@ -989,7 +989,7 @@ AsciiString LANAPI::createSlotString( void ) } else { - DEBUG_ASSERTCRASH(false, ("Bad slot type")); + DEBUG_CRASH(("Bad slot type")); str = "X,"; } @@ -1153,7 +1153,7 @@ void LANAPI::removeGame( LANGameInfo *game ) else { // Odd. We went the whole way without finding it in the list. - DEBUG_ASSERTCRASH(false, ("LANGameInfo wasn't in the list")); + DEBUG_CRASH(("LANGameInfo wasn't in the list")); } } } @@ -1194,7 +1194,7 @@ void LANAPI::removePlayer( LANPlayer *player ) else { // Odd. We went the whole way without finding it in the list. - DEBUG_ASSERTCRASH(false, ("LANPlayer wasn't in the list")); + DEBUG_CRASH(("LANPlayer wasn't in the list")); } } } diff --git a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp index 2c344553f76..9423e7663fa 100644 --- a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp @@ -551,7 +551,7 @@ void LANAPI::OnPlayerLeave( UnicodeString player ) if (m_name.compare(player) == 0) { // We're leaving. Save options and Pop the shell up a screen. - //DEBUG_ASSERTCRASH(false, ("Slot is %d", m_currentGame->getLocalSlotNum())); + //DEBUG_CRASH(("Slot is %d", m_currentGame->getLocalSlotNum())); if (m_currentGame && m_currentGame->isInGame() && m_currentGame->getLocalSlotNum() >= 0) { LANPreferences pref; diff --git a/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp index 0f44f1d681d..7f88b835f86 100644 --- a/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp @@ -432,7 +432,7 @@ void LANAPI::handleJoinAccept( LANMessage *msg, UnsignedInt senderIP ) if (!m_currentGame) { - DEBUG_ASSERTCRASH(false, ("Could not find game to join!")); + DEBUG_CRASH(("Could not find game to join!")); OnGameJoin(RET_UNKNOWN, nullptr); } else @@ -463,7 +463,7 @@ void LANAPI::handleJoinAccept( LANMessage *msg, UnsignedInt senderIP ) prefs.write(); OnGameJoin(RET_OK, m_currentGame); - //DEBUG_ASSERTCRASH(false, ("setting host to %ls@%ls", m_currentGame->getLANSlot(0)->getUser()->getLogin().str(), + //DEBUG_CRASH(("setting host to %ls@%ls", m_currentGame->getLANSlot(0)->getUser()->getLogin().str(), // m_currentGame->getLANSlot(0)->getUser()->getHost().str())); } m_pendingAction = ACT_NONE; diff --git a/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp b/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp index c2855eca5ce..2ae6a14899e 100644 --- a/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp @@ -181,7 +181,7 @@ Bool AddCommandToPacket(const GameMessage *msg) commandBuf[0] = MSGTYPE_PARTIALCOMMAND; if (!TheNetwork->queueSend(BROADCAST_CON, commandBuf, bytesUsed + sizeof(CommandPacketHeader) + 1, MSG_NEEDACK | MSG_SEQUENCED)) { - //DEBUG_ASSERTCRASH(false, ("Too many commands in one frame! Some will be dropped.")); + //DEBUG_CRASH(("Too many commands in one frame! Some will be dropped.")); DEBUG_LOG(("Too many commands in one frame! Some will be dropped.")); return false; } @@ -192,7 +192,7 @@ Bool AddCommandToPacket(const GameMessage *msg) if (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN) { - //DEBUG_ASSERTCRASH(false, ("Too many commands in one frame! Some will be dropped.")); + //DEBUG_CRASH(("Too many commands in one frame! Some will be dropped.")); DEBUG_LOG(("Too many commands in one frame! Some will be dropped.")); return false; } From a87255e01ca9e6d5636637f42db30735fc356a63 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 17:50:38 +0100 Subject: [PATCH 2/6] Changed ZH. --- .../Source/Common/INI/INIMultiplayer.cpp | 2 +- .../GameEngine/Source/Common/RTS/Player.cpp | 2 +- .../Source/Common/Thing/ThingTemplate.cpp | 2 +- .../GameClient/GUI/ControlBar/ControlBar.cpp | 2 +- .../GUI/ControlBar/ControlBarResizer.cpp | 6 ++-- .../GUI/ControlBar/ControlBarScheme.cpp | 30 +++++++++---------- .../ControlBarPopupDescription.cpp | 2 +- .../GUI/GUICallbacks/ExtendedMessageBox.cpp | 2 +- .../GUI/GUICallbacks/Menus/QuitMenu.cpp | 2 +- .../GUI/GUICallbacks/Menus/ScoreScreen.cpp | 2 +- .../Menus/SkirmishGameOptionsMenu.cpp | 2 +- .../GUICallbacks/Menus/WOLBuddyOverlay.cpp | 2 +- .../GameClient/GUI/Gadget/GadgetListBox.cpp | 4 +-- .../GameClient/GUI/GameWindowManager.cpp | 2 +- .../GUI/GameWindowTransitionsStyles.cpp | 30 +++++++++---------- .../GameEngine/Source/GameClient/InGameUI.cpp | 2 +- .../GameClient/MessageStream/CommandXlat.cpp | 4 +-- .../GameClient/MessageStream/HotKey.cpp | 2 +- .../GameClient/System/CampaignManager.cpp | 4 +-- .../GameLogic/Object/ObjectCreationList.cpp | 2 +- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Object/Update/DockUpdate/DockUpdate.cpp | 2 +- .../Source/GameLogic/System/GameLogic.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DScene.cpp | 2 +- 24 files changed, 57 insertions(+), 57 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp index ed7840d7bd5..94f9b93a75b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp @@ -43,7 +43,7 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini ) // if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES ) { - DEBUG_ASSERTCRASH(false, ("Creating an override of MultiplayerSettings!")); + DEBUG_CRASH(("Creating an override of MultiplayerSettings!")); } } else diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 742b3bb38ff..20b24c41c6b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -3859,7 +3859,7 @@ void Player::removeKindOfProductionCostChange( KindOfMaskType kindOf, Real perce } ++it; } - DEBUG_ASSERTCRASH(FALSE, ("removeKindOfProductionCostChange was called with kindOf=%d and percent=%f. We could not find the entry in the list with these variables. CLH.",kindOf, percent)); + DEBUG_CRASH(("removeKindOfProductionCostChange was called with kindOf=%d and percent=%f. We could not find the entry in the list with these variables. CLH.",kindOf, percent)); } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp index 9df3ffcf3fc..fa8efab1b74 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp @@ -568,7 +568,7 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const { // if (self->getName().compare("GLAVehicleQuadCannon")) -// DEBUG_ASSERTCRASH( FALSE, ("WE ARE CLEARING DEFAULT MODULES FROM A QUAD CANNON.") ); +// DEBUG_CRASH( ("WE ARE CLEARING DEFAULT MODULES FROM A QUAD CANNON.") ); self->m_behaviorModuleInfo.clearCopiedFromDefaultEntries(interfaceMask, tokenStr, self ); self->m_drawModuleInfo.clearCopiedFromDefaultEntries(interfaceMask, tokenStr, self ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 3c35264609b..aaa4911cb96 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -3020,7 +3020,7 @@ void ControlBar::switchControlBarStage( ControlBarStages stage ) setHiddenControlBar(); break; default: - DEBUG_ASSERTCRASH(FALSE,("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage)); + DEBUG_CRASH(("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage)); } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp index d3ef6a5c231..d3593738155 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp @@ -117,7 +117,7 @@ ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::findResizerWindow")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::findResizerWindow")); it++; continue; } @@ -160,7 +160,7 @@ void ControlBarResizer::sizeWindowsDefault( void ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); it++; continue; } @@ -187,7 +187,7 @@ void ControlBarResizer::sizeWindowsAlt( void ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); it++; continue; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index beaab2afbb4..cfbb25f78a8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -671,7 +671,7 @@ void ControlBarScheme::addAnimation( ControlBarSchemeAnimation *schemeAnim ) { if( !schemeAnim ) { - DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme")); + DEBUG_CRASH(("Trying to add a null animation to the controlbarscheme")); return; } m_animations.push_back( schemeAnim ); @@ -684,13 +684,13 @@ void ControlBarScheme::addImage( ControlBarSchemeImage *schemeImage ) { if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme")); + DEBUG_CRASH(("Trying to add a null image to the controlbarscheme")); return; } if(schemeImage->m_layer < 0 || schemeImage->m_layer >= MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS) { - DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d", + DEBUG_CRASH(("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d", schemeImage->m_name.str(), schemeImage->m_layer, 0, MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS)); // bring the foobar to the front so we make it obvious that something's wrong schemeImage->m_layer = 0; @@ -713,7 +713,7 @@ void ControlBarScheme::updateAnim (ControlBarSchemeAnimation * anim) } default: { - DEBUG_ASSERTCRASH(FALSE,("We tried to animate but not animate function was found %d", anim->m_animType)); + DEBUG_CRASH(("We tried to animate but not animate function was found %d", anim->m_animType)); } } } @@ -730,7 +730,7 @@ void ControlBarScheme::update( void ) ControlBarSchemeAnimation *anim = *it; if( !anim ) { - DEBUG_ASSERTCRASH(FALSE,("THere's no Animation in the ControlBarSchemeAnimationList:m_animations")); + DEBUG_CRASH(("THere's no Animation in the ControlBarSchemeAnimationList:m_animations")); return; } updateAnim( anim ); @@ -752,7 +752,7 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset ) ControlBarSchemeImage *schemeImage = *it; if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("There is no ControlBarSchemeImage found in the m_layer list")); + DEBUG_CRASH(("There is no ControlBarSchemeImage found in the m_layer list")); it++; continue; } @@ -789,7 +789,7 @@ void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset ) ControlBarSchemeImage *schemeImage = *it; if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("There is no ControlBarSchemeImage found in the m_layer list")); + DEBUG_CRASH(("There is no ControlBarSchemeImage found in the m_layer list")); it++; continue; } @@ -912,7 +912,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name ControlBarScheme *cbScheme = findControlBarScheme(name); if(cbScheme) { - DEBUG_ASSERTCRASH(false,("We're overwriting a previous control bar scheme %s",name.str())); + DEBUG_CRASH(("We're overwriting a previous control bar scheme %s",name.str())); cbScheme->reset(); cbScheme->m_name.set( name ); cbScheme->m_name.toLower(); @@ -923,7 +923,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name if( !cbScheme || name.isEmpty() ) { - DEBUG_ASSERTCRASH(FALSE,("Could not create controlbar %s", name.str())); + DEBUG_CRASH(("Could not create controlbar %s", name.str())); return nullptr; } @@ -950,7 +950,7 @@ ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString nam ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); return nullptr; } if(CBScheme->m_name.compareNoCase( name ) == 0) @@ -970,7 +970,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay ) ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); continue; } @@ -1024,7 +1024,7 @@ void ControlBarSchemeManager::init( void ) // } if( m_schemeList.empty() ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file")); return; } @@ -1046,7 +1046,7 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName) } else { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); m_currentScheme = nullptr; } if(m_currentScheme) @@ -1105,7 +1105,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); it++; continue; } @@ -1173,7 +1173,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p) ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); it++; continue; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index 1ecb6250536..3e84f089e12 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -586,7 +586,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton, } else { - DEBUG_ASSERTCRASH(FALSE, ("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows.")); + DEBUG_CRASH(("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows.")); return; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp index 3a623cfa1d8..1d8c22b71e1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp @@ -123,7 +123,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne //we shouldn't have button OK and Yes on the same dialog if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) ) { - DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); + DEBUG_CRASH(("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); } //Position the OK button if we have one diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index fc0c4520266..19a69d5221d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -373,7 +373,7 @@ void ToggleQuitMenu() // load the quit menu from the layout file if needed if( quitMenuLayout == nullptr ) { - DEBUG_ASSERTCRASH(FALSE, ("Could not load a quit menu layout")); + DEBUG_CRASH(("Could not load a quit menu layout")); isVisible = FALSE; TheInGameUI->setQuitMenuVisible(FALSE); return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 231f161c23f..a6923d75c8f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -1423,7 +1423,7 @@ void populatePlayerInfo( Player *player, Int pos) ScoreKeeper *scoreKpr = player->getScoreKeeper(); if(!scoreKpr) { - DEBUG_ASSERTCRASH(FALSE,("Player %s does not have a scoreKeeper", player->getPlayerDisplayName().str())); + DEBUG_CRASH(("Player %s does not have a scoreKeeper", player->getPlayerDisplayName().str())); return; } AsciiString winName; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 133ddf9b0fd..e16f2d5f8d8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -750,7 +750,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition } else { - DEBUG_ASSERTCRASH(FALSE,("positionStartSpots:: someone messed with the map cash. We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str())); + DEBUG_CRASH(("positionStartSpots:: someone messed with the map cash. We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str())); } } // hide the rest diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index 88e4f9a0071..d2d31ef13d4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -188,7 +188,7 @@ void InitBuddyControls(Int type) case BUDDY_WINDOW_WELCOME_SCREEN: break; default: - DEBUG_ASSERTCRASH(FALSE, ("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either")); + DEBUG_CRASH(("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either")); } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp index e9c4be80025..8688129b035 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp @@ -344,7 +344,7 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column, if( column >= list->columns || row >= list->listLength ) { - DEBUG_ASSERTCRASH(false, ("Tried to add Image to Listbox at invalid position")); + DEBUG_CRASH(("Tried to add Image to Listbox at invalid position")); return -1; } @@ -447,7 +447,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game // make sure our params are good if( column >= list->columns || row >= list->listLength ) { - DEBUG_ASSERTCRASH(false, ("Tried to add text to Listbox at invalid position")); + DEBUG_CRASH(("Tried to add text to Listbox at invalid position")); return -1; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index 50441562cc0..357f54d0c06 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -1704,7 +1704,7 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh //we shouldn't have button OK and Yes on the same dialog if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) ) { - DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); + DEBUG_CRASH(("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); } //Position the OK button if we have one diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp index 9e8ea622eb2..f7083553219 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp @@ -113,7 +113,7 @@ void FlashTransition::update( Int frame ) m_drawState = -1; if(frame < FLASHTRANSITION_START || frame > FLASHTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FlashTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FlashTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -269,7 +269,7 @@ void ButtonFlashTransition::update( Int frame ) m_drawState = -1; if(frame < BUTTONFLASHTRANSITION_START || frame > BUTTONFLASHTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ButtonFlashTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ButtonFlashTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -642,7 +642,7 @@ void FadeTransition::update( Int frame ) m_drawState = -1; if(frame < FADETRANSITION_START || frame > FADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -785,7 +785,7 @@ void ScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < SCALEUPTRANSITION_START || frame > SCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -908,7 +908,7 @@ void ScoreScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < SCORESCALEUPTRANSITION_START || frame > SCORESCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScoreScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScoreScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1039,7 +1039,7 @@ void MainMenuScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUSCALEUPTRANSITION_START || frame > MAINMENUSCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1158,7 +1158,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUMEDIUMSCALEUPTRANSITION_START || frame > MAINMENUMEDIUMSCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuMediumScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuMediumScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1277,7 +1277,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUSMALLSCALEDOWNTRANSITION_START || frame > MAINMENUSMALLSCALEDOWNTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuSmallScaleDownTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuSmallScaleDownTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1382,7 +1382,7 @@ void TextTypeTransition::update( Int frame ) m_drawState = -1; if(frame < TEXTTYPETRANSITION_START || frame > TEXTTYPETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("TextTypeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("TextTypeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1521,7 +1521,7 @@ void CountUpTransition::update( Int frame ) m_drawState = -1; if(frame < COUNTUPTRANSITION_START || frame > COUNTUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("CountUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("CountUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1638,7 +1638,7 @@ void ScreenFadeTransition::update( Int frame ) m_drawState = -1; if(frame < SCREENFADETRANSITION_START || frame > SCREENFADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScreenFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScreenFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1731,7 +1731,7 @@ void ControlBarArrowTransition::update( Int frame ) m_drawState = -1; if(frame < CONTROLBARARROWTRANSITION_START || frame > CONTROLBARARROWTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ControlBarArrowTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ControlBarArrowTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1826,7 +1826,7 @@ void FullFadeTransition::update( Int frame ) m_drawState = -1; if(frame < FULLFADETRANSITION_START || frame > FULLFADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FullFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FullFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1927,7 +1927,7 @@ void TextOnFrameTransition::update( Int frame ) { if(frame < TEXTONFRAMETRANSITION_START || frame > TEXTONFRAMETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("TextOnFrameTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("TextOnFrameTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -2001,7 +2001,7 @@ void ReverseSoundTransition::update( Int frame ) { if(frame < REVERSESOUNDTRANSITION_START || frame > REVERSESOUNDTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ReverseSoundTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ReverseSoundTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index c95896fa9ef..38833f020cc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -5841,7 +5841,7 @@ void InGameUI::selectNextIdleWorker( void ) if(m_idleWorkers[index].empty()) { - DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str())); + DEBUG_CRASH(("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str())); return; } Object *selectThisObject = nullptr; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index c90804d231f..a8acc2c7e8a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3163,7 +3163,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEPLOY: #ifdef RTS_DEBUG - DEBUG_ASSERTCRASH(FALSE, ("unimplemented meta command MSG_META_DEPLOY !")); + DEBUG_CRASH(("unimplemented meta command MSG_META_DEPLOY !")); #endif /// @todo srj implement me disp = DESTROY_MESSAGE; @@ -3172,7 +3172,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_FOLLOW: #ifdef RTS_DEBUG - DEBUG_ASSERTCRASH(FALSE, ("unimplemented meta command MSG_META_FOLLOW !")); + DEBUG_CRASH(("unimplemented meta command MSG_META_FOLLOW !")); #endif /// @todo srj implement me disp = DESTROY_MESSAGE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 651512e4436..78f09e3564e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -148,7 +148,7 @@ void HotKeyManager::addHotKey( GameWindow *win, const AsciiString& keyIn) HotKeyMap::iterator it = m_hotKeyMap.find(key); if( it != m_hotKeyMap.end() ) { - DEBUG_ASSERTCRASH(FALSE,("Hotkey %s is already mapped to window %s, current window is %s", key.str(), it->second.m_win->winGetInstanceData()->m_decoratedNameString.str(), win->winGetInstanceData()->m_decoratedNameString.str())); + DEBUG_CRASH(("Hotkey %s is already mapped to window %s, current window is %s", key.str(), it->second.m_win->winGetInstanceData()->m_decoratedNameString.str(), win->winGetInstanceData()->m_decoratedNameString.str())); return; } HotKey newHK; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index f9b2863a2c3..60a97b85fad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -178,7 +178,7 @@ Mission *Campaign::getMission( AsciiString missionName ) return mission; ++it; } - DEBUG_ASSERTCRASH(FALSE, ("getMission couldn't find %s", missionName.str())); + DEBUG_CRASH(("getMission couldn't find %s", missionName.str())); return nullptr; } @@ -206,7 +206,7 @@ Mission *Campaign::getNextMission( Mission *current) return mission; ++it; } -// DEBUG_ASSERTCRASH(FALSE, ("GetNextMission couldn't find %s", current->m_nextMission.str())); +// DEBUG_CRASH(("GetNextMission couldn't find %s", current->m_nextMission.str())); return nullptr; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 952408584f0..82e7726fa79 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -1244,7 +1244,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget } else { - DEBUG_ASSERTCRASH(FALSE,("A OCL with ContainInsideSourceObject failed the contain and is killing the new object.")); + DEBUG_CRASH(("A OCL with ContainInsideSourceObject failed the contain and is killing the new object.")); // If we fail to contain it, we can't just leave it. Stillborn it. TheGameLogic->destroyObject(obj); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index 06edb9fa6b5..1ce0c4ef4df 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -1499,7 +1499,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con } - //DEBUG_ASSERTCRASH(FALSE,("Railroad could not find a position on the path!")); + //DEBUG_CRASH(("Railroad could not find a position on the path!")); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp index 86299d46ad2..5bf329c4b22 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp @@ -373,7 +373,7 @@ void DockUpdate::onExitReached( Object* docker ) // to continue moving to the exit position cause they are leaving after all // if( isDockOpen() ) - DEBUG_ASSERTCRASH( FALSE, ("Fiddle. Someone said goodbye to a dock when the dock didn't think it was talking to that someone.")); + DEBUG_CRASH( ("Fiddle. Someone said goodbye to a dock when the dock didn't think it was talking to that someone.")); } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index dcb20cc70cd..edc0d36e5b2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -4394,7 +4394,7 @@ void GameLogic::processProgressComplete(Int playerId) { if(playerId < 0 || playerId >= MAX_SLOTS) { - DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId)); + DEBUG_CRASH(("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId)); return; } if(m_progressComplete[playerId] == TRUE) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 08b6041b156..4dee95b55aa 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -1384,7 +1384,7 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo) if ((lastPlayerObject[index]-&playerObjects[index][0]) >= MAX_VISIBLE_OCCLUDED_PLAYER_OBJECTS) { - DEBUG_ASSERTCRASH(FALSE,("Exceeded Maximum Number of potentially occluded models")); + DEBUG_CRASH(("Exceeded Maximum Number of potentially occluded models")); continue; } From 314e068e77ad947fc699027867a9668019389e97 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 17:51:13 +0100 Subject: [PATCH 3/6] Changed GEN. --- .../Source/Common/INI/INIMultiplayer.cpp | 2 +- .../GameEngine/Source/Common/RTS/Player.cpp | 2 +- .../GameClient/GUI/ControlBar/ControlBar.cpp | 2 +- .../GUI/ControlBar/ControlBarResizer.cpp | 6 ++-- .../GUI/ControlBar/ControlBarScheme.cpp | 30 +++++++++---------- .../ControlBarPopupDescription.cpp | 2 +- .../GUI/GUICallbacks/ExtendedMessageBox.cpp | 2 +- .../GUI/GUICallbacks/Menus/QuitMenu.cpp | 2 +- .../GUI/GUICallbacks/Menus/ScoreScreen.cpp | 2 +- .../Menus/SkirmishGameOptionsMenu.cpp | 2 +- .../GUICallbacks/Menus/WOLBuddyOverlay.cpp | 2 +- .../GameClient/GUI/Gadget/GadgetListBox.cpp | 4 +-- .../GameClient/GUI/GameWindowManager.cpp | 2 +- .../GUI/GameWindowTransitionsStyles.cpp | 30 +++++++++---------- .../GameEngine/Source/GameClient/InGameUI.cpp | 2 +- .../GameClient/MessageStream/CommandXlat.cpp | 4 +-- .../GameClient/MessageStream/HotKey.cpp | 2 +- .../GameClient/System/CampaignManager.cpp | 4 +-- .../GameLogic/Object/ObjectCreationList.cpp | 2 +- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Object/Update/DockUpdate/DockUpdate.cpp | 2 +- .../Source/GameLogic/System/GameLogic.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DScene.cpp | 2 +- 23 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp index e2145deaeec..c5082372270 100644 --- a/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp +++ b/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp @@ -43,7 +43,7 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini ) // if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES ) { - DEBUG_ASSERTCRASH(false, ("Creating an override of MultiplayerSettings!")); + DEBUG_CRASH(("Creating an override of MultiplayerSettings!")); } } else diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 965b9d48fb9..2c69d693223 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -3361,7 +3361,7 @@ void Player::removeKindOfProductionCostChange( KindOfMaskType kindOf, Real perce } ++it; } - DEBUG_ASSERTCRASH(FALSE, ("removeKindOfProductionCostChange was called with kindOf=%d and percent=%f. We could not find the entry in the list with these variables. CLH.",kindOf, percent)); + DEBUG_CRASH(("removeKindOfProductionCostChange was called with kindOf=%d and percent=%f. We could not find the entry in the list with these variables. CLH.",kindOf, percent)); } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index bb3cb404ed8..0d9901ea2c1 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -2995,7 +2995,7 @@ void ControlBar::switchControlBarStage( ControlBarStages stage ) setHiddenControlBar(); break; default: - DEBUG_ASSERTCRASH(FALSE,("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage)); + DEBUG_CRASH(("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage)); } } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp index bc1a4b564c2..6d1804603d8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp @@ -117,7 +117,7 @@ ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::findResizerWindow")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::findResizerWindow")); it++; continue; } @@ -160,7 +160,7 @@ void ControlBarResizer::sizeWindowsDefault( void ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); it++; continue; } @@ -187,7 +187,7 @@ void ControlBarResizer::sizeWindowsAlt( void ) ResizerWindow *rWin = *it; if( !rWin ) { - DEBUG_ASSERTCRASH(FALSE,("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); + DEBUG_CRASH(("There's no resizerWindow in ControlBarResizer::sizeWindowsDefault")); it++; continue; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 9171033cf2f..e44b9630cf8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -658,7 +658,7 @@ void ControlBarScheme::addAnimation( ControlBarSchemeAnimation *schemeAnim ) { if( !schemeAnim ) { - DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme")); + DEBUG_CRASH(("Trying to add a null animation to the controlbarscheme")); return; } m_animations.push_back( schemeAnim ); @@ -671,13 +671,13 @@ void ControlBarScheme::addImage( ControlBarSchemeImage *schemeImage ) { if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme")); + DEBUG_CRASH(("Trying to add a null image to the controlbarscheme")); return; } if(schemeImage->m_layer < 0 || schemeImage->m_layer >= MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS) { - DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d", + DEBUG_CRASH(("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d", schemeImage->m_name.str(), schemeImage->m_layer, 0, MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS)); // bring the foobar to the front so we make it obvious that something's wrong schemeImage->m_layer = 0; @@ -700,7 +700,7 @@ void ControlBarScheme::updateAnim (ControlBarSchemeAnimation * anim) } default: { - DEBUG_ASSERTCRASH(FALSE,("We tried to animate but not animate function was found %d", anim->m_animType)); + DEBUG_CRASH(("We tried to animate but not animate function was found %d", anim->m_animType)); } } } @@ -717,7 +717,7 @@ void ControlBarScheme::update( void ) ControlBarSchemeAnimation *anim = *it; if( !anim ) { - DEBUG_ASSERTCRASH(FALSE,("THere's no Animation in the ControlBarSchemeAnimationList:m_animations")); + DEBUG_CRASH(("THere's no Animation in the ControlBarSchemeAnimationList:m_animations")); return; } updateAnim( anim ); @@ -739,7 +739,7 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset ) ControlBarSchemeImage *schemeImage = *it; if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("There is no ControlBarSchemeImage found in the m_layer list")); + DEBUG_CRASH(("There is no ControlBarSchemeImage found in the m_layer list")); it++; continue; } @@ -776,7 +776,7 @@ void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset ) ControlBarSchemeImage *schemeImage = *it; if( !schemeImage ) { - DEBUG_ASSERTCRASH(FALSE,("There is no ControlBarSchemeImage found in the m_layer list")); + DEBUG_CRASH(("There is no ControlBarSchemeImage found in the m_layer list")); it++; continue; } @@ -899,7 +899,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name ControlBarScheme *cbScheme = findControlBarScheme(name); if(cbScheme) { - DEBUG_ASSERTCRASH(false,("We're overwriting a previous control bar scheme %s",name.str())); + DEBUG_CRASH(("We're overwriting a previous control bar scheme %s",name.str())); cbScheme->reset(); cbScheme->m_name.set( name ); cbScheme->m_name.toLower(); @@ -910,7 +910,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name if( !cbScheme || name.isEmpty() ) { - DEBUG_ASSERTCRASH(FALSE,("Could not create controlbar %s", name.str())); + DEBUG_CRASH(("Could not create controlbar %s", name.str())); return nullptr; } @@ -937,7 +937,7 @@ ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString nam ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); return nullptr; } if(CBScheme->m_name.compareNoCase( name ) == 0) @@ -957,7 +957,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay ) ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); continue; } @@ -1011,7 +1011,7 @@ void ControlBarSchemeManager::init( void ) // } if( m_schemeList.empty() ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file")); return; } @@ -1033,7 +1033,7 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName) } else { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); m_currentScheme = nullptr; } if(m_currentScheme) @@ -1092,7 +1092,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); it++; continue; } @@ -1160,7 +1160,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p) ControlBarScheme *CBScheme = *it; if( !CBScheme ) { - DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); + DEBUG_CRASH(("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList")); it++; continue; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index e544a18f0c8..09132073d4a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -537,7 +537,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton, } else { - DEBUG_ASSERTCRASH(FALSE, ("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows.")); + DEBUG_CRASH(("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows.")); return; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp index ccd05dcd86a..ee2000cabae 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp @@ -123,7 +123,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne //we shouldn't have button OK and Yes on the same dialog if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) ) { - DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); + DEBUG_CRASH(("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); } //Position the OK button if we have one diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index e9d1f7267c5..fb7323848de 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -373,7 +373,7 @@ void ToggleQuitMenu() // load the quit menu from the layout file if needed if( quitMenuLayout == nullptr ) { - DEBUG_ASSERTCRASH(FALSE, ("Could not load a quit menu layout")); + DEBUG_CRASH(("Could not load a quit menu layout")); isVisible = FALSE; TheInGameUI->setQuitMenuVisible(FALSE); return; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 054c700271b..9c294162375 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -1187,7 +1187,7 @@ void populatePlayerInfo( Player *player, Int pos) ScoreKeeper *scoreKpr = player->getScoreKeeper(); if(!scoreKpr) { - DEBUG_ASSERTCRASH(FALSE,("Player %s does not have a scoreKeeper", player->getPlayerDisplayName().str())); + DEBUG_CRASH(("Player %s does not have a scoreKeeper", player->getPlayerDisplayName().str())); return; } AsciiString winName; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 209a93b81a1..067e109897d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -738,7 +738,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition } else { - DEBUG_ASSERTCRASH(FALSE,("positionStartSpots:: someone messed with the map cash. We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str())); + DEBUG_CRASH(("positionStartSpots:: someone messed with the map cash. We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str())); } } // hide the rest diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index 0b5efc26d29..0df35bb63a0 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -188,7 +188,7 @@ void InitBuddyControls(Int type) case BUDDY_WINDOW_WELCOME_SCREEN: break; default: - DEBUG_ASSERTCRASH(FALSE, ("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either")); + DEBUG_CRASH(("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either")); } } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp index 5c71e3ce255..cd943ef7a47 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp @@ -344,7 +344,7 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column, if( column >= list->columns || row >= list->listLength ) { - DEBUG_ASSERTCRASH(false, ("Tried to add Image to Listbox at invalid position")); + DEBUG_CRASH(("Tried to add Image to Listbox at invalid position")); return -1; } @@ -447,7 +447,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game // make sure our params are good if( column >= list->columns || row >= list->listLength ) { - DEBUG_ASSERTCRASH(false, ("Tried to add text to Listbox at invalid position")); + DEBUG_CRASH(("Tried to add text to Listbox at invalid position")); return -1; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index 6dfe321585d..8fce9f1177e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -1704,7 +1704,7 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh //we shouldn't have button OK and Yes on the same dialog if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) ) { - DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); + DEBUG_CRASH(("Passed in MSG_BOX_OK and MSG_BOX_YES. Big No No.")); } //Position the OK button if we have one diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp index 877d067e21b..03485ad83e9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp @@ -113,7 +113,7 @@ void FlashTransition::update( Int frame ) m_drawState = -1; if(frame < FLASHTRANSITION_START || frame > FLASHTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FlashTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FlashTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -269,7 +269,7 @@ void ButtonFlashTransition::update( Int frame ) m_drawState = -1; if(frame < BUTTONFLASHTRANSITION_START || frame > BUTTONFLASHTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ButtonFlashTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ButtonFlashTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -642,7 +642,7 @@ void FadeTransition::update( Int frame ) m_drawState = -1; if(frame < FADETRANSITION_START || frame > FADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -785,7 +785,7 @@ void ScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < SCALEUPTRANSITION_START || frame > SCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -908,7 +908,7 @@ void ScoreScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < SCORESCALEUPTRANSITION_START || frame > SCORESCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScoreScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScoreScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1039,7 +1039,7 @@ void MainMenuScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUSCALEUPTRANSITION_START || frame > MAINMENUSCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1158,7 +1158,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUMEDIUMSCALEUPTRANSITION_START || frame > MAINMENUMEDIUMSCALEUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuMediumScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuMediumScaleUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1277,7 +1277,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame ) m_drawState = -1; if(frame < MAINMENUSMALLSCALEDOWNTRANSITION_START || frame > MAINMENUSMALLSCALEDOWNTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("MainMenuSmallScaleDownTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("MainMenuSmallScaleDownTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1382,7 +1382,7 @@ void TextTypeTransition::update( Int frame ) m_drawState = -1; if(frame < TEXTTYPETRANSITION_START || frame > TEXTTYPETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("TextTypeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("TextTypeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1521,7 +1521,7 @@ void CountUpTransition::update( Int frame ) m_drawState = -1; if(frame < COUNTUPTRANSITION_START || frame > COUNTUPTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("CountUpTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("CountUpTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1638,7 +1638,7 @@ void ScreenFadeTransition::update( Int frame ) m_drawState = -1; if(frame < SCREENFADETRANSITION_START || frame > SCREENFADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ScreenFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ScreenFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1731,7 +1731,7 @@ void ControlBarArrowTransition::update( Int frame ) m_drawState = -1; if(frame < CONTROLBARARROWTRANSITION_START || frame > CONTROLBARARROWTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ControlBarArrowTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ControlBarArrowTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1826,7 +1826,7 @@ void FullFadeTransition::update( Int frame ) m_drawState = -1; if(frame < FULLFADETRANSITION_START || frame > FULLFADETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("FullFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("FullFadeTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -1927,7 +1927,7 @@ void TextOnFrameTransition::update( Int frame ) { if(frame < TEXTONFRAMETRANSITION_START || frame > TEXTONFRAMETRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("TextOnFrameTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("TextOnFrameTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { @@ -2001,7 +2001,7 @@ void ReverseSoundTransition::update( Int frame ) { if(frame < REVERSESOUNDTRANSITION_START || frame > REVERSESOUNDTRANSITION_END) { - DEBUG_ASSERTCRASH(FALSE, ("ReverseSoundTransition::update - Frame is out of the range the this update can handle %d", frame)); + DEBUG_CRASH(("ReverseSoundTransition::update - Frame is out of the range the this update can handle %d", frame)); return; } switch (frame) { diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index d9f53bbcb01..3b652a6026b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -5668,7 +5668,7 @@ void InGameUI::selectNextIdleWorker( void ) if(m_idleWorkers[index].empty()) { - DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str())); + DEBUG_CRASH(("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str())); return; } Object *selectThisObject = nullptr; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 42932540419..19ecd7aab25 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3017,7 +3017,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEPLOY: #ifdef RTS_DEBUG - DEBUG_ASSERTCRASH(FALSE, ("unimplemented meta command MSG_META_DEPLOY !")); + DEBUG_CRASH(("unimplemented meta command MSG_META_DEPLOY !")); #endif /// @todo srj implement me disp = DESTROY_MESSAGE; @@ -3026,7 +3026,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_FOLLOW: #ifdef RTS_DEBUG - DEBUG_ASSERTCRASH(FALSE, ("unimplemented meta command MSG_META_FOLLOW !")); + DEBUG_CRASH(("unimplemented meta command MSG_META_FOLLOW !")); #endif /// @todo srj implement me disp = DESTROY_MESSAGE; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index ba15e942dc9..a1b6afcf5d9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -148,7 +148,7 @@ void HotKeyManager::addHotKey( GameWindow *win, const AsciiString& keyIn) HotKeyMap::iterator it = m_hotKeyMap.find(key); if( it != m_hotKeyMap.end() ) { - DEBUG_ASSERTCRASH(FALSE,("Hotkey %s is already mapped to window %s, current window is %s", key.str(), it->second.m_win->winGetInstanceData()->m_decoratedNameString.str(), win->winGetInstanceData()->m_decoratedNameString.str())); + DEBUG_CRASH(("Hotkey %s is already mapped to window %s, current window is %s", key.str(), it->second.m_win->winGetInstanceData()->m_decoratedNameString.str(), win->winGetInstanceData()->m_decoratedNameString.str())); return; } HotKey newHK; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index 0f981f3e540..e34a44bbc06 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -171,7 +171,7 @@ Mission *Campaign::getMission( AsciiString missionName ) return mission; ++it; } - DEBUG_ASSERTCRASH(FALSE, ("getMission couldn't find %s", missionName.str())); + DEBUG_CRASH(("getMission couldn't find %s", missionName.str())); return nullptr; } @@ -199,7 +199,7 @@ Mission *Campaign::getNextMission( Mission *current) return mission; ++it; } -// DEBUG_ASSERTCRASH(FALSE, ("GetNextMission couldn't find %s", current->m_nextMission.str())); +// DEBUG_CRASH(("GetNextMission couldn't find %s", current->m_nextMission.str())); return nullptr; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index da1164dd2ff..8875411be31 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -1206,7 +1206,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget } else { - DEBUG_ASSERTCRASH(FALSE,("A OCL with ContainInsideSourceObject failed the contain and is killing the new object.")); + DEBUG_CRASH(("A OCL with ContainInsideSourceObject failed the contain and is killing the new object.")); // If we fail to contain it, we can't just leave it. Stillborn it. TheGameLogic->destroyObject(obj); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index fe43f98b5f3..61c1cc88bab 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -1454,7 +1454,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con } - //DEBUG_ASSERTCRASH(FALSE,("Railroad could not find a position on the path!")); + //DEBUG_CRASH(("Railroad could not find a position on the path!")); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp index bead95c4499..5c69b8f7121 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp @@ -373,7 +373,7 @@ void DockUpdate::onExitReached( Object* docker ) // to continue moving to the exit position cause they are leaving after all // if( isDockOpen() ) - DEBUG_ASSERTCRASH( FALSE, ("Fiddle. Someone said goodbye to a dock when the dock didn't think it was talking to that someone.")); + DEBUG_CRASH( ("Fiddle. Someone said goodbye to a dock when the dock didn't think it was talking to that someone.")); } } diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index ed6339f87e6..1a0c3ed0134 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -3835,7 +3835,7 @@ void GameLogic::processProgressComplete(Int playerId) { if(playerId < 0 || playerId >= MAX_SLOTS) { - DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId)); + DEBUG_CRASH(("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId)); return; } if(m_progressComplete[playerId] == TRUE) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 2d39c14e1f0..134927c8853 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -1337,7 +1337,7 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo) if ((lastPlayerObject[index]-&playerObjects[index][0]) >= MAX_VISIBLE_OCCLUDED_PLAYER_OBJECTS) { - DEBUG_ASSERTCRASH(FALSE,("Exceeded Maximum Number of potentially occluded models")); + DEBUG_CRASH(("Exceeded Maximum Number of potentially occluded models")); continue; } From 1b28e4f39b45bc5db061a91b2a91f4baafc192d9 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 19:32:52 +0100 Subject: [PATCH 4/6] Changed core. --- Core/GameEngine/Source/Common/INI/INI.cpp | 14 +++++++------- Core/GameEngine/Source/Common/System/Radar.cpp | 2 +- .../GameClient/Drawable/Draw/W3DLaserDraw.cpp | 2 +- Core/Tools/ImagePacker/Source/ImagePacker.cpp | 2 +- Core/Tools/ImagePacker/Source/TexturePage.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Core/GameEngine/Source/Common/INI/INI.cpp b/Core/GameEngine/Source/Common/INI/INI.cpp index 7ddccff7e1a..8732e616b20 100644 --- a/Core/GameEngine/Source/Common/INI/INI.cpp +++ b/Core/GameEngine/Source/Common/INI/INI.cpp @@ -436,7 +436,7 @@ UnsignedInt INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer ) } else { - DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'", + DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Unknown block '%s'", getLineNum(), getFilename().str(), token ) ); throw INI_UNKNOWN_TOKEN; } @@ -524,7 +524,7 @@ void INI::readLine( void ) // check for at the max if ( p == m_buffer+INI_MAX_CHARS_PER_LINE ) { - DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE", INI_MAX_CHARS_PER_LINE) ); + DEBUG_CRASH( ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE", INI_MAX_CHARS_PER_LINE) ); } } @@ -1524,7 +1524,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList if( what == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!") ); + DEBUG_CRASH( ("INI::initFromINI - Invalid parameters supplied!") ); throw INI_INVALID_PARAMS; } @@ -1578,7 +1578,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList if (!found) { - DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'", + DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'", INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) ); } @@ -1591,7 +1591,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList { done = TRUE; - DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'. Missing '%s' token", + DEBUG_CRASH( ("Error parsing block '%s', in INI file '%s'. Missing '%s' token", m_curBlockStart, getFilename().str(), m_blockEndToken) ); throw INI_MISSING_END_TOKEN; @@ -1667,7 +1667,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList if( nameList == nullptr || nameList[ 0 ] == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list") ); + DEBUG_CRASH( ("INTERNAL ERROR! scanIndexList, invalid name list") ); throw INI_INVALID_NAME_LIST; } @@ -1692,7 +1692,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList { if( lookupList == nullptr || lookupList[ 0 ].name == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list") ); + DEBUG_CRASH( ("INTERNAL ERROR! scanLookupList, invalid name list") ); throw INI_INVALID_NAME_LIST; } diff --git a/Core/GameEngine/Source/Common/System/Radar.cpp b/Core/GameEngine/Source/Common/System/Radar.cpp index 5db41793d41..f69ebaa9ee5 100644 --- a/Core/GameEngine/Source/Common/System/Radar.cpp +++ b/Core/GameEngine/Source/Common/System/Radar.cpp @@ -478,7 +478,7 @@ Bool Radar::removeObject( Object *obj ) return TRUE; else { - DEBUG_ASSERTCRASH( 0, ("Radar: Tried to remove object '%s' which was not found", + DEBUG_CRASH( ("Radar: Tried to remove object '%s' which was not found", obj->getTemplate()->getName().str()) ); return FALSE; } diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp index f376ff843f3..071b24cc803 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp @@ -259,7 +259,7 @@ void W3DLaserDraw::doDrawModule(const Matrix3D* transformMtx) LaserUpdate *update = (LaserUpdate*)draw->findClientUpdateModule( key_LaserUpdate ); if( !update ) { - DEBUG_ASSERTCRASH( 0, ("W3DLaserDraw::doDrawModule() expects its owner drawable %s to have a ClientUpdate = LaserUpdate module.", draw->getTemplate()->getName().str() )); + DEBUG_CRASH( ("W3DLaserDraw::doDrawModule() expects its owner drawable %s to have a ClientUpdate = LaserUpdate module.", draw->getTemplate()->getName().str() )); return; } diff --git a/Core/Tools/ImagePacker/Source/ImagePacker.cpp b/Core/Tools/ImagePacker/Source/ImagePacker.cpp index fb180b69806..3bf47871c9a 100644 --- a/Core/Tools/ImagePacker/Source/ImagePacker.cpp +++ b/Core/Tools/ImagePacker/Source/ImagePacker.cpp @@ -251,7 +251,7 @@ Bool ImagePacker::packImages( void ) char buffer[ _MAX_PATH ]; sprintf( buffer, "Unable to add image '%s' to a brand new page!\n", image->m_path ); - DEBUG_ASSERTCRASH( 0, (buffer) ); + DEBUG_CRASH( (buffer) ); MessageBox( nullptr, buffer, "Internal Error", MB_OK | MB_ICONERROR ); return FALSE; diff --git a/Core/Tools/ImagePacker/Source/TexturePage.cpp b/Core/Tools/ImagePacker/Source/TexturePage.cpp index a2520e4c92f..c3ffadf843f 100644 --- a/Core/Tools/ImagePacker/Source/TexturePage.cpp +++ b/Core/Tools/ImagePacker/Source/TexturePage.cpp @@ -524,7 +524,7 @@ Bool TexturePage::addImageData( Byte *destBuffer, char buffer[ _MAX_PATH + 32 ]; sprintf( buffer, "Error loading source file '%s'\n", image->m_path ); - DEBUG_ASSERTCRASH( 0, (buffer) ); + DEBUG_CRASH( (buffer) ); MessageBox( nullptr, buffer, "Cannot Load Source File", MB_OK | MB_ICONERROR ); return FALSE; From 43ddad946e36f8b86e223a614a3738c8816e4630 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 19:33:43 +0100 Subject: [PATCH 5/6] Changed ZH. --- .../GameEngine/Source/Common/System/BuildAssistant.cpp | 2 +- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 8 ++++---- .../GameClient/GUI/ControlBar/ControlBarCommand.cpp | 2 +- .../GUI/ControlBar/ControlBarCommandProcessing.cpp | 10 +++++----- .../Source/GameClient/GUI/Gadget/GadgetComboBox.cpp | 2 +- .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 +- .../Source/GameClient/MessageStream/CommandXlat.cpp | 2 +- .../GameClient/MessageStream/GUICommandTranslator.cpp | 2 +- .../GameLogic/Object/Create/GrantUpgradeCreate.cpp | 4 ++-- .../Source/GameLogic/Object/Die/UpgradeDie.cpp | 2 +- .../Source/GameLogic/Object/Update/AIUpdate.cpp | 10 +++++----- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 2 +- .../GameLogic/Object/Update/ProductionUpdate.cpp | 2 +- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 4 ++-- .../Source/GameLogic/System/GameLogicDispatch.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DDisplay.cpp | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp index 5e4bf14c004..0e8cd1c3716 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp @@ -583,7 +583,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build, else { - DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'", + DEBUG_CRASH( ("iterateFootprint: Undefined geometry '%d' for '%s'", build->getTemplateGeometryInfo().getGeomType(), build->getName().str()) ); return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index aaa4911cb96..a09eb039dea 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -2379,7 +2379,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw ) default: { - DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'", context) ); + DEBUG_CRASH( ("ControlBar::switchToContext, unknown context '%d'", context) ); break; } @@ -2440,7 +2440,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com if( button->winGetInputFunc() != GadgetPushButtonInput ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button") ); + DEBUG_CRASH( ("setControlCommand: Window is not a button") ); return; } @@ -2449,7 +2449,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com if( commandButton == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: null commandButton passed in") ); + DEBUG_CRASH( ("setControlCommand: null commandButton passed in") ); return; } @@ -2551,7 +2551,7 @@ void ControlBar::setControlCommand( const AsciiString& buttonWindowName, GameWin if( win == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) ); + DEBUG_CRASH( ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) ); return; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index 30e5067879e..61ccef7a168 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp @@ -93,7 +93,7 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData ) if( data->currIndex > data->maxIndex ) { - DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'", + DEBUG_CRASH( ("There is not enough GUI slots to hold the # of items inside a '%s'", data->transport->getTemplate()->getName().str()) ); return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp index 1f404271984..487c922a938 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp @@ -425,7 +425,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, } else if (cmt != CANMAKE_OK) { - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit", + DEBUG_CRASH( ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit", whatToBuild->getName().str(), factory->getTemplate()->getName().str()) ); break; @@ -438,7 +438,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( pu == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producing units", + DEBUG_CRASH( ("Cannot create '%s' because the factory object '%s' is not capable of producing units", whatToBuild->getName().str(), factory->getTemplate()->getName().str()) ); break; @@ -472,7 +472,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( i == MAX_BUILD_QUEUE_BUTTONS ) { - DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") ); + DEBUG_CRASH( ("Control not found in build queue data") ); break; } @@ -596,7 +596,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( i == MAX_BUILD_QUEUE_BUTTONS ) { - DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") ); + DEBUG_CRASH( ("Control not found in build queue data") ); break; } @@ -901,7 +901,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, //--------------------------------------------------------------------------------------------- default: - DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'", commandButton->getCommandType()) ); + DEBUG_CRASH( ("Unknown command '%d'", commandButton->getCommandType()) ); return CBC_COMMAND_NOT_USED; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp index 627ff843de6..be4a4cc1932 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp @@ -395,7 +395,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg, GadgetListBoxGetSelected(comboData->listBox, (Int *)mData2); else { - DEBUG_ASSERTCRASH(0,("We don't have a listbox as part of the combo box")); + DEBUG_CRASH(("We don't have a listbox as part of the combo box")); *(Int *)mData2 = -1; } break; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 38833f020cc..4cc38ed6569 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -3191,7 +3191,7 @@ void InGameUI::setGUICommand( const CommandButton *command ) if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_TARGET ) == FALSE ) { - DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction", + DEBUG_CRASH( ("setGUICommand: Command '%s' does not need additional user interaction", command->getName().str()) ); m_pendingGUICommand = nullptr; m_mouseMode = MOUSEMODE_DEFAULT; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index a8acc2c7e8a..b8b3e78001e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -1132,7 +1132,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target, msgType = GameMessage::MSG_DO_ATTACK_OBJECT; break; default: - DEBUG_ASSERTCRASH( 0, ("issueAttackCommand was passed in a GUICommandType type that isn't supported yet...") ); + DEBUG_CRASH( ("issueAttackCommand was passed in a GUICommandType type that isn't supported yet...") ); return msgType; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp index b97895d35ac..d37d7f51dec 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp @@ -191,7 +191,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC //This could be legit now -- think of firing a self destruct weapon //----------------------------------------------------------------- - //DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'", + //DEBUG_CRASH( ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'", // command->m_name.str()) ); //return COMMAND_COMPLETE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp index 9c566821e6c..b85613f8c22 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp @@ -91,7 +91,7 @@ void GrantUpgradeCreate::onCreate( void ) const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName ); if( !upgradeTemplate ) { - DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); + DEBUG_CRASH( ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); return; } @@ -124,7 +124,7 @@ void GrantUpgradeCreate::onBuildComplete( void ) const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName ); if( !upgradeTemplate ) { - DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); + DEBUG_CRASH( ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); return; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp index f94b69a5db0..d81b3b308f9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp @@ -76,7 +76,7 @@ void UpgradeDie::onDie( const DamageInfo *damageInfo ) } else { - DEBUG_ASSERTCRASH( 0, ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s", + DEBUG_CRASH( ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s", getObject()->getTemplate()->getName().str(), getUpgradeDieModuleData()->m_upgradeName.str(), producer->getTemplate()->getName().str(), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp index 469e405a3fa..796577e4732 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp @@ -4897,12 +4897,12 @@ void AIUpdateInterface::privateCommandButton( const CommandButton *commandButton default: if( owner->getName().isNotEmpty() ) { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButton() -- unit %s ('%s'), command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButton() -- unit %s ('%s'), command %s not implemented.", owner->getTemplate()->getName().str(), owner->getName().str(), commandButton->getTextLabel().str() ) ); } else { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButton() -- unit %s, command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButton() -- unit %s, command %s not implemented.", owner->getTemplate()->getName().str(), commandButton->getTextLabel().str() ) ); } } @@ -4950,12 +4950,12 @@ void AIUpdateInterface::privateCommandButtonPosition( const CommandButton *comma default: if( owner->getName().isNotEmpty() ) { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s ('%s'), command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s ('%s'), command %s not implemented.", owner->getTemplate()->getName().str(), owner->getName().str(), commandButton->getTextLabel().str() ) ); } else { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s, command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s, command %s not implemented.", owner->getTemplate()->getName().str(), commandButton->getTextLabel().str() ) ); } break; @@ -5017,7 +5017,7 @@ void AIUpdateInterface::privateCommandButtonObject( const CommandButton *command targetNickname.format( "('%s')", obj->getName().str() ); } - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s %s, command %s at unit %s %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s %s, command %s at unit %s %s not implemented.", myName.str(), myNickname.str(), commandButton->getTextLabel().str(), targetName.str(), targetNickname.str() ) ); } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index b3424e0a466..eee98cc06cc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -851,7 +851,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often const WeaponTemplate *weaponTemplate = ai->getData()->m_visiblePayloadWeaponTemplate; if( !weaponTemplate ) { - DEBUG_ASSERTCRASH( 0, ("%s tried to fire missile %s via DeliverPayload, and is missing required weapon template in ObjectCreationList.ini entry.", + DEBUG_CRASH( ("%s tried to fire missile %s via DeliverPayload, and is missing required weapon template in ObjectCreationList.ini entry.", owner->getTemplate()->getName().str(), payload->getTemplate()->getName().str() ) ); break; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 178087a1490..c02192fec8b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -876,7 +876,7 @@ UpdateSleepTime ProductionUpdate::update( void ) { // there is no exit interface, this is an error - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'", + DEBUG_CRASH( ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'", production->m_objectToProduce->getName().str(), creationBuilding->getTemplate()->getName().str()) ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index eb17ff3ea41..e521ffa50f0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -1350,7 +1350,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect() StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate ); if( !update ) { - DEBUG_ASSERTCRASH( 0, + DEBUG_CRASH( ("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.", object->getTemplate()->getName().str(), charge->getTemplate()->getName().str(), @@ -1575,7 +1575,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect() StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate ); if( !update ) { - DEBUG_ASSERTCRASH( 0, + DEBUG_CRASH( ("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.", object->getTemplate()->getName().str(), charge->getTemplate()->getName().str() ) ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index a3a2c757854..94af91f6590 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1381,7 +1381,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) if( pu == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface", + DEBUG_CRASH( ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface", producer->getTemplate()->getName().str()) ); break; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index a2a6e45cd2d..c45a9f1d917 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -778,7 +778,7 @@ void W3DDisplay::init( void ) WW3D::Shutdown(); WWMath::Shutdown(); throw ERROR_INVALID_D3D; //failed to initialize. User probably doesn't have DX 8.1 - DEBUG_ASSERTCRASH( 0, ("Unable to set render device") ); + DEBUG_CRASH( ("Unable to set render device") ); return; } From cd5a821c541b955efce5b5fab5f30f1bd5f557a5 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 23 Feb 2026 19:34:38 +0100 Subject: [PATCH 6/6] Changed GEN. --- .../GameEngine/Source/Common/System/BuildAssistant.cpp | 2 +- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 8 ++++---- .../GameClient/GUI/ControlBar/ControlBarCommand.cpp | 2 +- .../GUI/ControlBar/ControlBarCommandProcessing.cpp | 10 +++++----- .../Source/GameClient/GUI/Gadget/GadgetComboBox.cpp | 2 +- .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 +- .../Source/GameClient/MessageStream/CommandXlat.cpp | 2 +- .../GameClient/MessageStream/GUICommandTranslator.cpp | 2 +- .../GameLogic/Object/Create/GrantUpgradeCreate.cpp | 4 ++-- .../Source/GameLogic/Object/Die/UpgradeDie.cpp | 2 +- .../Source/GameLogic/Object/Update/AIUpdate.cpp | 10 +++++----- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 2 +- .../GameLogic/Object/Update/ProductionUpdate.cpp | 2 +- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 4 ++-- .../Source/GameLogic/System/GameLogicDispatch.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DDisplay.cpp | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp index f3363d35613..ed533c2179e 100644 --- a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp @@ -583,7 +583,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build, else { - DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'", + DEBUG_CRASH( ("iterateFootprint: Undefined geometry '%d' for '%s'", build->getTemplateGeometryInfo().getGeomType(), build->getName().str()) ); return; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 0d9901ea2c1..a379a01439f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -2354,7 +2354,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw ) default: { - DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'", context) ); + DEBUG_CRASH( ("ControlBar::switchToContext, unknown context '%d'", context) ); break; } @@ -2415,7 +2415,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com if( button->winGetInputFunc() != GadgetPushButtonInput ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button") ); + DEBUG_CRASH( ("setControlCommand: Window is not a button") ); return; } @@ -2424,7 +2424,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com if( commandButton == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: null commandButton passed in") ); + DEBUG_CRASH( ("setControlCommand: null commandButton passed in") ); return; } @@ -2526,7 +2526,7 @@ void ControlBar::setControlCommand( const AsciiString& buttonWindowName, GameWin if( win == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) ); + DEBUG_CRASH( ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) ); return; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index e49697e6b8a..d2755500274 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp @@ -92,7 +92,7 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData ) if( data->currIndex > data->maxIndex ) { - DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'", + DEBUG_CRASH( ("There is not enough GUI slots to hold the # of items inside a '%s'", data->transport->getTemplate()->getName().str()) ); return; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp index 359d837ebfa..d42df100b2d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp @@ -292,7 +292,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, } else if (cmt != CANMAKE_OK) { - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit", + DEBUG_CRASH( ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit", whatToBuild->getName().str(), factory->getTemplate()->getName().str()) ); break; @@ -305,7 +305,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( pu == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producing units", + DEBUG_CRASH( ("Cannot create '%s' because the factory object '%s' is not capable of producing units", whatToBuild->getName().str(), factory->getTemplate()->getName().str()) ); break; @@ -339,7 +339,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( i == MAX_BUILD_QUEUE_BUTTONS ) { - DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") ); + DEBUG_CRASH( ("Control not found in build queue data") ); break; } @@ -463,7 +463,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, if( i == MAX_BUILD_QUEUE_BUTTONS ) { - DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") ); + DEBUG_CRASH( ("Control not found in build queue data") ); break; } @@ -731,7 +731,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control, //--------------------------------------------------------------------------------------------- default: - DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'", commandButton->getCommandType()) ); + DEBUG_CRASH( ("Unknown command '%d'", commandButton->getCommandType()) ); return CBC_COMMAND_NOT_USED; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp index 7913b610757..96769530207 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp @@ -395,7 +395,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg, GadgetListBoxGetSelected(comboData->listBox, (Int *)mData2); else { - DEBUG_ASSERTCRASH(0,("We don't have a listbox as part of the combo box")); + DEBUG_CRASH(("We don't have a listbox as part of the combo box")); *(Int *)mData2 = -1; } break; diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index 3b652a6026b..4a90702f645 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -3111,7 +3111,7 @@ void InGameUI::setGUICommand( const CommandButton *command ) if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_TARGET ) == FALSE ) { - DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction", + DEBUG_CRASH( ("setGUICommand: Command '%s' does not need additional user interaction", command->getName().str()) ); m_pendingGUICommand = nullptr; m_mouseMode = MOUSEMODE_DEFAULT; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 19ecd7aab25..e59897550b3 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -1074,7 +1074,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target, msgType = GameMessage::MSG_DO_ATTACK_OBJECT; break; default: - DEBUG_ASSERTCRASH( 0, ("issueAttackCommand was passed in a GUICommandType type that isn't supported yet...") ); + DEBUG_CRASH( ("issueAttackCommand was passed in a GUICommandType type that isn't supported yet...") ); return msgType; } diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp index 673237bb23f..3fa40e099fe 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp @@ -191,7 +191,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC //This could be legit now -- think of firing a self destruct weapon //----------------------------------------------------------------- - //DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'", + //DEBUG_CRASH( ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'", // command->m_name.str()) ); //return COMMAND_COMPLETE; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp index 9eb5a639b41..0e0f31171b4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp @@ -91,7 +91,7 @@ void GrantUpgradeCreate::onCreate( void ) const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName ); if( !upgradeTemplate ) { - DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); + DEBUG_CRASH( ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); return; } @@ -122,7 +122,7 @@ void GrantUpgradeCreate::onBuildComplete( void ) const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName ); if( !upgradeTemplate ) { - DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); + DEBUG_CRASH( ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) ); return; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp index 737dd9cb2d9..cccd003766f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp @@ -76,7 +76,7 @@ void UpgradeDie::onDie( const DamageInfo *damageInfo ) } else { - DEBUG_ASSERTCRASH( 0, ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s", + DEBUG_CRASH( ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s", getObject()->getTemplate()->getName().str(), getUpgradeDieModuleData()->m_upgradeName.str(), producer->getTemplate()->getName().str(), diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp index e170239d8e8..5651c4c7c62 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp @@ -4649,12 +4649,12 @@ void AIUpdateInterface::privateCommandButton( const CommandButton *commandButton default: if( owner->getName().isNotEmpty() ) { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButton() -- unit %s ('%s'), command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButton() -- unit %s ('%s'), command %s not implemented.", owner->getTemplate()->getName().str(), owner->getName().str(), commandButton->getTextLabel().str() ) ); } else { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButton() -- unit %s, command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButton() -- unit %s, command %s not implemented.", owner->getTemplate()->getName().str(), commandButton->getTextLabel().str() ) ); } } @@ -4702,12 +4702,12 @@ void AIUpdateInterface::privateCommandButtonPosition( const CommandButton *comma default: if( owner->getName().isNotEmpty() ) { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s ('%s'), command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s ('%s'), command %s not implemented.", owner->getTemplate()->getName().str(), owner->getName().str(), commandButton->getTextLabel().str() ) ); } else { - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s, command %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s, command %s not implemented.", owner->getTemplate()->getName().str(), commandButton->getTextLabel().str() ) ); } break; @@ -4769,7 +4769,7 @@ void AIUpdateInterface::privateCommandButtonObject( const CommandButton *command targetNickname.format( "('%s')", obj->getName().str() ); } - DEBUG_ASSERTCRASH( 0, ("AIUpdate::privateCommandButtonPosition() -- unit %s %s, command %s at unit %s %s not implemented.", + DEBUG_CRASH( ("AIUpdate::privateCommandButtonPosition() -- unit %s %s, command %s at unit %s %s not implemented.", myName.str(), myNickname.str(), commandButton->getTextLabel().str(), targetName.str(), targetNickname.str() ) ); } } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index 29f62d3fa3e..2c8d141aba5 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -825,7 +825,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often const WeaponTemplate *weaponTemplate = ai->getData()->m_visiblePayloadWeaponTemplate; if( !weaponTemplate ) { - DEBUG_ASSERTCRASH( 0, ("%s tried to fire missile %s via DeliverPayload, and is missing required weapon template in ObjectCreationList.ini entry.", + DEBUG_CRASH( ("%s tried to fire missile %s via DeliverPayload, and is missing required weapon template in ObjectCreationList.ini entry.", owner->getTemplate()->getName().str(), payload->getTemplate()->getName().str() ) ); break; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index bb338ab0155..5eb29d8afec 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -873,7 +873,7 @@ UpdateSleepTime ProductionUpdate::update( void ) { // there is no exit interface, this is an error - DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'", + DEBUG_CRASH( ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'", production->m_objectToProduce->getName().str(), creationBuilding->getTemplate()->getName().str()) ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index bd1ad198263..8551f1a6884 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -1213,7 +1213,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect() StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate ); if( !update ) { - DEBUG_ASSERTCRASH( 0, + DEBUG_CRASH( ("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.", object->getTemplate()->getName().str(), charge->getTemplate()->getName().str(), @@ -1419,7 +1419,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect() StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate ); if( !update ) { - DEBUG_ASSERTCRASH( 0, + DEBUG_CRASH( ("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.", object->getTemplate()->getName().str(), charge->getTemplate()->getName().str() ) ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index ef4e62d534e..bf155534481 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1353,7 +1353,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) if( pu == nullptr ) { - DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface", + DEBUG_CRASH( ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface", producer->getTemplate()->getName().str()) ); break; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index d88ce9e7bd2..f8a37d226bd 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -727,7 +727,7 @@ void W3DDisplay::init( void ) WW3D::Shutdown(); WWMath::Shutdown(); throw ERROR_INVALID_D3D; //failed to initialize. User probably doesn't have DX 8.1 - DEBUG_ASSERTCRASH( 0, ("Unable to set render device") ); + DEBUG_CRASH( ("Unable to set render device") ); return; }