~ares-developers/ares/gd03

« back to all changes in this revision

Viewing changes to src/Ext/Building/Hooks.Firewall.cpp

Committer: Zimmermann Gyula
Date: 2012-09-22 13:23:15 UTC
mfrom: (825.1.41)
Revision ID: git-v1:28613a17bb384e20bb2b95b5fbb0d9dfb903eaab

Merge remote-tracking branch 'origin/v02' into gd03

files modified:
src/Ares.GlobalControls.cpp

src/Ares.h

src/Ares.version.h

src/Commands/AIBasePlan.h

src/Commands/AIControl.h

src/Commands/Commands.h

src/Commands/DumpMemory.h

src/Commands/DumpTypes.h

src/Commands/MapSnapshot.h

src/Ext/Building/Body.cpp

src/Ext/Building/Hooks.Firewall.cpp

src/Ext/BuildingType/Body.cpp

src/Ext/House/Body.cpp

src/Ext/House/Body.h

src/Ext/House/Hooks.Firewall.cpp

src/Ext/Infantry/Body.cpp

src/Ext/Infantry/Hooks.MakeInf.cpp

src/Ext/Infantry/Hooks.cpp

src/Ext/SWType/Hooks.Legacy.cpp

src/Ext/SWType/Hooks.cpp

src/Ext/Side/Hooks.cpp

src/Ext/Techno/Body.cpp

src/Ext/Techno/Body.h

src/Ext/Techno/Hooks.cpp

src/Ext/WarheadType/Hooks.cpp

src/Ext/WeaponType/Body.cpp

src/Misc/Bugfixes.Buffer.cpp

src/Misc/Bugfixes.cpp

src/Misc/Debug.cpp

src/Misc/Debug.h

src/Misc/Interface.cpp

src/Misc/Network.h

src/Misc/PoweredUnitClass.cpp

src/Misc/PoweredUnitClass.h

src/Misc/SWTypes/ChronoWarp.cpp

src/Misc/SWTypes/Dominator.cpp

src/Misc/SWTypes/UnitDelivery.cpp

src/Utilities/Helpers.Alex.h

Show diffs side-by-side

added added

removed removed

src/Ext/Building/Hooks.Firewall.cpp

231

DEFINE_HOOK(6FCD1D, TechnoClass_GetObjectActivityState_CanTargetFirewall, 5)

232

{

233

GET(TechnoClass *, Src, ESI);

234

GET_STACK(TechnoClass *, Tgt, 0x24);

234

GET_STACK(AbstractClass *, Tgt, 0x24);

235

GET_STACK(int, idxWeapon, 0x28);

236

237

WeaponTypeClass *Weapon = Src->GetWeapon(idxWeapon)->WeaponType;

240

}

241

242

BulletTypeExt::ExtData *pBulletData = BulletTypeExt::ExtMap.Find(Weapon->Projectile);

243

if(!pBulletData->SubjectToFirewall) {

243

244

if(!pBulletData->SubjectToFirewall || !HouseExt::IsAnyFirestormActive) {

244

245

return 0;

245

246

}

246

247

248

CoordStruct crdTgt;

249

Tgt->GetCoords(&crdTgt);

250

247

251

FirestormFinderApplicator FireFinder(Src->Owner);

248

252

249

CellSequence Path(&Src->Location, &Tgt->Location);

253

CellSequence Path(&Src->Location, &crdTgt);

250

254

251

255

Path.Apply(FireFinder);

252

256

Older »