Skip to content

Commit 37eab16

Browse files
committed
[GEN][ZH] Remove trailing LF from DEBUG_ASSERTLOG strings with script (#1232)
1 parent 2264f35 commit 37eab16

File tree

66 files changed

+133
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+133
-133
lines changed

Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
10981098
//-------------------------------------------------------------------------------------------------
10991099
void AudioManager::loseFocus( void )
11001100
{
1101-
DEBUG_ASSERTLOG(m_savedValues == NULL, ("AudioManager::loseFocus() - leak - jkmcd\n"));
1101+
DEBUG_ASSERTLOG(m_savedValues == NULL, ("AudioManager::loseFocus() - leak - jkmcd"));
11021102
// In this case, make all the audio go silent.
11031103
m_savedValues = NEW Real[NUM_VOLUME_TYPES];
11041104
m_savedValues[0] = m_systemMusicVolume;

Generals/Code/GameEngine/Source/Common/RandomValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ Real GameClientRandomVariable::getValue( void ) const
374374
switch( m_type )
375375
{
376376
case CONSTANT:
377-
DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameClientRandomVariable\n"));
377+
DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameClientRandomVariable"));
378378
if (m_low == m_high) {
379379
return m_low;
380380
} // else return as though a UNIFORM.

Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void ArchiveFileSystem::loadMods() {
189189
Bool ret =
190190
#endif
191191
loadBigFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
192-
DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!\n", TheGlobalData->m_modDir.str()));
192+
DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!", TheGlobalData->m_modDir.str()));
193193
}
194194
}
195195

Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
11961196
if( commandSet == NULL )
11971197
{
11981198

1199-
DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined\n",
1199+
DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined",
12001200
whatToBuild->getName().str(),
12011201
builder->getTemplate()->getName().str(),
12021202
builder->getTemplate()->getName().str()) );

Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ void ThingTemplate::validateAudio()
924924

925925
#define AUDIO_TEST(y) \
926926
if (!get##y()->getEventName().isEmpty() && get##y()->getEventName().compareNoCase("NoSound") != 0) { \
927-
DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)\n", #y, getName().str(), get##y()->getEventName().str())); \
927+
DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)", #y, getName().str(), get##y()->getEventName().str())); \
928928
}
929929

930930
AUDIO_TEST(VoiceSelect)

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
11641164

11651165
// changed this to Log rather than Crash, because this can legitimately happen now for
11661166
// dozers and workers with mine-clearing stuff... (srj)
1167-
//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.\n",
1167+
//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.",
11681168
// obj->getTemplate()->getName().str(), command->getName().str(), (Int)command->getWeaponSlot() ) );
11691169

11701170
UnsignedInt now = TheGameLogic->getFrame();

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static GameWindow* findWindow(GameWindow *parent, AsciiString baseWindow, AsciiS
730730
AsciiString fullPath;
731731
fullPath.format("%s:%s", baseWindow.str(), gadgetName.str());
732732
GameWindow *res = TheWindowManager->winGetWindowFromId(parent, NAMEKEY(fullPath));
733-
DEBUG_ASSERTLOG(res, ("Cannot find window %s\n", fullPath.str()));
733+
DEBUG_ASSERTLOG(res, ("Cannot find window %s", fullPath.str()));
734734
return res;
735735
}
736736

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,9 +1857,9 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
18571857
#ifdef DEBUG_LOGGING
18581858
UnsignedShort newPort = game->getConstSlot(i)->getPort();
18591859
UnsignedInt newIP = game->getConstSlot(i)->getIP();
1860-
DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)\n",
1860+
DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)",
18611861
i, ips[i], newIP));
1862-
DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)\n",
1862+
DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)",
18631863
i, ports[i], newPort));
18641864
#endif
18651865
game->getSlot(i)->setPort(ports[i]);

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ const Image* LookupSmallRankImage(Int side, Int rankPoints)
410410
AsciiString fullImageName;
411411
fullImageName.format("%s-%s", rankNames[rank], sideStr.str());
412412
const Image *img = TheMappedImageCollection->findImageByName(fullImageName);
413-
DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!\n", fullImageName.str()));
413+
DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!", fullImageName.str()));
414414
return img;
415415
}
416416

Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2229,7 +2229,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
22292229
/// @TODO: Don't do this type cast!
22302230
index = (Int) TheWindowManager->winSendSystemMsg( listbox, GLM_ADD_ENTRY, (WindowMsgData)&addInfo, color );
22312231

2232-
//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d\n",
2232+
//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d",
22332233
//index, oldBottomIndex, newEntryOffset, index, oldBottomIndex, newEntryOffset, wasFull, GadgetListBoxIsFull(listbox), listData->listLength, listData->endPos));
22342234
if(listData->scrollIfAtEnd && index - oldBottomIndex == newEntryOffset && GadgetListBoxIsFull(listbox))
22352235
{

0 commit comments

Comments
 (0)