Bullet targets can also be a CellClass, which derive from AbstractCla…

…ss, thus the Target field should be AbstractClass rather than ObjectClass. Plus some more changes.
FS-21 · Oct 13, 2012 · aebeb03 · aebeb03
1 parent 32293a3
commit aebeb03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -44,7 +44,7 @@ class BulletTypeClass : public ObjectTypeClass
 		{ JMP_THIS(0x46BBC0); }
 
 	BulletClass* __fastcall CreateBullet(
-		CellClass* Target,
+		AbstractClass* Target,
 		TechnoClass* Owner,
 		int Damage,
 		WarheadTypeClass *WH,