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>
This commit is contained in:
@@ -47,7 +47,7 @@ public:
|
||||
Boat(Level *level, double x, double y, double z);
|
||||
|
||||
virtual double getRideHeight();
|
||||
virtual bool hurt(DamageSource *source, int damage);
|
||||
virtual bool hurt(DamageSource *source, float damage);
|
||||
virtual void animateHurt();
|
||||
virtual bool isPickable();
|
||||
|
||||
@@ -71,8 +71,8 @@ public:
|
||||
wstring getName();
|
||||
virtual bool interact(shared_ptr<Player> player);
|
||||
|
||||
virtual void setDamage(int damage);
|
||||
virtual int getDamage();
|
||||
virtual void setDamage(float damage);
|
||||
virtual float getDamage();
|
||||
virtual void setHurtTime(int hurtTime);
|
||||
virtual int getHurtTime();
|
||||
virtual void setHurtDir(int hurtDir);
|
||||
|
||||
Reference in New Issue
Block a user