Skip to content

feat(headless): Implement GhostObjectManagerDummy #2244

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 10 commits into from
Mar 19, 2026
Merged

feat(headless): Implement GhostObjectManagerDummy #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9506b60
feature(headless): Add GhostObjectManagerDummy for headless mode
bobtista Feb 2, 2026
05b40ee
feature(headless): Replicate GhostObjectManagerDummy to Generals
bobtista Feb 2, 2026
5f90c55
refactor(headless): Remove redundant 3DScene null check now handled b…
bobtista Feb 2, 2026
f02b950
refactor(headless): Replicate 3DScene null check removal to Generals
bobtista Feb 2, 2026
92c86ea
bugfix(headless): Add override, remove void params, pass headless as …
bobtista Mar 11, 2026
ecf1ecf
bugfix(headless): Add override, remove void params, pass headless as …
bobtista Mar 11, 2026
d0d15aa
refactor(headless): Rename headless param to dummy, use if/else, hand…
bobtista Mar 18, 2026
5b5d519
refactor(headless): Rename headless param to dummy, use if/else, hand…
bobtista Mar 18, 2026
ea86205
style(headless): Expand createGhostObjectManager inline body in Gener…
bobtista Mar 19, 2026
5523e01
style(headless): Expand createGhostObjectManager inline body in Gener…
bobtista Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ class GameLogic : public SubsystemInterface, public Snapshot

/// factory for TheTerrainLogic, called from init()
virtual TerrainLogic *createTerrainLogic();
virtual GhostObjectManager *createGhostObjectManager();
virtual GhostObjectManager *createGhostObjectManager(bool dummy = false);

GameMode m_gameMode;
Int m_rankLevelLimit;
Expand Down
14 changes: 14 additions & 0 deletions Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,19 @@ inline Bool GhostObjectManager::trackAllPlayers() const
#endif
}

// TheSuperHackers @feature bobtista 19/01/2026
// GhostObjectManager that does nothing for headless mode.
// Note: Does NOT override crc/xfer/loadPostProcess to maintain save compatibility.
class GhostObjectManagerDummy : public GhostObjectManager
{
public:
virtual void reset() override {}
virtual GhostObject *addGhostObject(Object *object, PartitionData *pd) override { return nullptr; }
virtual void removeGhostObject(GhostObject *mod) override {}
virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount) override {}
virtual void releasePartitionData() override {}
virtual void restorePartitionData() override {}
};

// the singleton
extern GhostObjectManager *TheGhostObjectManager;
6 changes: 4 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void GameLogic::init()
// Create system for holding deleted objects that are
// still in the partition manager because player has a fogged
// view of them.
TheGhostObjectManager = createGhostObjectManager();
TheGhostObjectManager = createGhostObjectManager(TheGlobalData->m_headless);

// create the terrain logic
TheTerrainLogic = createTerrainLogic();
Expand Down Expand Up @@ -3933,8 +3933,10 @@ UnsignedInt GameLogic::getObjectCount()

// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
GhostObjectManager *GameLogic::createGhostObjectManager()
GhostObjectManager *GameLogic::createGhostObjectManager(bool dummy)
{
if (dummy)
return NEW GhostObjectManagerDummy;
return NEW GhostObjectManager;
}

Expand Down
7 changes: 6 additions & 1 deletion Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ class W3DGameLogic : public GameLogic

/// factory for TheTerrainLogic, called from init()
virtual TerrainLogic *createTerrainLogic() { return NEW W3DTerrainLogic; };
virtual GhostObjectManager *createGhostObjectManager() { return NEW W3DGhostObjectManager; }
virtual GhostObjectManager *createGhostObjectManager(bool dummy)
{
if (dummy)
return NEW GhostObjectManagerDummy;
return NEW W3DGhostObjectManager;
}

};
2 changes: 1 addition & 1 deletion Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
// ------------------------------------------------------------------------------------------------
Bool W3DRenderObjectSnapshot::addToScene()
{
if (W3DDisplay::m_3DScene != nullptr && !m_robj->Is_In_Scene())
if (!m_robj->Is_In_Scene())
{
W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
return true;
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ class GameLogic : public SubsystemInterface, public Snapshot

/// factory for TheTerrainLogic, called from init()
virtual TerrainLogic *createTerrainLogic();
virtual GhostObjectManager *createGhostObjectManager();
virtual GhostObjectManager *createGhostObjectManager(bool dummy = false);

GameMode m_gameMode;
Int m_rankLevelLimit;
Expand Down
14 changes: 14 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,19 @@ inline Bool GhostObjectManager::trackAllPlayers() const
#endif
}

// TheSuperHackers @feature bobtista 19/01/2026
// GhostObjectManager that does nothing for headless mode.
// Note: Does NOT override crc/xfer/loadPostProcess to maintain save compatibility.
class GhostObjectManagerDummy : public GhostObjectManager
{
public:
virtual void reset() override {}
virtual GhostObject *addGhostObject(Object *object, PartitionData *pd) override { return nullptr; }
virtual void removeGhostObject(GhostObject *mod) override {}
virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount) override {}
virtual void releasePartitionData() override {}
virtual void restorePartitionData() override {}
};

// the singleton
extern GhostObjectManager *TheGhostObjectManager;
6 changes: 4 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void GameLogic::init()
// Create system for holding deleted objects that are
// still in the partition manager because player has a fogged
// view of them.
TheGhostObjectManager = createGhostObjectManager();
TheGhostObjectManager = createGhostObjectManager(TheGlobalData->m_headless);

// create the terrain logic
TheTerrainLogic = createTerrainLogic();
Expand Down Expand Up @@ -4492,8 +4492,10 @@ UnsignedInt GameLogic::getObjectCount()

// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
GhostObjectManager *GameLogic::createGhostObjectManager()
GhostObjectManager *GameLogic::createGhostObjectManager(bool dummy)
{
if (dummy)
return NEW GhostObjectManagerDummy;
return NEW GhostObjectManager;
}

Expand Down
7 changes: 6 additions & 1 deletion GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ class W3DGameLogic : public GameLogic

/// factory for TheTerrainLogic, called from init()
virtual TerrainLogic *createTerrainLogic() { return NEW W3DTerrainLogic; };
virtual GhostObjectManager *createGhostObjectManager() { return NEW W3DGhostObjectManager; }
virtual GhostObjectManager *createGhostObjectManager(bool dummy)
{
if (dummy)
return NEW GhostObjectManagerDummy;
return NEW W3DGhostObjectManager;
}

};
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
// ------------------------------------------------------------------------------------------------
Bool W3DRenderObjectSnapshot::addToScene()
{
if (W3DDisplay::m_3DScene != nullptr && !m_robj->Is_In_Scene())
if (!m_robj->Is_In_Scene())
{
W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
return true;
Expand Down
Loading