WAVE 7 Phase A: wire the projectile/missile weapon SUBSYSTEMS byte-exact (un-mislabeled)
An 8-agent decomp-mapping workflow mapped every weapon-family ctor + fire/spawn path
(scratchpad/wave7_maps.txt). KEY IDENTITY CORRECTION via VDATA.h enum (base 3000=0xBB8):
the factory ctor-address comments were right but the built CLASS names were stubs/base --
0xBCD == ProjectileWeapon (was building the base MechWeapon stub)
0xBCE == GaussRifle (NOT MissileLauncher -- was a MissileLauncher stub)
0xBD0 == MissileLauncher (NOT BallisticWeapon -- was a BallisticWeapon stub)
Un-mislabeled + wired via Create<Class>Subsystem bridges (mirroring CreateEmitterSubsystem),
each static_assert-locked byte-exact on the now-locked MechWeapon(0x3F0)/Emitter(0x478) bases:
* ProjectileWeapon (0xBCD, @4bc3fc : MechWeapon, sizeof 0x448)
FIX: AmmoBinConnection was an empty 1-byte struct -> retyped to the binary's 0xC
SharedData::Connection (was making the object 8 bytes short, sliding
MissileLauncher's missileCount off 0x448).
* MissileLauncher (0xBD0, @4bcff0 : ProjectileWeapon, sizeof 0x44C)
FIX: deleted muzzleVelocity (ALIAS of inherited ProjectileWeapon launchVelocity@0x410)
and salvoCount (SHADOW of inherited MechWeapon damageData.burstCount@0x3d4),
keeping the single own field missileCount@0x448.
* GaussRifle (0xBCE, @4bdcb4 : Emitter, sizeof 0x484 = Emitter + Vector3D muzzleVelocity)
DEDICATED bridge (not CreateEmitter): its FireWeapon is a no-op (mov [eax+0x414],0) --
a non-functional weapon in this 1995 build. Also fixed GAUSS.CPP's discharge write
rechargeLevel -> currentLevel@0x414 (the binary writes this+0x414).
Phase A safe-stubs FireWeapon (consume round + recoil, NO spawn): the reconstructed
Projectile (@4be1bc, 0x340) + Missile (@4bf5b4, 0x368) ENTITY classes are NOT spawn-ready
(Entity-base phantom members overflow their New() alloc -> heap corruption; New() takes
(int)this instead of the 0xD4 descriptor; Entity base size unconfirmed 2007-vs-1995, the
Mech 0x638-vs-0x854 problem). The workflow's adversarial verify flagged the live spawn as a
heap-overflow hazard and recommended exactly this phasing. Phase B = the entity byte-exactness
+ descriptor build + New(MakeMessage*) so a fired shot becomes a flying entity that damages.
Factory now 18 of 20 cases wired to real ticking classes (remaining: SubsystemMessageManager
0xBD3 [WAVE 8], Gyroscope 0xBC4 [deferred]). Verified: Mad Cat (LRM/ballistic) + BLH construct
the real weapon classes + tick authentic charge/ammo/heat/recoil, DESTROYED-in-8, 0 crashes,
heapcheck-clean through construction. Energy weapons already damage via the mech4 beam path,
so combat is unaffected.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
9d82be46a1
commit
2bcca26cea
@@ -71,7 +71,7 @@ void
|
||||
//
|
||||
// Fire the weapon
|
||||
//
|
||||
rechargeLevel = 0.0f; // was outputVoltage: the Emitter dup was removed (== inherited rechargeLevel@0x320)
|
||||
currentLevel = 0.0f; // binary @004bdcb4/@004bdca4 write [this+0x414] == inherited Emitter currentLevel (discharge)
|
||||
|
||||
Check_Fpu();
|
||||
}
|
||||
@@ -90,7 +90,7 @@ GaussRifle::GaussRifle(
|
||||
{
|
||||
Check(owner);
|
||||
Check_Pointer(subsystem_resource);
|
||||
rechargeLevel = 0.0f; // was outputVoltage: the Emitter dup was removed (== inherited rechargeLevel@0x320)
|
||||
currentLevel = 0.0f; // binary @004bdcb4/@004bdca4 write [this+0x414] == inherited Emitter currentLevel (discharge)
|
||||
Check_Fpu();
|
||||
}
|
||||
|
||||
@@ -151,3 +151,20 @@ Logical
|
||||
return IsDerivedFrom(ClassDerivations);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//===========================================================================//
|
||||
// WAVE 7 factory bridge -- GaussRifle (factory case 0xBCE, "MissileWeapon"
|
||||
// mislabel). VDATA.h enum: 0xBCE == GaussRifleClassID. GaussRifle : Emitter
|
||||
// (sizeof 0x484 = Emitter 0x478 + Vector3D muzzleVelocity). ctor @004bdcb4,
|
||||
// no-op FireWeapon @004bdca4 (just zeros currentLevel -- a non-functional weapon
|
||||
// in this 1995 build), so it needs a DEDICATED bridge (CreateEmitterSubsystem
|
||||
// would build a plain Emitter that WOULD deal damage). Was building a
|
||||
// MissileLauncher RECON_SUBSYS stub. alloc 0x484.
|
||||
//===========================================================================//
|
||||
Subsystem *CreateGaussRifleSubsystem(Mech *owner, int id, void *seg)
|
||||
{
|
||||
Check(sizeof(GaussRifle) <= 0x484);
|
||||
return (Subsystem *) new (Memory::Allocate(0x484))
|
||||
GaussRifle(owner, id, (GaussRifle::SubsystemResource *)seg, GaussRifle::DefaultData);
|
||||
}
|
||||
|
||||
@@ -136,8 +136,14 @@ class Projectile;
|
||||
FireWeapon();
|
||||
|
||||
Vector3D
|
||||
muzzleVelocity;
|
||||
muzzleVelocity; // @0x478 (past Emitter 0x478) -- ends 0x484
|
||||
|
||||
friend struct GaussRifleLayoutCheck;
|
||||
};
|
||||
|
||||
struct GaussRifleLayoutCheck {
|
||||
static_assert(offsetof(GaussRifle, muzzleVelocity) == 0x478, "GaussRifle::muzzleVelocity @0x478 (Emitter must end 0x478)");
|
||||
static_assert(sizeof(GaussRifle) == 0x484, "sizeof(GaussRifle) 0x484 (== factory alloc)");
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user