From aebeb03e6c70eb53d344e654790f51f0b13e1ce0 Mon Sep 17 00:00:00 2001 From: AlexB Date: Sat, 13 Oct 2012 11:35:33 +0200 Subject: [PATCH] Bullet targets can also be a CellClass, which derive from AbstractClass, thus the Target field should be AbstractClass rather than ObjectClass. Plus some more changes. --- BulletClass.h | 10 +++++----- BulletTypeClass.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BulletClass.h b/BulletClass.h index 5c948e58..eec5085b 100644 --- a/BulletClass.h +++ b/BulletClass.h @@ -127,15 +127,15 @@ class BulletClass : public ObjectClass DWORD unknown_100; bool unknown_104; DWORD unknown_108; - ObjectClass* Target; - DWORD unknown_110; - DWORD InheritedColor; + AbstractClass* Target; + int Speed; + int InheritedColor; DWORD unknown_118; DWORD unknown_11C; - DWORD unknown_120; - DWORD unknown_124; + double unknown_120; WarheadTypeClass* WH; byte AnimRate; + byte unknown_12D; // AnimRate from Type WeaponTypeClass* WeaponType; CoordStruct posSrc; CoordStruct posTgt; diff --git a/BulletTypeClass.h b/BulletTypeClass.h index 91cb150d..96b0d18f 100644 --- a/BulletTypeClass.h +++ b/BulletTypeClass.h @@ -44,7 +44,7 @@ class BulletTypeClass : public ObjectTypeClass { JMP_THIS(0x46BBC0); } BulletClass* __fastcall CreateBullet( - CellClass* Target, + AbstractClass* Target, TechnoClass* Owner, int Damage, WarheadTypeClass *WH,