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:
@@ -25,7 +25,7 @@ bool FlintAndSteelItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play
|
||||
if (face == 4) x--;
|
||||
if (face == 5) x++;
|
||||
|
||||
if (!player->mayBuild(x, y, z)) return false;
|
||||
if (!player->mayUseItemAt(x, y, z, face, instance)) return false;
|
||||
|
||||
int targetType = level->getTile(x, y, z);
|
||||
|
||||
@@ -47,11 +47,11 @@ bool FlintAndSteelItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play
|
||||
}
|
||||
}
|
||||
|
||||
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_FIRE_IGNITE, 1, random->nextFloat() * 0.4f + 0.8f);
|
||||
level->setTile(x, y, z, Tile::fire_Id);
|
||||
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_FIRE_NEWIGNITE, 1, random->nextFloat() * 0.4f + 0.8f);
|
||||
level->setTileAndUpdate(x, y, z, Tile::fire_Id);
|
||||
}
|
||||
|
||||
instance->hurt(1, player);
|
||||
instance->hurtAndBreak(1, player);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user