Skip to content

chore: Remove debug code for KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING #2478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Mar 21, 2026
+2 −78
Merged

chore: Remove debug code for KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@
//-------------------------------------------------------------------------------------------------
/** Access for creating game managed display strings */
//-------------------------------------------------------------------------------------------------
//#define KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
#define MAX_GROUPS 20
#else
#define MAX_GROUPS 10
#endif
#define MAX_GROUPS 10

class W3DDisplayStringManager : public DisplayStringManager
{
Expand Down
7 changes: 0 additions & 7 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,9 @@ void W3DDisplayStringManager::postProcessLoad()
{
m_groupNumeralStrings[i] = newDisplayString();
m_groupNumeralStrings[i]->setFont(font);

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
UnicodeString displayNumber;
displayNumber.format( L"%d", i);
m_groupNumeralStrings[i]->setText( displayNumber );
#else
AsciiString displayNumber;
displayNumber.format("NUMBER:%d", i);
m_groupNumeralStrings[i]->setText(TheGameText->fetch(displayNumber));
#endif
}

m_formationLetterDisplayString = newDisplayString();
Expand Down
52 changes: 0 additions & 52 deletions GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@

#include "ww3d.h"

//#define KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
#include "GameLogic/Module/ParkingPlaceBehavior.h"
#endif


#define VERY_TRANSPARENT_MATERIAL_PASS_OPACITY (0.001f)
#define MATERIAL_PASS_OPACITY_FADE_SCALAR (0.8f)

Expand Down Expand Up @@ -2791,10 +2785,6 @@ void Drawable::drawIconUI()

//Moved this to last so that it shows up over contained and ammo icons.
drawVeterancy( healthBarRegion );

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
drawUIText();
#endif
}
}

Expand Down Expand Up @@ -3173,48 +3163,6 @@ void Drawable::drawUIText()
TheDrawGroupInfo->m_dropShadowOffsetY);

}

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
if( obj->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
{
Object *carrier = TheGameLogic->findObjectByID( obj->getProducerID() );
if( carrier )
{
for (BehaviorModule** i = carrier->getBehaviorModules(); *i; ++i)
{
ParkingPlaceBehaviorInterface *pp = (*i)->getParkingPlaceBehaviorInterface();
if( pp )
{
Int index = pp->getSpaceIndex( obj->getID() );

Int xPos = healthBarRegion->lo.x;
Int yPos = healthBarRegion->lo.y;

if (TheDrawGroupInfo->m_usingPixelOffsetX) {
xPos += TheDrawGroupInfo->m_pixelOffsetX;
} else {
xPos += (healthBarRegion->width() * TheDrawGroupInfo->m_percentOffsetX);
}

if (TheDrawGroupInfo->m_usingPixelOffsetY) {
yPos += TheDrawGroupInfo->m_pixelOffsetY;
} else {
yPos += (healthBarRegion->width() * TheDrawGroupInfo->m_percentOffsetY);
}

m_groupNumber = TheDisplayStringManager->getGroupNumeralString(index);


m_groupNumber->draw(xPos, yPos, color,
TheDrawGroupInfo->m_colorForTextDropShadow,
TheDrawGroupInfo->m_dropShadowOffsetX,
TheDrawGroupInfo->m_dropShadowOffsetY);
break;
}
}
}
}
#endif
}

// ------------------------------------------------------------------------------------------------
Expand Down
7 changes: 1 addition & 6 deletions GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@
//-------------------------------------------------------------------------------------------------
/** Access for creating game managed display strings */
//-------------------------------------------------------------------------------------------------
//#define KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
#define MAX_GROUPS 20
#else
#define MAX_GROUPS 10
#endif
#define MAX_GROUPS 10

class W3DDisplayStringManager : public DisplayStringManager
{
Expand Down
7 changes: 0 additions & 7 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,9 @@ void W3DDisplayStringManager::postProcessLoad()
{
m_groupNumeralStrings[i] = newDisplayString();
m_groupNumeralStrings[i]->setFont(font);

#ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
UnicodeString displayNumber;
displayNumber.format( L"%d", i);
m_groupNumeralStrings[i]->setText( displayNumber );
#else
AsciiString displayNumber;
displayNumber.format("NUMBER:%d", i);
m_groupNumeralStrings[i]->setText(TheGameText->fetch(displayNumber));
#endif
}

m_formationLetterDisplayString = newDisplayString();
Expand Down
Loading