feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/Minecraft.World/MeleeAttackGoal.h b/Minecraft.World/MeleeAttackGoal.h
index c8f5e19d..dd6b1958 100644
--- a/Minecraft.World/MeleeAttackGoal.h
+++ b/Minecraft.World/MeleeAttackGoal.h
@@ -3,28 +3,26 @@
 #include "Goal.h"
 
 class Level;
-class Mob;
+class PathfinderMob;
 class Path;
 
 class MeleeAttackGoal : public Goal
 {
 private:
 	Level *level;
-	Mob *mob; // Owner of this goal
-	weak_ptr<Mob> target;
-
+	PathfinderMob *mob; // Owner of this goal
 	int attackTime;
-	float speed;
+	double speedModifier;
 	bool trackTarget;
 	Path *path;
 	eINSTANCEOF attackType;
 	int timeToRecalcPath;
 
-	void _init(Mob *mob, float speed, bool trackTarget);
+	void _init(PathfinderMob *mob, double speedModifier, bool trackTarget);
 
 public:
-	MeleeAttackGoal(Mob *mob, eINSTANCEOF attackType, float speed, bool trackTarget);
-	MeleeAttackGoal(Mob *mob, float speed, bool trackTarget);
+	MeleeAttackGoal(PathfinderMob *mob, eINSTANCEOF attackType, double speedModifier, bool trackTarget);
+	MeleeAttackGoal(PathfinderMob *mob, double speedModifier, bool trackTarget);
 	~MeleeAttackGoal();
 
 	virtual bool canUse();