Skip to content

Improve #2218 #2318

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

Draft
DeathFishAtEase wants to merge 8 commits into
base: develop
Choose a base branch
from
+58 −45
Draft

Improve #2218 #2318

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b823ed
initial
DeathFishAtEase Jul 31, 2026
83c121c
Effective Mode Counter
DeathFishAtEase Jul 31, 2026
16d14b9
TryFind
DeathFishAtEase Jul 31, 2026
2cad8d6
TryFetch
DeathFishAtEase Jul 31, 2026
5e4f4a9
update
DeathFishAtEase Jul 31, 2026
a7c915a
bool
DeathFishAtEase Aug 1, 2026
6696c27
replace unordered_multimap
Coronia Aug 2, 2026
60878d6
move toggle to Optimizations
Coronia Aug 3, 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
7 changes: 7 additions & 0 deletions src/Ext/WeaponType/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <Ext/Techno/Body.h>

WeaponTypeExt::ExtContainer WeaponTypeExt::ExtMap;
int WeaponTypeExt::LaserTrackingWeaponCount = 0;

bool WeaponTypeExt::HasRequiredAttachedEffects(TechnoClass* pTarget, TechnoClass* pFirer) const
{
Expand Down Expand Up @@ -118,6 +119,8 @@ void WeaponTypeExt::LoadFromINIFile(CCINIClass* const pINI)
this->FeedbackWeapon.Read<true>(exINI, pSection, "FeedbackWeapon");
this->Laser_IsSingleColor.Read(exINI, pSection, "IsSingleColor");
this->LaserPositionUpdate.Read(exINI, pSection, "LaserPositionUpdate");
if (this->LaserPositionUpdate != PositionFollow::None)
++WeaponTypeExt::LaserTrackingWeaponCount;
this->LaserPositionUpdate_StopOnFirerConvert.Read(exINI, pSection, "LaserPositionUpdate.StopOnFirerConvert");
this->LaserZAdjust.Read(exINI, pSection, "LaserZAdjust");
this->EBoltZAdjust.Read(exINI, pSection, "EBoltZAdjust");
Expand Down Expand Up @@ -506,6 +509,10 @@ DEFINE_HOOK(0x77311D, WeaponTypeClass_SDDTOR, 0x6)
{
GET(WeaponTypeClass*, pItem, ESI);

auto pExt = WeaponTypeExt::TryFetch(pItem);
if (pExt && pExt->LaserPositionUpdate != PositionFollow::None)
Comment thread
Coronia marked this conversation as resolved.
Outdated
--WeaponTypeExt::LaserTrackingWeaponCount;

WeaponTypeExt::ExtMap.Remove(pItem);

return 0;
Expand Down
1 change: 1 addition & 0 deletions src/Ext/WeaponType/Body.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,6 @@ class WeaponTypeExt final : public AbstractTypeExt

// Misc/Hooks.LaserDraw.cpp
static void OnObjectRemoved(ObjectClass* pObject);
static int LaserTrackingWeaponCount;
};

10 changes: 6 additions & 4 deletions src/Misc/Hooks.LaserDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,11 @@ namespace LaserRT
// IsLaser this is no longer necessary, but the handling of DiskLaser is more complex, and keeping the CTOR is currently the most cost-effective solution.
DEFINE_HOOK(0x54FE60, LaserDrawClass_CTOR_Update, 0x5)
{
GET(LaserDrawClass*, pLaser, ECX);
LaserRT::TrackingMap[pLaser] = LaserRT::TrackingData {};
if (WeaponTypeExt::LaserTrackingWeaponCount > 0)
{
GET(LaserDrawClass*, pLaser, ECX);
LaserRT::TrackingMap[pLaser] = LaserRT::TrackingData {};
}
return 0;
}

Expand Down Expand Up @@ -305,8 +308,7 @@ DEFINE_HOOK(0x6FD446, TechnoClass_LaserZap_Tracking, 0x7)
return 0;
}

static LaserDrawClass* __fastcall Shrapnel_CreateLaser_Wrapper(TechnoClass* pShooter, void*, ObjectClass* pTarget
, int weaponIdx, WeaponTypeClass* pWeapon, const CoordStruct& sourceCoords)
static LaserDrawClass* __fastcall Shrapnel_CreateLaser_Wrapper(TechnoClass* pShooter, void*, ObjectClass* pTarget, int weaponIdx, WeaponTypeClass* pWeapon, const CoordStruct& sourceCoords)
{
const auto mode = WeaponTypeExt::Fetch(pWeapon)->LaserPositionUpdate.Get();

Expand Down