Skip to content

unify: Parse template references in the AssistedTargetingUpdate module by name #2809

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

Open
Stubbjax wants to merge 5 commits into
base: main
Choose a base branch
from
+25 −22
Open

unify: Parse template references in the AssistedTargetingUpdate module by name #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6c23ed
unify: Parse template references in the AssistedTargetingUpdate modul…
Stubbjax Jun 19, 2026
ffa911a
bugfix: Correct copy-and-paste error that caused the laser to target …
Stubbjax Jun 19, 2026
4098912
unify: Apply update and loadPostProcess logic from Zero Hour to Generals
Stubbjax Jun 19, 2026
818dfe9
unity: Init instance members
Stubbjax Jun 19, 2026
720da12
refactor: Remove unnecessary ascii string clears
Stubbjax Jun 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
10 changes: 6 additions & 4 deletions Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,14 @@ class AssistedTargetingUpdateModuleData : public UpdateModuleData
public:
Int m_clipSize;
WeaponSlotType m_weaponSlot;
ThingTemplate *m_laserFromAssisted;
ThingTemplate *m_laserToTarget;

AsciiString m_laserFromAssistedName;
AsciiString m_laserToTargetName;

AssistedTargetingUpdateModuleData()
{
m_clipSize = 1;
m_weaponSlot = PRIMARY_WEAPON;
m_laserFromAssisted = nullptr;
m_laserToTarget = nullptr;
}

static void buildFieldParse(MultiIniFieldParse& p);
Expand All @@ -72,4 +71,7 @@ class AssistedTargetingUpdate : public UpdateModule

private:
void makeFeedbackLaser( const ThingTemplate *laserTemplate, const Object *from, const Object *to );

const ThingTemplate *m_laserFromAssisted;
const ThingTemplate *m_laserToTarget;
};
24 changes: 17 additions & 7 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
{
{ "AssistingClipSize", INI::parseInt, nullptr, offsetof( AssistedTargetingUpdateModuleData, m_clipSize ) },
{ "AssistingWeaponSlot", INI::parseLookupList, TheWeaponSlotTypeNamesLookupList, offsetof( AssistedTargetingUpdateModuleData, m_weaponSlot ) },
{ "LaserFromAssisted", INI::parseThingTemplate, nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserFromAssisted ) },
{ "LaserToTarget", INI::parseThingTemplate, nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserToTarget ) },
{ "LaserFromAssisted", INI::parseAsciiString, nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserFromAssistedName ) },
{ "LaserToTarget", INI::parseAsciiString, nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserToTargetName ) },
{ nullptr, nullptr, nullptr, 0 }
};
p.add(dataFieldParse);
Expand All @@ -65,6 +65,8 @@ void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
//-------------------------------------------------------------------------------------------------
AssistedTargetingUpdate::AssistedTargetingUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
{
m_laserFromAssisted = nullptr;
m_laserToTarget = nullptr;
setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
}

Expand Down Expand Up @@ -100,10 +102,10 @@ void AssistedTargetingUpdate::assistAttack( const Object *requestingObject, Obje
me->setWeaponLock( md->m_weaponSlot, LOCKED_TEMPORARILY );
me->getAI()->aiAttackObject( victimObject, md->m_clipSize, CMD_FROM_AI );

if( md->m_laserFromAssisted )
makeFeedbackLaser( md->m_laserFromAssisted, requestingObject, me );
if( md->m_laserToTarget )
makeFeedbackLaser( md->m_laserToTarget, me, victimObject );
if( m_laserFromAssisted )
makeFeedbackLaser( m_laserFromAssisted, requestingObject, me );
if( m_laserToTarget )
makeFeedbackLaser( m_laserToTarget, me, victimObject );
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -137,6 +139,11 @@ void AssistedTargetingUpdate::makeFeedbackLaser( const ThingTemplate *laserTempl
//-------------------------------------------------------------------------------------------------
UpdateSleepTime AssistedTargetingUpdate::update()
{
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();

m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );

return UPDATE_SLEEP_FOREVER;
}

Expand Down Expand Up @@ -174,8 +181,11 @@ void AssistedTargetingUpdate::xfer( Xfer *xfer )
// ------------------------------------------------------------------------------------------------
void AssistedTargetingUpdate::loadPostProcess()
{
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();

m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );

// extend base class
UpdateModule::loadPostProcess();

}
4 changes: 0 additions & 4 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ class AssistedTargetingUpdateModuleData : public UpdateModuleData
{
m_clipSize = 1;
m_weaponSlot = PRIMARY_WEAPON;
m_laserFromAssistedName.clear();
m_laserToTargetName.clear();
}

static void buildFieldParse(MultiIniFieldParse& p);
Expand Down Expand Up @@ -76,6 +74,4 @@ class AssistedTargetingUpdate : public UpdateModule

const ThingTemplate *m_laserFromAssisted;
const ThingTemplate *m_laserToTarget;


};
9 changes: 2 additions & 7 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ void AssistedTargetingUpdate::assistAttack( const Object *requestingObject, Obje
me->setWeaponLock( md->m_weaponSlot, LOCKED_TEMPORARILY );
me->getAI()->aiAttackObject( victimObject, md->m_clipSize, CMD_FROM_AI );


if( m_laserFromAssisted )
makeFeedbackLaser( m_laserFromAssisted, requestingObject, me );
if( m_laserToTarget )
Expand Down Expand Up @@ -139,14 +138,10 @@ void AssistedTargetingUpdate::makeFeedbackLaser( const ThingTemplate *laserTempl
//-------------------------------------------------------------------------------------------------
UpdateSleepTime AssistedTargetingUpdate::update()
{

const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();

m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );


m_laserToTarget =TheThingFactory->findTemplate( d->m_laserFromAssistedName );

m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );

return UPDATE_SLEEP_FOREVER;
}
Expand Down Expand Up @@ -188,7 +183,7 @@ void AssistedTargetingUpdate::loadPostProcess()
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();

m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
m_laserToTarget =TheThingFactory->findTemplate( d->m_laserFromAssistedName );
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );

// extend base class
UpdateModule::loadPostProcess();
Expand Down
Loading