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 97a4399472.
* 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:
@@ -11,7 +11,7 @@ SmallFireball::SmallFireball(Level *level) : Fireball(level)
|
||||
setSize(5 / 16.0f, 5 / 16.0f);
|
||||
}
|
||||
|
||||
SmallFireball::SmallFireball(Level *level, shared_ptr<Mob> mob, double xa, double ya, double za) : Fireball(level, mob, xa, ya, za)
|
||||
SmallFireball::SmallFireball(Level *level, shared_ptr<LivingEntity> mob, double xa, double ya, double za) : Fireball(level, mob, xa, ya, za)
|
||||
{
|
||||
setSize(5 / 16.0f, 5 / 16.0f);
|
||||
}
|
||||
@@ -62,7 +62,7 @@ void SmallFireball::onHit(HitResult *res)
|
||||
};
|
||||
if (level->isEmptyTile(tileX, tileY, tileZ))
|
||||
{
|
||||
level->setTile(tileX, tileY, tileZ, Tile::fire_Id);
|
||||
level->setTileAndUpdate(tileX, tileY, tileZ, Tile::fire_Id);
|
||||
}
|
||||
}
|
||||
remove();
|
||||
@@ -74,7 +74,7 @@ bool SmallFireball::isPickable()
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SmallFireball::hurt(DamageSource *source, int damage)
|
||||
bool SmallFireball::hurt(DamageSource *source, float damage)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
Reference in New Issue
Block a user