December 2014 files

This commit is contained in:
Loki Rautio
2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions

View File

@@ -13,7 +13,7 @@ FireChargeItem::FireChargeItem(int id) : Item(id)
m_dragonFireballIcon = NULL;
}
bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
bool FireChargeItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
{
if (level->isClientSide)
{
@@ -27,7 +27,7 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
if (face == 4) x--;
if (face == 5) x++;
if (!player->mayBuild(x, y, z))
if (!player->mayUseItemAt(x, y, z, face, instance))
{
return false;
}
@@ -42,13 +42,13 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
if (targetType == 0)
{
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);
}
if (!player->abilities.instabuild)
{
itemInstance->count--;
instance->count--;
}
return true;
}