Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
@@ -21,18 +21,18 @@ wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile.";
|
||||
|
||||
const float Tile::INDESTRUCTIBLE_DESTROY_TIME = -1.0f;
|
||||
|
||||
Tile::SoundType *Tile::SOUND_NORMAL = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_WOOD = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_GRAVEL = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_GRASS = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_STONE = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_METAL = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_GLASS = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_CLOTH = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_SAND = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_SNOW = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_LADDER = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_ANVIL = nullptr;
|
||||
Tile::SoundType *Tile::SOUND_NORMAL = NULL;
|
||||
Tile::SoundType *Tile::SOUND_WOOD = NULL;
|
||||
Tile::SoundType *Tile::SOUND_GRAVEL = NULL;
|
||||
Tile::SoundType *Tile::SOUND_GRASS = NULL;
|
||||
Tile::SoundType *Tile::SOUND_STONE = NULL;
|
||||
Tile::SoundType *Tile::SOUND_METAL = NULL;
|
||||
Tile::SoundType *Tile::SOUND_GLASS = NULL;
|
||||
Tile::SoundType *Tile::SOUND_CLOTH = NULL;
|
||||
Tile::SoundType *Tile::SOUND_SAND = NULL;
|
||||
Tile::SoundType *Tile::SOUND_SNOW = NULL;
|
||||
Tile::SoundType *Tile::SOUND_LADDER = NULL;
|
||||
Tile::SoundType *Tile::SOUND_ANVIL = NULL;
|
||||
|
||||
bool Tile::solid[TILE_NUM_COUNT];
|
||||
int Tile::lightBlock[TILE_NUM_COUNT];
|
||||
@@ -42,183 +42,183 @@ unsigned char Tile::_sendTileData[TILE_NUM_COUNT]; // 4J changed - was bool, no
|
||||
bool Tile::mipmapEnable[TILE_NUM_COUNT];
|
||||
bool Tile::propagate[TILE_NUM_COUNT];
|
||||
|
||||
Tile **Tile::tiles = nullptr;
|
||||
Tile **Tile::tiles = NULL;
|
||||
|
||||
Tile *Tile::stone = nullptr;
|
||||
GrassTile *Tile::grass = nullptr;
|
||||
Tile *Tile::dirt = nullptr;
|
||||
Tile *Tile::cobblestone = nullptr;
|
||||
Tile *Tile::wood = nullptr;
|
||||
Tile *Tile::sapling = nullptr;
|
||||
Tile *Tile::unbreakable = nullptr;
|
||||
LiquidTile *Tile::water = nullptr;
|
||||
Tile *Tile::calmWater = nullptr;
|
||||
LiquidTile *Tile::lava = nullptr;
|
||||
Tile *Tile::calmLava = nullptr;
|
||||
Tile *Tile::sand = nullptr;
|
||||
Tile *Tile::gravel = nullptr;
|
||||
Tile *Tile::goldOre = nullptr;
|
||||
Tile *Tile::ironOre = nullptr;
|
||||
Tile *Tile::coalOre = nullptr;
|
||||
Tile *Tile::treeTrunk = nullptr;
|
||||
LeafTile *Tile::leaves = nullptr;
|
||||
Tile *Tile::sponge = nullptr;
|
||||
Tile *Tile::glass = nullptr;
|
||||
Tile *Tile::lapisOre = nullptr;
|
||||
Tile *Tile::lapisBlock = nullptr;
|
||||
Tile *Tile::dispenser = nullptr;
|
||||
Tile *Tile::sandStone = nullptr;
|
||||
Tile *Tile::noteblock = nullptr;
|
||||
Tile *Tile::bed = nullptr;
|
||||
Tile *Tile::goldenRail = nullptr;
|
||||
Tile *Tile::detectorRail = nullptr;
|
||||
PistonBaseTile *Tile::pistonStickyBase = nullptr;
|
||||
Tile *Tile::web = nullptr;
|
||||
TallGrass *Tile::tallgrass = nullptr;
|
||||
DeadBushTile *Tile::deadBush = nullptr;
|
||||
PistonBaseTile *Tile::pistonBase = nullptr;
|
||||
PistonExtensionTile *Tile::pistonExtension = nullptr;
|
||||
Tile *Tile::wool = nullptr;
|
||||
PistonMovingPiece *Tile::pistonMovingPiece = nullptr;
|
||||
Bush *Tile::flower = nullptr;
|
||||
Bush *Tile::rose = nullptr;
|
||||
Bush *Tile::mushroom_brown = nullptr;
|
||||
Bush *Tile::mushroom_red = nullptr;
|
||||
Tile *Tile::goldBlock = nullptr;
|
||||
Tile *Tile::ironBlock = nullptr;
|
||||
HalfSlabTile *Tile::stoneSlab = nullptr;
|
||||
HalfSlabTile *Tile::stoneSlabHalf = nullptr;
|
||||
Tile *Tile::redBrick = nullptr;
|
||||
Tile *Tile::tnt = nullptr;
|
||||
Tile *Tile::bookshelf = nullptr;
|
||||
Tile *Tile::mossyCobblestone = nullptr;
|
||||
Tile *Tile::obsidian = nullptr;
|
||||
Tile *Tile::torch = nullptr;
|
||||
FireTile *Tile::fire = nullptr;
|
||||
Tile *Tile::mobSpawner = nullptr;
|
||||
Tile *Tile::stairs_wood = nullptr;
|
||||
ChestTile *Tile::chest = nullptr;
|
||||
RedStoneDustTile *Tile::redStoneDust = nullptr;
|
||||
Tile *Tile::diamondOre = nullptr;
|
||||
Tile *Tile::diamondBlock = nullptr;
|
||||
Tile *Tile::workBench = nullptr;
|
||||
Tile *Tile::wheat = nullptr;
|
||||
Tile *Tile::farmland = nullptr;
|
||||
Tile *Tile::furnace = nullptr;
|
||||
Tile *Tile::furnace_lit = nullptr;
|
||||
Tile *Tile::sign = nullptr;
|
||||
Tile *Tile::door_wood = nullptr;
|
||||
Tile *Tile::ladder = nullptr;
|
||||
Tile *Tile::rail = nullptr;
|
||||
Tile *Tile::stairs_stone = nullptr;
|
||||
Tile *Tile::wallSign = nullptr;
|
||||
Tile *Tile::lever = nullptr;
|
||||
Tile *Tile::pressurePlate_stone = nullptr;
|
||||
Tile *Tile::door_iron = nullptr;
|
||||
Tile *Tile::pressurePlate_wood = nullptr;
|
||||
Tile *Tile::redStoneOre = nullptr;
|
||||
Tile *Tile::redStoneOre_lit = nullptr;
|
||||
Tile *Tile::redstoneTorch_off = nullptr;
|
||||
Tile *Tile::redstoneTorch_on = nullptr;
|
||||
Tile *Tile::button = nullptr;
|
||||
Tile *Tile::topSnow = nullptr;
|
||||
Tile *Tile::ice = nullptr;
|
||||
Tile *Tile::snow = nullptr;
|
||||
Tile *Tile::cactus = nullptr;
|
||||
Tile *Tile::clay = nullptr;
|
||||
Tile *Tile::reeds = nullptr;
|
||||
Tile *Tile::jukebox = nullptr;
|
||||
Tile *Tile::fence = nullptr;
|
||||
Tile *Tile::pumpkin = nullptr;
|
||||
Tile *Tile::netherRack = nullptr;
|
||||
Tile *Tile::soulsand = nullptr;
|
||||
Tile *Tile::glowstone = nullptr;
|
||||
PortalTile *Tile::portalTile = nullptr;
|
||||
Tile *Tile::litPumpkin = nullptr;
|
||||
Tile *Tile::cake = nullptr;
|
||||
RepeaterTile *Tile::diode_off = nullptr;
|
||||
RepeaterTile *Tile::diode_on = nullptr;
|
||||
Tile *Tile::stained_glass = nullptr;
|
||||
Tile *Tile::trapdoor = nullptr;
|
||||
Tile *Tile::stone = NULL;
|
||||
GrassTile *Tile::grass = NULL;
|
||||
Tile *Tile::dirt = NULL;
|
||||
Tile *Tile::cobblestone = NULL;
|
||||
Tile *Tile::wood = NULL;
|
||||
Tile *Tile::sapling = NULL;
|
||||
Tile *Tile::unbreakable = NULL;
|
||||
LiquidTile *Tile::water = NULL;
|
||||
Tile *Tile::calmWater = NULL;
|
||||
LiquidTile *Tile::lava = NULL;
|
||||
Tile *Tile::calmLava = NULL;
|
||||
Tile *Tile::sand = NULL;
|
||||
Tile *Tile::gravel = NULL;
|
||||
Tile *Tile::goldOre = NULL;
|
||||
Tile *Tile::ironOre = NULL;
|
||||
Tile *Tile::coalOre = NULL;
|
||||
Tile *Tile::treeTrunk = NULL;
|
||||
LeafTile *Tile::leaves = NULL;
|
||||
Tile *Tile::sponge = NULL;
|
||||
Tile *Tile::glass = NULL;
|
||||
Tile *Tile::lapisOre = NULL;
|
||||
Tile *Tile::lapisBlock = NULL;
|
||||
Tile *Tile::dispenser = NULL;
|
||||
Tile *Tile::sandStone = NULL;
|
||||
Tile *Tile::noteblock = NULL;
|
||||
Tile *Tile::bed = NULL;
|
||||
Tile *Tile::goldenRail = NULL;
|
||||
Tile *Tile::detectorRail = NULL;
|
||||
PistonBaseTile *Tile::pistonStickyBase = NULL;
|
||||
Tile *Tile::web = NULL;
|
||||
TallGrass *Tile::tallgrass = NULL;
|
||||
DeadBushTile *Tile::deadBush = NULL;
|
||||
PistonBaseTile *Tile::pistonBase = NULL;
|
||||
PistonExtensionTile *Tile::pistonExtension = NULL;
|
||||
Tile *Tile::wool = NULL;
|
||||
PistonMovingPiece *Tile::pistonMovingPiece = NULL;
|
||||
Bush *Tile::flower = NULL;
|
||||
Bush *Tile::rose = NULL;
|
||||
Bush *Tile::mushroom_brown = NULL;
|
||||
Bush *Tile::mushroom_red = NULL;
|
||||
Tile *Tile::goldBlock = NULL;
|
||||
Tile *Tile::ironBlock = NULL;
|
||||
HalfSlabTile *Tile::stoneSlab = NULL;
|
||||
HalfSlabTile *Tile::stoneSlabHalf = NULL;
|
||||
Tile *Tile::redBrick = NULL;
|
||||
Tile *Tile::tnt = NULL;
|
||||
Tile *Tile::bookshelf = NULL;
|
||||
Tile *Tile::mossyCobblestone = NULL;
|
||||
Tile *Tile::obsidian = NULL;
|
||||
Tile *Tile::torch = NULL;
|
||||
FireTile *Tile::fire = NULL;
|
||||
Tile *Tile::mobSpawner = NULL;
|
||||
Tile *Tile::stairs_wood = NULL;
|
||||
ChestTile *Tile::chest = NULL;
|
||||
RedStoneDustTile *Tile::redStoneDust = NULL;
|
||||
Tile *Tile::diamondOre = NULL;
|
||||
Tile *Tile::diamondBlock = NULL;
|
||||
Tile *Tile::workBench = NULL;
|
||||
Tile *Tile::wheat = NULL;
|
||||
Tile *Tile::farmland = NULL;
|
||||
Tile *Tile::furnace = NULL;
|
||||
Tile *Tile::furnace_lit = NULL;
|
||||
Tile *Tile::sign = NULL;
|
||||
Tile *Tile::door_wood = NULL;
|
||||
Tile *Tile::ladder = NULL;
|
||||
Tile *Tile::rail = NULL;
|
||||
Tile *Tile::stairs_stone = NULL;
|
||||
Tile *Tile::wallSign = NULL;
|
||||
Tile *Tile::lever = NULL;
|
||||
Tile *Tile::pressurePlate_stone = NULL;
|
||||
Tile *Tile::door_iron = NULL;
|
||||
Tile *Tile::pressurePlate_wood = NULL;
|
||||
Tile *Tile::redStoneOre = NULL;
|
||||
Tile *Tile::redStoneOre_lit = NULL;
|
||||
Tile *Tile::redstoneTorch_off = NULL;
|
||||
Tile *Tile::redstoneTorch_on = NULL;
|
||||
Tile *Tile::button = NULL;
|
||||
Tile *Tile::topSnow = NULL;
|
||||
Tile *Tile::ice = NULL;
|
||||
Tile *Tile::snow = NULL;
|
||||
Tile *Tile::cactus = NULL;
|
||||
Tile *Tile::clay = NULL;
|
||||
Tile *Tile::reeds = NULL;
|
||||
Tile *Tile::jukebox = NULL;
|
||||
Tile *Tile::fence = NULL;
|
||||
Tile *Tile::pumpkin = NULL;
|
||||
Tile *Tile::netherRack = NULL;
|
||||
Tile *Tile::soulsand = NULL;
|
||||
Tile *Tile::glowstone = NULL;
|
||||
PortalTile *Tile::portalTile = NULL;
|
||||
Tile *Tile::litPumpkin = NULL;
|
||||
Tile *Tile::cake = NULL;
|
||||
RepeaterTile *Tile::diode_off = NULL;
|
||||
RepeaterTile *Tile::diode_on = NULL;
|
||||
Tile *Tile::stained_glass = NULL;
|
||||
Tile *Tile::trapdoor = NULL;
|
||||
|
||||
Tile *Tile::monsterStoneEgg = nullptr;
|
||||
Tile *Tile::stoneBrick = nullptr;
|
||||
Tile *Tile::hugeMushroom_brown = nullptr;
|
||||
Tile *Tile::hugeMushroom_red = nullptr;
|
||||
Tile *Tile::ironFence = nullptr;
|
||||
Tile *Tile::thinGlass = nullptr;
|
||||
Tile *Tile::melon = nullptr;
|
||||
Tile *Tile::pumpkinStem = nullptr;
|
||||
Tile *Tile::melonStem = nullptr;
|
||||
Tile *Tile::vine = nullptr;
|
||||
Tile *Tile::fenceGate = nullptr;
|
||||
Tile *Tile::stairs_bricks = nullptr;
|
||||
Tile *Tile::stairs_stoneBrickSmooth = nullptr;
|
||||
Tile *Tile::monsterStoneEgg = NULL;
|
||||
Tile *Tile::stoneBrick = NULL;
|
||||
Tile *Tile::hugeMushroom_brown = NULL;
|
||||
Tile *Tile::hugeMushroom_red = NULL;
|
||||
Tile *Tile::ironFence = NULL;
|
||||
Tile *Tile::thinGlass = NULL;
|
||||
Tile *Tile::melon = NULL;
|
||||
Tile *Tile::pumpkinStem = NULL;
|
||||
Tile *Tile::melonStem = NULL;
|
||||
Tile *Tile::vine = NULL;
|
||||
Tile *Tile::fenceGate = NULL;
|
||||
Tile *Tile::stairs_bricks = NULL;
|
||||
Tile *Tile::stairs_stoneBrickSmooth = NULL;
|
||||
|
||||
MycelTile *Tile::mycel = nullptr;
|
||||
Tile *Tile::waterLily = nullptr;
|
||||
Tile *Tile::netherBrick = nullptr;
|
||||
Tile *Tile::netherFence = nullptr;
|
||||
Tile *Tile::stairs_netherBricks = nullptr;
|
||||
Tile *Tile::netherStalk = nullptr;
|
||||
Tile *Tile::enchantTable = nullptr;
|
||||
Tile *Tile::brewingStand = nullptr;
|
||||
CauldronTile *Tile::cauldron = nullptr;
|
||||
Tile *Tile::endPortalTile = nullptr;
|
||||
Tile *Tile::endPortalFrameTile = nullptr;
|
||||
Tile *Tile::endStone = nullptr;
|
||||
Tile *Tile::dragonEgg = nullptr;
|
||||
Tile *Tile::redstoneLight = nullptr;
|
||||
Tile *Tile::redstoneLight_lit = nullptr;
|
||||
MycelTile *Tile::mycel = NULL;
|
||||
Tile *Tile::waterLily = NULL;
|
||||
Tile *Tile::netherBrick = NULL;
|
||||
Tile *Tile::netherFence = NULL;
|
||||
Tile *Tile::stairs_netherBricks = NULL;
|
||||
Tile *Tile::netherStalk = NULL;
|
||||
Tile *Tile::enchantTable = NULL;
|
||||
Tile *Tile::brewingStand = NULL;
|
||||
CauldronTile *Tile::cauldron = NULL;
|
||||
Tile *Tile::endPortalTile = NULL;
|
||||
Tile *Tile::endPortalFrameTile = NULL;
|
||||
Tile *Tile::endStone = NULL;
|
||||
Tile *Tile::dragonEgg = NULL;
|
||||
Tile *Tile::redstoneLight = NULL;
|
||||
Tile *Tile::redstoneLight_lit = NULL;
|
||||
|
||||
// TU9
|
||||
Tile *Tile::stairs_sandstone = nullptr;
|
||||
Tile *Tile::woodStairsDark = nullptr;
|
||||
Tile *Tile::woodStairsBirch = nullptr;
|
||||
Tile *Tile::woodStairsJungle = nullptr;
|
||||
Tile *Tile::commandBlock = nullptr;
|
||||
BeaconTile *Tile::beacon = nullptr;
|
||||
Tile *Tile::button_wood = nullptr;
|
||||
HalfSlabTile *Tile::woodSlab = nullptr;
|
||||
HalfSlabTile *Tile::woodSlabHalf = nullptr;
|
||||
Tile *Tile::stairs_sandstone = NULL;
|
||||
Tile *Tile::woodStairsDark = NULL;
|
||||
Tile *Tile::woodStairsBirch = NULL;
|
||||
Tile *Tile::woodStairsJungle = NULL;
|
||||
Tile *Tile::commandBlock = NULL;
|
||||
BeaconTile *Tile::beacon = NULL;
|
||||
Tile *Tile::button_wood = NULL;
|
||||
HalfSlabTile *Tile::woodSlab = NULL;
|
||||
HalfSlabTile *Tile::woodSlabHalf = NULL;
|
||||
|
||||
Tile *Tile::emeraldOre = nullptr;
|
||||
Tile *Tile::enderChest = nullptr;
|
||||
TripWireSourceTile *Tile::tripWireSource = nullptr;
|
||||
Tile *Tile::tripWire = nullptr;
|
||||
Tile *Tile::emeraldBlock = nullptr;
|
||||
Tile *Tile::emeraldOre = NULL;
|
||||
Tile *Tile::enderChest = NULL;
|
||||
TripWireSourceTile *Tile::tripWireSource = NULL;
|
||||
Tile *Tile::tripWire = NULL;
|
||||
Tile *Tile::emeraldBlock = NULL;
|
||||
|
||||
|
||||
Tile *Tile::cocoa = nullptr;
|
||||
Tile *Tile::skull = nullptr;
|
||||
Tile *Tile::cocoa = NULL;
|
||||
Tile *Tile::skull = NULL;
|
||||
|
||||
Tile *Tile::cobbleWall = nullptr;
|
||||
Tile *Tile::flowerPot = nullptr;
|
||||
Tile *Tile::carrots = nullptr;
|
||||
Tile *Tile::potatoes = nullptr;
|
||||
Tile *Tile::anvil = nullptr;
|
||||
Tile *Tile::chest_trap = nullptr;
|
||||
Tile *Tile::weightedPlate_light = nullptr;
|
||||
Tile *Tile::weightedPlate_heavy = nullptr;
|
||||
ComparatorTile *Tile::comparator_off = nullptr;
|
||||
ComparatorTile *Tile::comparator_on = nullptr;
|
||||
Tile *Tile::cobbleWall = NULL;
|
||||
Tile *Tile::flowerPot = NULL;
|
||||
Tile *Tile::carrots = NULL;
|
||||
Tile *Tile::potatoes = NULL;
|
||||
Tile *Tile::anvil = NULL;
|
||||
Tile *Tile::chest_trap = NULL;
|
||||
Tile *Tile::weightedPlate_light = NULL;
|
||||
Tile *Tile::weightedPlate_heavy = NULL;
|
||||
ComparatorTile *Tile::comparator_off = NULL;
|
||||
ComparatorTile *Tile::comparator_on = NULL;
|
||||
|
||||
DaylightDetectorTile *Tile::daylightDetector = nullptr;
|
||||
Tile *Tile::redstoneBlock = nullptr;
|
||||
DaylightDetectorTile *Tile::daylightDetector = NULL;
|
||||
Tile *Tile::redstoneBlock = NULL;
|
||||
|
||||
Tile *Tile::netherQuartz = nullptr;
|
||||
HopperTile *Tile::hopper = nullptr;
|
||||
Tile *Tile::quartzBlock = nullptr;
|
||||
Tile *Tile::stairs_quartz = nullptr;
|
||||
Tile *Tile::activatorRail = nullptr;
|
||||
Tile *Tile::dropper = nullptr;
|
||||
Tile *Tile::clayHardened_colored = nullptr;
|
||||
Tile *Tile::stained_glass_pane = nullptr;
|
||||
Tile *Tile::netherQuartz = NULL;
|
||||
HopperTile *Tile::hopper = NULL;
|
||||
Tile *Tile::quartzBlock = NULL;
|
||||
Tile *Tile::stairs_quartz = NULL;
|
||||
Tile *Tile::activatorRail = NULL;
|
||||
Tile *Tile::dropper = NULL;
|
||||
Tile *Tile::clayHardened_colored = NULL;
|
||||
Tile *Tile::stained_glass_pane = NULL;
|
||||
|
||||
Tile *Tile::hayBlock = nullptr;
|
||||
Tile *Tile::woolCarpet = nullptr;
|
||||
Tile *Tile::clayHardened = nullptr;
|
||||
Tile *Tile::coalBlock = nullptr;
|
||||
Tile *Tile::hayBlock = NULL;
|
||||
Tile *Tile::woolCarpet = NULL;
|
||||
Tile *Tile::clayHardened = NULL;
|
||||
Tile *Tile::coalBlock = NULL;
|
||||
|
||||
DWORD Tile::tlsIdxShape = TlsAlloc();
|
||||
|
||||
@@ -236,7 +236,7 @@ void Tile::CreateNewThreadStorage()
|
||||
|
||||
void Tile::ReleaseThreadStorage()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
delete tls;
|
||||
}
|
||||
|
||||
@@ -259,15 +259,15 @@ void Tile::staticCtor()
|
||||
memset( tiles, 0, sizeof( Tile *)*TILE_NUM_COUNT );
|
||||
|
||||
Tile::stone = (new StoneTile(1)) ->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stone")->setDescriptionId(IDS_TILE_STONE)->setUseDescriptionId(IDS_DESC_STONE);
|
||||
Tile::grass = static_cast<GrassTile *>((new GrassTile(2))->setDestroyTime(0.6f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"grass")->setDescriptionId(IDS_TILE_GRASS)->setUseDescriptionId(IDS_DESC_GRASS));
|
||||
Tile::grass = (GrassTile *) (new GrassTile(2)) ->setDestroyTime(0.6f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"grass")->setDescriptionId(IDS_TILE_GRASS)->setUseDescriptionId(IDS_DESC_GRASS);
|
||||
Tile::dirt = (new DirtTile(3)) ->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_GRAVEL)->setIconName(L"dirt")->setDescriptionId(IDS_TILE_DIRT)->setUseDescriptionId(IDS_DESC_DIRT);
|
||||
Tile::cobblestone = (new Tile(4, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"cobblestone")->setDescriptionId(IDS_TILE_STONE_BRICK)->setUseDescriptionId(IDS_DESC_STONE_BRICK);
|
||||
Tile::wood = (new WoodTile(5)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structwoodstuff, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"planks")->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS)->sendTileData()->setUseDescriptionId(IDS_DESC_WOODENPLANKS);
|
||||
Tile::sapling = (new Sapling(6)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"sapling")->setDescriptionId(IDS_TILE_SAPLING)->sendTileData()->setUseDescriptionId(IDS_DESC_SAPLING)->disableMipmap();
|
||||
Tile::unbreakable = (new Tile(7, Material::stone)) ->setIndestructible()->setExplodeable(6000000)->setSoundType(Tile::SOUND_STONE)->setIconName(L"bedrock")->setDescriptionId(IDS_TILE_BEDROCK)->setNotCollectStatistics()->setUseDescriptionId(IDS_DESC_BEDROCK);
|
||||
Tile::water = static_cast<LiquidTile *>((new LiquidTileDynamic(8, Material::water))->setDestroyTime(100.0f)->setLightBlock(3)->setIconName(L"water_flow")->setDescriptionId(IDS_TILE_WATER)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_WATER));
|
||||
Tile::water = (LiquidTile *)(new LiquidTileDynamic(8, Material::water)) ->setDestroyTime(100.0f)->setLightBlock(3)->setIconName(L"water_flow")->setDescriptionId(IDS_TILE_WATER)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_WATER);
|
||||
Tile::calmWater = (new LiquidTileStatic(9, Material::water)) ->setDestroyTime(100.0f)->setLightBlock(3)->setIconName(L"water_still")->setDescriptionId(IDS_TILE_WATER)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_WATER);
|
||||
Tile::lava = static_cast<LiquidTile *>((new LiquidTileDynamic(10, Material::lava))->setDestroyTime(00.0f)->setLightEmission(1.0f)->setLightBlock(255)->setIconName(L"lava_flow")->setDescriptionId(IDS_TILE_LAVA)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_LAVA));
|
||||
Tile::lava = (LiquidTile *)(new LiquidTileDynamic(10, Material::lava)) ->setDestroyTime(00.0f)->setLightEmission(1.0f)->setLightBlock(255)->setIconName(L"lava_flow")->setDescriptionId(IDS_TILE_LAVA)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_LAVA);
|
||||
|
||||
Tile::calmLava = (new LiquidTileStatic(11, Material::lava)) ->setDestroyTime(100.0f)->setLightEmission(1.0f)->setLightBlock(255)->setIconName(L"lava_still")->setDescriptionId(IDS_TILE_LAVA)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_LAVA);
|
||||
Tile::sand = (new HeavyTile(12)) ->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_SAND)->setIconName(L"sand")->setDescriptionId(IDS_TILE_SAND)->setUseDescriptionId(IDS_DESC_SAND);
|
||||
@@ -277,7 +277,7 @@ void Tile::staticCtor()
|
||||
Tile::coalOre = (new OreTile(16)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"coal_ore")->setDescriptionId(IDS_TILE_ORE_COAL)->setUseDescriptionId(IDS_DESC_ORE_COAL);
|
||||
Tile::treeTrunk = (new TreeTile(17))->setDestroyTime(2.0f) ->setSoundType(Tile::SOUND_WOOD)->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->sendTileData()->setUseDescriptionId(IDS_DESC_LOG);
|
||||
// 4J - for leaves, have specified that only the data bits that encode the type of leaf are important to be sent
|
||||
Tile::leaves = static_cast<LeafTile *>((new LeafTile(18))->setDestroyTime(0.2f)->setLightBlock(1)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"leaves")->setDescriptionId(IDS_TILE_LEAVES)->sendTileData(LeafTile::LEAF_TYPE_MASK)->setUseDescriptionId(IDS_DESC_LEAVES));
|
||||
Tile::leaves = (LeafTile *)(new LeafTile(18)) ->setDestroyTime(0.2f)->setLightBlock(1)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"leaves")->setDescriptionId(IDS_TILE_LEAVES)->sendTileData(LeafTile::LEAF_TYPE_MASK)->setUseDescriptionId(IDS_DESC_LEAVES);
|
||||
Tile::sponge = (new Sponge(19)) ->setDestroyTime(0.6f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"sponge")->setDescriptionId(IDS_TILE_SPONGE)->setUseDescriptionId(IDS_DESC_SPONGE);
|
||||
Tile::glass = (new GlassTile(20, Material::glass, false)) ->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setIconName(L"glass")->setDescriptionId(IDS_TILE_GLASS)->setUseDescriptionId(IDS_DESC_GLASS);
|
||||
|
||||
@@ -289,24 +289,24 @@ void Tile::staticCtor()
|
||||
Tile::bed = (new BedTile(26)) ->setDestroyTime(0.2f)->setIconName(L"bed")->setDescriptionId(IDS_TILE_BED)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_BED);
|
||||
Tile::goldenRail = (new PoweredRailTile(27)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_rail, Item::eMaterial_gold)->setDestroyTime(0.7f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"rail_golden")->setDescriptionId(IDS_TILE_GOLDEN_RAIL)->sendTileData()->setUseDescriptionId(IDS_DESC_POWEREDRAIL)->disableMipmap();
|
||||
Tile::detectorRail = (new DetectorRailTile(28)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_rail, Item::eMaterial_detector)->setDestroyTime(0.7f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"rail_detector")->setDescriptionId(IDS_TILE_DETECTOR_RAIL)->sendTileData()->setUseDescriptionId(IDS_DESC_DETECTORRAIL)->disableMipmap();
|
||||
Tile::pistonStickyBase = static_cast<PistonBaseTile *>((new PistonBaseTile(29, true))->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_stickypiston)->setIconName(L"pistonStickyBase")->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON)->sendTileData());
|
||||
Tile::pistonStickyBase = (PistonBaseTile *)(new PistonBaseTile(29, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_stickypiston)->setIconName(L"pistonStickyBase")->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON)->sendTileData();
|
||||
Tile::web = (new WebTile(30)) ->setLightBlock(1)->setDestroyTime(4.0f)->setIconName(L"web")->setDescriptionId(IDS_TILE_WEB)->setUseDescriptionId(IDS_DESC_WEB);
|
||||
|
||||
Tile::tallgrass = static_cast<TallGrass *>((new TallGrass(31))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass")->setDescriptionId(IDS_TILE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap());
|
||||
Tile::deadBush = static_cast<DeadBushTile *>((new DeadBushTile(32))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"deadbush")->setDescriptionId(IDS_TILE_DEAD_BUSH)->setUseDescriptionId(IDS_DESC_DEAD_BUSH)->disableMipmap());
|
||||
Tile::pistonBase = static_cast<PistonBaseTile *>((new PistonBaseTile(33, false))->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_piston)->setIconName(L"pistonBase")->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(IDS_DESC_PISTON)->sendTileData());
|
||||
Tile::pistonExtension = static_cast<PistonExtensionTile *>((new PistonExtensionTile(34))->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(-1)->sendTileData());
|
||||
Tile::tallgrass = (TallGrass *)(new TallGrass(31)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass")->setDescriptionId(IDS_TILE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap();
|
||||
Tile::deadBush = (DeadBushTile *)(new DeadBushTile(32)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"deadbush")->setDescriptionId(IDS_TILE_DEAD_BUSH)->setUseDescriptionId(IDS_DESC_DEAD_BUSH)->disableMipmap();
|
||||
Tile::pistonBase = (PistonBaseTile *)(new PistonBaseTile(33,false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_piston)->setIconName(L"pistonBase")->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(IDS_DESC_PISTON)->sendTileData();
|
||||
Tile::pistonExtension = (PistonExtensionTile *)(new PistonExtensionTile(34))->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(-1)->sendTileData();
|
||||
Tile::wool = (new ColoredTile(35, Material::cloth)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_cloth, Item::eMaterial_cloth)->setDestroyTime(0.8f)->setSoundType(Tile::SOUND_CLOTH)->setIconName(L"wool_colored")->setDescriptionId(IDS_TILE_CLOTH)->sendTileData()->setUseDescriptionId(IDS_DESC_WOOL);
|
||||
Tile::pistonMovingPiece = static_cast<PistonMovingPiece *>((new PistonMovingPiece(36))->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(-1));
|
||||
Tile::flower = static_cast<Bush *>((new Bush(37))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_dandelion")->setDescriptionId(IDS_TILE_FLOWER)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
|
||||
Tile::rose = static_cast<Bush *>((new Bush(38))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_rose")->setDescriptionId(IDS_TILE_ROSE)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
|
||||
Tile::mushroom_brown = static_cast<Bush *>((new Mushroom(39))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setLightEmission(2 / 16.0f)->setIconName(L"mushroom_brown")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap());
|
||||
Tile::mushroom_red = static_cast<Bush *>((new Mushroom(40))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"mushroom_red")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap());
|
||||
Tile::pistonMovingPiece = (PistonMovingPiece *)(new PistonMovingPiece(36)) ->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(-1);
|
||||
Tile::flower = (Bush *) (new Bush(37)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_dandelion")->setDescriptionId(IDS_TILE_FLOWER)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap();
|
||||
Tile::rose = (Bush *) (new Bush(38)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_rose")->setDescriptionId(IDS_TILE_ROSE)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap();
|
||||
Tile::mushroom_brown = (Bush *) (new Mushroom(39)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setLightEmission(2 / 16.0f)->setIconName(L"mushroom_brown")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap();
|
||||
Tile::mushroom_red = (Bush *) (new Mushroom(40)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"mushroom_red")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap();
|
||||
|
||||
Tile::goldBlock = (new MetalTile(41)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_gold)->setDestroyTime(3.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_METAL)->setIconName(L"gold_block")->setDescriptionId(IDS_TILE_BLOCK_GOLD)->setUseDescriptionId(IDS_DESC_BLOCK_GOLD);
|
||||
Tile::ironBlock = (new MetalTile(42)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_iron)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_METAL)->setIconName(L"iron_block")->setDescriptionId(IDS_TILE_BLOCK_IRON)->setUseDescriptionId(IDS_DESC_BLOCK_IRON);
|
||||
Tile::stoneSlab = static_cast<HalfSlabTile *>((new StoneSlabTile(Tile::stoneSlab_Id, true))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB));
|
||||
Tile::stoneSlabHalf = static_cast<HalfSlabTile *>((new StoneSlabTile(Tile::stoneSlabHalf_Id, false))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB));
|
||||
Tile::stoneSlab = (HalfSlabTile *) (new StoneSlabTile(Tile::stoneSlab_Id, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB);
|
||||
Tile::stoneSlabHalf = (HalfSlabTile *) (new StoneSlabTile(Tile::stoneSlabHalf_Id, false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB);
|
||||
Tile::redBrick = (new Tile(45, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_brick)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"brick")->setDescriptionId(IDS_TILE_BRICK)->setUseDescriptionId(IDS_DESC_BRICK);
|
||||
Tile::tnt = (new TntTile(46)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tnt")->setDescriptionId(IDS_TILE_TNT)->setUseDescriptionId(IDS_DESC_TNT);
|
||||
Tile::bookshelf = (new BookshelfTile(47)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_bookshelf)->setDestroyTime(1.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"bookshelf")->setDescriptionId(IDS_TILE_BOOKSHELF)->setUseDescriptionId(IDS_DESC_BOOKSHELF);
|
||||
@@ -314,11 +314,11 @@ void Tile::staticCtor()
|
||||
Tile::obsidian = (new ObsidianTile(49)) ->setDestroyTime(50.0f)->setExplodeable(2000)->setSoundType(Tile::SOUND_STONE)->setIconName(L"obsidian")->setDescriptionId(IDS_TILE_OBSIDIAN)->setUseDescriptionId(IDS_DESC_OBSIDIAN);
|
||||
Tile::torch = (new TorchTile(50)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_wood)->setDestroyTime(0.0f)->setLightEmission(15 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"torch_on")->setDescriptionId(IDS_TILE_TORCH)->setUseDescriptionId(IDS_DESC_TORCH)->disableMipmap();
|
||||
|
||||
Tile::fire = static_cast<FireTile *>(((new FireTile(51))->setDestroyTime(0.0f)->setLightEmission(1.0f)->setSoundType(Tile::SOUND_WOOD))->setIconName(L"fire")->setDescriptionId(IDS_TILE_FIRE)->setNotCollectStatistics()->setUseDescriptionId(-1));
|
||||
Tile::fire = (FireTile *) ((new FireTile(51)) ->setDestroyTime(0.0f)->setLightEmission(1.0f)->setSoundType(Tile::SOUND_WOOD))->setIconName(L"fire")->setDescriptionId(IDS_TILE_FIRE)->setNotCollectStatistics()->setUseDescriptionId(-1);
|
||||
Tile::mobSpawner = (new MobSpawnerTile(52)) ->setDestroyTime(5.0f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"mob_spawner")->setDescriptionId(IDS_TILE_MOB_SPAWNER)->setNotCollectStatistics()->setUseDescriptionId(IDS_DESC_MOB_SPAWNER);
|
||||
Tile::stairs_wood = (new StairTile(53, Tile::wood,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_wood) ->setIconName(L"stairsWood")->setDescriptionId(IDS_TILE_STAIRS_WOOD) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::chest = static_cast<ChestTile *>((new ChestTile(54, ChestTile::TYPE_BASIC))->setBaseItemTypeAndMaterial(Item::eBaseItemType_chest, Item::eMaterial_wood)->setDestroyTime(2.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"chest")->setDescriptionId(IDS_TILE_CHEST)->sendTileData()->setUseDescriptionId(IDS_DESC_CHEST));
|
||||
Tile::redStoneDust = static_cast<RedStoneDustTile *>((new RedStoneDustTile(55))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_NORMAL)->setIconName(L"redstone_dust")->setDescriptionId(IDS_TILE_REDSTONE_DUST)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONE_DUST));
|
||||
Tile::chest = (ChestTile *)(new ChestTile(54, ChestTile::TYPE_BASIC)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_chest, Item::eMaterial_wood)->setDestroyTime(2.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"chest")->setDescriptionId(IDS_TILE_CHEST)->sendTileData()->setUseDescriptionId(IDS_DESC_CHEST);
|
||||
Tile::redStoneDust = (RedStoneDustTile *)(new RedStoneDustTile(55)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_NORMAL)->setIconName(L"redstone_dust")->setDescriptionId(IDS_TILE_REDSTONE_DUST)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONE_DUST);
|
||||
Tile::diamondOre = (new OreTile(56)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"diamond_ore")->setDescriptionId(IDS_TILE_ORE_DIAMOND)->setUseDescriptionId(IDS_DESC_ORE_DIAMOND);
|
||||
Tile::diamondBlock = (new MetalTile(57)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_diamond)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_METAL)->setIconName(L"diamond_block")->setDescriptionId(IDS_TILE_BLOCK_DIAMOND)->setUseDescriptionId(IDS_DESC_BLOCK_DIAMOND);
|
||||
Tile::workBench = (new WorkbenchTile(58)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_wood)->setDestroyTime(2.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"crafting_table")->setDescriptionId(IDS_TILE_WORKBENCH)->setUseDescriptionId(IDS_DESC_CRAFTINGTABLE);
|
||||
@@ -356,12 +356,12 @@ void Tile::staticCtor()
|
||||
Tile::netherRack = (new NetherrackTile(87)) ->setDestroyTime(0.4f)->setSoundType(Tile::SOUND_STONE)->setIconName(L"netherrack")->setDescriptionId(IDS_TILE_HELL_ROCK)->setUseDescriptionId(IDS_DESC_HELL_ROCK);
|
||||
Tile::soulsand = (new SoulSandTile(88)) ->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_SAND)->setIconName(L"soul_sand")->setDescriptionId(IDS_TILE_HELL_SAND)->setUseDescriptionId(IDS_DESC_HELL_SAND);
|
||||
Tile::glowstone = (new Glowstonetile(89, Material::glass)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_LIGHT_GEM)->setUseDescriptionId(IDS_DESC_GLOWSTONE);
|
||||
Tile::portalTile = static_cast<PortalTile *>(((new PortalTile(90))->setDestroyTime(-1)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(0.75f))->setIconName(L"portal")->setDescriptionId(IDS_TILE_PORTAL)->setUseDescriptionId(IDS_DESC_PORTAL));
|
||||
Tile::portalTile = (PortalTile *) ((new PortalTile(90)) ->setDestroyTime(-1)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(0.75f))->setIconName(L"portal")->setDescriptionId(IDS_TILE_PORTAL)->setUseDescriptionId(IDS_DESC_PORTAL);
|
||||
|
||||
Tile::litPumpkin = (new PumpkinTile(91, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_pumpkin)->setDestroyTime(1.0f)->setSoundType(Tile::SOUND_WOOD)->setLightEmission(1.0f)->setIconName(L"pumpkin")->setDescriptionId(IDS_TILE_LIT_PUMPKIN)->sendTileData()->setUseDescriptionId(IDS_DESC_JACKOLANTERN);
|
||||
Tile::cake = (new CakeTile(92)) ->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_CLOTH)->setIconName(L"cake")->setDescriptionId(IDS_TILE_CAKE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_CAKE);
|
||||
Tile::diode_off = static_cast<RepeaterTile *>((new RepeaterTile(93, false))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_off")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap());
|
||||
Tile::diode_on = static_cast<RepeaterTile *>((new RepeaterTile(94, true))->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_on")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap());
|
||||
Tile::diode_off = (RepeaterTile *)(new RepeaterTile(93, false)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_off")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap();
|
||||
Tile::diode_on = (RepeaterTile *)(new RepeaterTile(94, true)) ->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_on")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap();
|
||||
Tile::stained_glass = (new StainedGlassBlock(95, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_glass, Item::eMaterial_glass)->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"glass")->setDescriptionId(IDS_TILE_STAINED_GLASS)->setUseDescriptionId(IDS_DESC_STAINED_GLASS);
|
||||
Tile::trapdoor = (new TrapDoorTile(96, Material::wood)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_door, Item::eMaterial_trap)->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"trapdoor")->setDescriptionId(IDS_TILE_TRAPDOOR)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_TRAPDOOR);
|
||||
Tile::monsterStoneEgg = (new StoneMonsterTile(97)) ->setDestroyTime(0.75f)->setIconName(L"monsterStoneEgg")->setDescriptionId(IDS_TILE_STONE_SILVERFISH)->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH);
|
||||
@@ -379,7 +379,7 @@ void Tile::staticCtor()
|
||||
Tile::fenceGate = (new FenceGateTile(107)) ->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"fenceGate")->setDescriptionId(IDS_TILE_FENCE_GATE)->sendTileData()->setUseDescriptionId(IDS_DESC_FENCE_GATE);
|
||||
Tile::stairs_bricks = (new StairTile(108, Tile::redBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_brick) ->setIconName(L"stairsBrick")->setDescriptionId(IDS_TILE_STAIRS_BRICKS) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::stairs_stoneBrickSmooth = (new StairTile(109, Tile::stoneBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stoneSmooth)->setIconName(L"stairsStoneBrickSmooth")->setDescriptionId(IDS_TILE_STAIRS_STONE_BRICKS_SMOOTH) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::mycel = static_cast<MycelTile *>((new MycelTile(110))->setDestroyTime(0.6f)->setSoundType(SOUND_GRASS)->setIconName(L"mycelium")->setDescriptionId(IDS_TILE_MYCEL)->setUseDescriptionId(IDS_DESC_MYCEL));
|
||||
Tile::mycel = (MycelTile *)(new MycelTile(110)) ->setDestroyTime(0.6f)->setSoundType(SOUND_GRASS)->setIconName(L"mycelium")->setDescriptionId(IDS_TILE_MYCEL)->setUseDescriptionId(IDS_DESC_MYCEL);
|
||||
|
||||
Tile::waterLily = (new WaterlilyTile(111)) ->setDestroyTime(0.0f)->setSoundType(SOUND_GRASS)->setIconName(L"waterlily")->setDescriptionId(IDS_TILE_WATERLILY)->setUseDescriptionId(IDS_DESC_WATERLILY);
|
||||
Tile::netherBrick = (new Tile(112, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_netherbrick)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"nether_brick")->setDescriptionId(IDS_TILE_NETHERBRICK)->setUseDescriptionId(IDS_DESC_NETHERBRICK);
|
||||
@@ -388,7 +388,7 @@ void Tile::staticCtor()
|
||||
Tile::netherStalk = (new NetherWartTile(115)) ->setIconName(L"nether_wart")->setDescriptionId(IDS_TILE_NETHERSTALK)->sendTileData()->setUseDescriptionId(IDS_DESC_NETHERSTALK);
|
||||
Tile::enchantTable = (new EnchantmentTableTile(116)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_magic)->setDestroyTime(5.0f)->setExplodeable(2000)->setIconName(L"enchanting_table")->setDescriptionId(IDS_TILE_ENCHANTMENTTABLE)->setUseDescriptionId(IDS_DESC_ENCHANTMENTTABLE);
|
||||
Tile::brewingStand = (new BrewingStandTile(117)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_blaze)->setDestroyTime(0.5f)->setLightEmission(2 / 16.0f)->setIconName(L"brewing_stand")->setDescriptionId(IDS_TILE_BREWINGSTAND)->sendTileData()->setUseDescriptionId(IDS_DESC_BREWING_STAND);
|
||||
Tile::cauldron = static_cast<CauldronTile *>((new CauldronTile(118))->setDestroyTime(2.0f)->setIconName(L"cauldron")->setDescriptionId(IDS_TILE_CAULDRON)->sendTileData()->setUseDescriptionId(IDS_DESC_CAULDRON));
|
||||
Tile::cauldron = (CauldronTile *)(new CauldronTile(118)) ->setDestroyTime(2.0f)->setIconName(L"cauldron")->setDescriptionId(IDS_TILE_CAULDRON)->sendTileData()->setUseDescriptionId(IDS_DESC_CAULDRON);
|
||||
Tile::endPortalTile = (new TheEndPortal(119, Material::portal)) ->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setExplodeable(6000000)->setDescriptionId(IDS_TILE_END_PORTAL)->setUseDescriptionId(IDS_DESC_END_PORTAL);
|
||||
Tile::endPortalFrameTile = (new TheEndPortalFrameTile(120)) ->setSoundType(SOUND_GLASS)->setLightEmission(2 / 16.0f)->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setIconName(L"endframe")->setDescriptionId(IDS_TILE_ENDPORTALFRAME)->sendTileData()->setExplodeable(6000000)->setUseDescriptionId(IDS_DESC_ENDPORTALFRAME);
|
||||
|
||||
@@ -396,22 +396,22 @@ void Tile::staticCtor()
|
||||
Tile::dragonEgg = (new EggTile(122)) ->setDestroyTime(3.0f)->setExplodeable(15)->setSoundType(SOUND_STONE)->setLightEmission(2.0f / 16.0f)->setIconName(L"dragon_egg")->setDescriptionId(IDS_TILE_DRAGONEGG)->setUseDescriptionId(IDS_DESC_DRAGONEGG);
|
||||
Tile::redstoneLight = (new RedlightTile(123, false)) ->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"redstone_lamp_off")->setDescriptionId(IDS_TILE_REDSTONE_LIGHT)->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT);
|
||||
Tile::redstoneLight_lit = (new RedlightTile(124, true)) ->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"redstone_lamp_on")->setDescriptionId(IDS_TILE_REDSTONE_LIGHT)->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT);
|
||||
Tile::woodSlab = static_cast<HalfSlabTile *>((new WoodSlabTile(Tile::woodSlab_Id, true))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB));
|
||||
Tile::woodSlabHalf = static_cast<HalfSlabTile *>((new WoodSlabTile(Tile::woodSlabHalf_Id, false))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB));
|
||||
Tile::woodSlab = (HalfSlabTile *) (new WoodSlabTile(Tile::woodSlab_Id, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB);
|
||||
Tile::woodSlabHalf = (HalfSlabTile *) (new WoodSlabTile(Tile::woodSlabHalf_Id, false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB);
|
||||
Tile::cocoa = (new CocoaTile(127)) ->setDestroyTime(0.2f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"cocoa")->sendTileData()->setDescriptionId(IDS_TILE_COCOA)->setUseDescriptionId(IDS_DESC_COCOA);
|
||||
Tile::stairs_sandstone = (new StairTile(128, Tile::sandStone,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand) ->setIconName(L"stairsSandstone")->setDescriptionId(IDS_TILE_STAIRS_SANDSTONE) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::emeraldOre = (new OreTile(129)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(SOUND_STONE)->setIconName(L"emerald_ore")->setDescriptionId(IDS_TILE_EMERALDORE)->setUseDescriptionId(IDS_DESC_EMERALDORE);
|
||||
Tile::enderChest = (new EnderChestTile(130)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_chest, Item::eMaterial_ender)->setDestroyTime(22.5f)->setExplodeable(1000)->setSoundType(SOUND_STONE)->setIconName(L"enderChest")->sendTileData()->setLightEmission(.5f)->setDescriptionId(IDS_TILE_ENDERCHEST)->setUseDescriptionId(IDS_DESC_ENDERCHEST);
|
||||
|
||||
|
||||
Tile::tripWireSource = static_cast<TripWireSourceTile *>((new TripWireSourceTile(131))->setBaseItemTypeAndMaterial(Item::eBaseItemType_lever, Item::eMaterial_undefined)->setIconName(L"trip_wire_source")->sendTileData()->setDescriptionId(IDS_TILE_TRIPWIRE_SOURCE)->setUseDescriptionId(IDS_DESC_TRIPWIRE_SOURCE));
|
||||
Tile::tripWireSource = (TripWireSourceTile *)( new TripWireSourceTile(131) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_lever, Item::eMaterial_undefined)->setIconName(L"trip_wire_source")->sendTileData()->setDescriptionId(IDS_TILE_TRIPWIRE_SOURCE)->setUseDescriptionId(IDS_DESC_TRIPWIRE_SOURCE);
|
||||
Tile::tripWire = (new TripWireTile(132)) ->setIconName(L"trip_wire")->sendTileData()->setDescriptionId(IDS_TILE_TRIPWIRE)->setUseDescriptionId(IDS_DESC_TRIPWIRE);
|
||||
Tile::emeraldBlock = (new MetalTile(133)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_emerald)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_METAL)->setIconName(L"emerald_block")->setDescriptionId(IDS_TILE_EMERALDBLOCK)->setUseDescriptionId(IDS_DESC_EMERALDBLOCK);
|
||||
Tile::woodStairsDark = (new StairTile(134, Tile::wood, TreeTile::DARK_TRUNK)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sprucewood)->setIconName(L"stairsWoodSpruce")->setDescriptionId(IDS_TILE_STAIRS_SPRUCEWOOD) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::woodStairsBirch = (new StairTile(135, Tile::wood, TreeTile::BIRCH_TRUNK)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_birchwood)->setIconName(L"stairsWoodBirch")->setDescriptionId(IDS_TILE_STAIRS_BIRCHWOOD) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::woodStairsJungle =(new StairTile(136, Tile::wood, TreeTile::JUNGLE_TRUNK))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_junglewood)->setIconName(L"stairsWoodJungle")->setDescriptionId(IDS_TILE_STAIRS_JUNGLEWOOD) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::commandBlock = (new CommandBlock(137)) ->setIndestructible()->setExplodeable(6000000)->setIconName(L"command_block")->setDescriptionId(IDS_TILE_COMMAND_BLOCK)->setUseDescriptionId(IDS_DESC_COMMAND_BLOCK);
|
||||
Tile::beacon = static_cast<BeaconTile *>((new BeaconTile(138))->setLightEmission(1.0f)->setIconName(L"beacon")->setDescriptionId(IDS_TILE_BEACON)->setUseDescriptionId(IDS_DESC_BEACON));
|
||||
Tile::beacon = (BeaconTile *) (new BeaconTile(138)) ->setLightEmission(1.0f)->setIconName(L"beacon")->setDescriptionId(IDS_TILE_BEACON)->setUseDescriptionId(IDS_DESC_BEACON);
|
||||
Tile::cobbleWall = (new WallTile(139, Tile::stoneBrick)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_stone)->setIconName(L"cobbleWall")->setDescriptionId(IDS_TILE_COBBLESTONE_WALL)->setUseDescriptionId(IDS_DESC_COBBLESTONE_WALL);
|
||||
Tile::flowerPot = (new FlowerPotTile(140)) ->setDestroyTime(0.0f)->setSoundType(SOUND_NORMAL)->setIconName(L"flower_pot")->setDescriptionId(IDS_TILE_FLOWERPOT)->setUseDescriptionId(IDS_DESC_FLOWERPOT);
|
||||
|
||||
@@ -423,13 +423,13 @@ void Tile::staticCtor()
|
||||
Tile::chest_trap = (new ChestTile(146, ChestTile::TYPE_TRAP)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_chest, Item::eMaterial_trap)->setDestroyTime(2.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_CHEST_TRAP)->setUseDescriptionId(IDS_DESC_CHEST_TRAP);
|
||||
Tile::weightedPlate_light = (new WeightedPressurePlateTile(147, L"gold_block", Material::metal, Redstone::SIGNAL_MAX)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_gold)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_LIGHT)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_LIGHT);
|
||||
Tile::weightedPlate_heavy = (new WeightedPressurePlateTile(148, L"iron_block", Material::metal, Redstone::SIGNAL_MAX * 10))->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_iron)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_HEAVY)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_HEAVY);
|
||||
Tile::comparator_off = static_cast<ComparatorTile *>((new ComparatorTile(149, false))->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_off")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR));
|
||||
Tile::comparator_on = static_cast<ComparatorTile *>((new ComparatorTile(150, true))->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_on")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR));
|
||||
Tile::comparator_off = (ComparatorTile *) (new ComparatorTile(149, false)) ->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_off")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR);
|
||||
Tile::comparator_on = (ComparatorTile *) (new ComparatorTile(150, true)) ->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_on")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR);
|
||||
|
||||
Tile::daylightDetector = static_cast<DaylightDetectorTile *>((new DaylightDetectorTile(151))->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"daylight_detector")->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR)->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR));
|
||||
Tile::daylightDetector = (DaylightDetectorTile *) (new DaylightDetectorTile(151))->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"daylight_detector")->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR)->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR);
|
||||
Tile::redstoneBlock = (new PoweredMetalTile(152)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_redstone)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_METAL)->setIconName(L"redstone_block")->setDescriptionId(IDS_TILE_REDSTONE_BLOCK)->setUseDescriptionId(IDS_DESC_REDSTONE_BLOCK);
|
||||
Tile::netherQuartz = (new OreTile(153)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(SOUND_STONE)->setIconName(L"quartz_ore")->setDescriptionId(IDS_TILE_NETHER_QUARTZ)->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ_ORE);
|
||||
Tile::hopper = static_cast<HopperTile *>((new HopperTile(154))->setBaseItemTypeAndMaterial(Item::eBaseItemType_redstoneContainer, Item::eMaterial_undefined)->setDestroyTime(3.0f)->setExplodeable(8)->setSoundType(SOUND_WOOD)->setIconName(L"hopper")->setDescriptionId(IDS_TILE_HOPPER)->setUseDescriptionId(IDS_DESC_HOPPER));
|
||||
Tile::hopper = (HopperTile *)(new HopperTile(154)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_redstoneContainer, Item::eMaterial_undefined)->setDestroyTime(3.0f)->setExplodeable(8)->setSoundType(SOUND_WOOD)->setIconName(L"hopper")->setDescriptionId(IDS_TILE_HOPPER)->setUseDescriptionId(IDS_DESC_HOPPER);
|
||||
Tile::quartzBlock = (new QuartzBlockTile(155)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_quartz)->setSoundType(SOUND_STONE)->setDestroyTime(0.8f)->setIconName(L"quartz_block")->setDescriptionId(IDS_TILE_QUARTZ_BLOCK)->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK);
|
||||
Tile::stairs_quartz = (new StairTile(156, Tile::quartzBlock, QuartzBlockTile::TYPE_DEFAULT)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_quartz)->setIconName(L"stairsQuartz")->setDescriptionId(IDS_TILE_STAIRS_QUARTZ)->setUseDescriptionId(IDS_DESC_STAIRS);
|
||||
Tile::activatorRail = (new PoweredRailTile(157)) ->setDestroyTime(0.7f)->setSoundType(SOUND_METAL)->setIconName(L"rail_activator")->setDescriptionId(IDS_TILE_ACTIVATOR_RAIL)->setUseDescriptionId(IDS_DESC_ACTIVATOR_RAIL);
|
||||
@@ -464,7 +464,7 @@ void Tile::staticCtor()
|
||||
Item::items[vine_Id] = ( new ColoredTileItem(Tile::vine_Id - 256, false))->setDescriptionId(IDS_TILE_VINE)->setUseDescriptionId(IDS_DESC_VINE);
|
||||
int idsData[3] = {IDS_TILE_SHRUB, IDS_TILE_TALL_GRASS, IDS_TILE_FERN};
|
||||
intArray ids = intArray(idsData, 3);
|
||||
Item::items[tallgrass_Id] = static_cast<ColoredTileItem *>((new ColoredTileItem(Tile::tallgrass_Id - 256, true))->setDescriptionId(IDS_TILE_TALL_GRASS))->setDescriptionPostfixes(ids);
|
||||
Item::items[tallgrass_Id] = ( (ColoredTileItem *)(new ColoredTileItem(Tile::tallgrass_Id - 256, true))->setDescriptionId(IDS_TILE_TALL_GRASS))->setDescriptionPostfixes(ids);
|
||||
Item::items[topSnow_Id] = ( new SnowItem(topSnow_Id - 256, topSnow) );
|
||||
Item::items[waterLily_Id] = ( new WaterLilyTileItem(Tile::waterLily_Id - 256));
|
||||
Item::items[pistonBase_Id] = ( new PistonTileItem(Tile::pistonBase_Id - 256) )->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(IDS_DESC_PISTON);
|
||||
@@ -475,9 +475,9 @@ void Tile::staticCtor()
|
||||
|
||||
for (int i = 0; i < 256; i++)
|
||||
{
|
||||
if ( Tile::tiles[i] != nullptr )
|
||||
if ( Tile::tiles[i] != NULL )
|
||||
{
|
||||
if( Item::items[i] == nullptr)
|
||||
if( Item::items[i] == NULL)
|
||||
{
|
||||
Item::items[i] = new TileItem(i - 256);
|
||||
Tile::tiles[i]->init();
|
||||
@@ -485,7 +485,7 @@ void Tile::staticCtor()
|
||||
|
||||
bool propagate = false;
|
||||
if (i > 0 && Tile::tiles[i]->getRenderShape() == Tile::SHAPE_STAIRS) propagate = true;
|
||||
if (i > 0 && dynamic_cast<HalfSlabTile *>(Tile::tiles[i]) != nullptr)
|
||||
if (i > 0 && dynamic_cast<HalfSlabTile *>(Tile::tiles[i]) != NULL)
|
||||
{
|
||||
propagate = true;
|
||||
}
|
||||
@@ -549,7 +549,7 @@ Tile::Tile(int id, Material *material, bool isSolidRender)
|
||||
_init(id,material, isSolidRender);
|
||||
m_iMaterial=Item::eMaterial_undefined;
|
||||
m_iBaseItemType=Item::eBaseItemType_undefined;
|
||||
icon = nullptr;
|
||||
icon = NULL;
|
||||
}
|
||||
|
||||
Tile *Tile::sendTileData(unsigned char importantMask/*=15*/)
|
||||
@@ -597,7 +597,7 @@ Tile *Tile::setLightBlock(int i)
|
||||
|
||||
Tile *Tile::setLightEmission(float f)
|
||||
{
|
||||
Tile::lightEmission[id] = static_cast<int>(Level::MAX_BRIGHTNESS * f);
|
||||
Tile::lightEmission[id] = (int) (Level::MAX_BRIGHTNESS * f);
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -610,7 +610,7 @@ Tile *Tile::setExplodeable(float explosionResistance)
|
||||
bool Tile::isSolidBlockingTile(int t)
|
||||
{
|
||||
Tile *tile = Tile::tiles[t];
|
||||
if (tile == nullptr) return false;
|
||||
if (tile == NULL) return false;
|
||||
return tile->material->isSolidBlocking() && tile->isCubeShaped() && !tile->isSignalSource();
|
||||
}
|
||||
|
||||
@@ -671,7 +671,7 @@ Tile *Tile::disableMipmap()
|
||||
|
||||
void Tile::setShape(float x0, float y0, float z0, float x1, float y1, float z1)
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
tls->xx0 = x0;
|
||||
tls->yy0 = y0;
|
||||
tls->zz0 = z0;
|
||||
@@ -721,7 +721,7 @@ bool Tile::isFaceVisible(Level *level, int x, int y, int z, int f)
|
||||
|
||||
bool Tile::shouldRenderFace(LevelSource *level, int x, int y, int z, int face)
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
if (face == 0 && tls->yy0 > 0) return true;
|
||||
@@ -738,7 +738,7 @@ int Tile::getFaceFlags(LevelSource *level, int x, int y, int z)
|
||||
{
|
||||
int faceFlags = 0;
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
|
||||
@@ -779,13 +779,13 @@ Icon *Tile::getTexture(LevelSource *level, int x, int y, int z, int face)
|
||||
for( int i = 0; (i < 6) && opaque; i++ )
|
||||
{
|
||||
int t = level->getTile(x + axo[i], y + ayo[i] , z + azo[i]);
|
||||
if( ( t != Tile::leaves_Id ) && ( ( Tile::tiles[t] == nullptr ) || !Tile::tiles[t]->isSolidRender() ) )
|
||||
if( ( t != Tile::leaves_Id ) && ( ( Tile::tiles[t] == NULL ) || !Tile::tiles[t]->isSolidRender() ) )
|
||||
{
|
||||
opaque = false;
|
||||
}
|
||||
}
|
||||
|
||||
Icon *icon = nullptr;
|
||||
Icon *icon = NULL;
|
||||
if(opaque)
|
||||
{
|
||||
Tile::leaves->setFancy(false);
|
||||
@@ -813,7 +813,7 @@ Icon *Tile::getTexture(int face)
|
||||
|
||||
AABB *Tile::getTileAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1);
|
||||
@@ -822,12 +822,12 @@ AABB *Tile::getTileAABB(Level *level, int x, int y, int z)
|
||||
void Tile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr<Entity> source)
|
||||
{
|
||||
AABB *aabb = getAABB(level, x, y, z);
|
||||
if (aabb != nullptr && box->intersects(aabb)) boxes->push_back(aabb);
|
||||
if (aabb != NULL && box->intersects(aabb)) boxes->push_back(aabb);
|
||||
}
|
||||
|
||||
AABB *Tile::getAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1);
|
||||
@@ -917,7 +917,7 @@ void Tile::spawnResources(Level *level, int x, int y, int z, int data, float odd
|
||||
int type = getResource(data, level->random, playerBonusLevel);
|
||||
if (type <= 0) continue;
|
||||
|
||||
popResource(level, x, y, z, std::make_shared<ItemInstance>(type, 1, getSpawnResourcesAuxValue(data)));
|
||||
popResource(level, x, y, z, shared_ptr<ItemInstance>( new ItemInstance(type, 1, getSpawnResourcesAuxValue(data) ) ) );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -929,7 +929,7 @@ void Tile::popResource(Level *level, int x, int y, int z, shared_ptr<ItemInstanc
|
||||
double xo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
double yo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
double zo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
shared_ptr<ItemEntity> item = std::make_shared<ItemEntity>(level, x + xo, y + yo, z + zo, itemInstance);
|
||||
shared_ptr<ItemEntity> item = shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, itemInstance ) );
|
||||
item->throwTime = 10;
|
||||
level->addEntity(item);
|
||||
}
|
||||
@@ -943,7 +943,7 @@ void Tile::popExperience(Level *level, int x, int y, int z, int amount)
|
||||
{
|
||||
int newCount = ExperienceOrb::getExperienceValue(amount);
|
||||
amount -= newCount;
|
||||
level->addEntity(std::make_shared<ExperienceOrb>(level, x + .5, y + .5, z + .5, newCount));
|
||||
level->addEntity(shared_ptr<ExperienceOrb>( new ExperienceOrb(level, x + .5, y + .5, z + .5, newCount)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -965,7 +965,7 @@ HitResult *Tile::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *b)
|
||||
a = a->add(-xt, -yt, -zt);
|
||||
b = b->add(-xt, -yt, -zt);
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
Vec3 *xh0 = a->clipX(b, tls->xx0);
|
||||
Vec3 *xh1 = a->clipX(b, tls->xx1);
|
||||
|
||||
@@ -975,16 +975,16 @@ HitResult *Tile::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *b)
|
||||
Vec3 *zh0 = a->clipZ(b, tls->zz0);
|
||||
Vec3 *zh1 = a->clipZ(b, tls->zz1);
|
||||
|
||||
Vec3 *closest = nullptr;
|
||||
Vec3 *closest = NULL;
|
||||
|
||||
if (containsX(xh0) && (closest == nullptr || a->distanceToSqr(xh0) < a->distanceToSqr(closest))) closest = xh0;
|
||||
if (containsX(xh1) && (closest == nullptr || a->distanceToSqr(xh1) < a->distanceToSqr(closest))) closest = xh1;
|
||||
if (containsY(yh0) && (closest == nullptr || a->distanceToSqr(yh0) < a->distanceToSqr(closest))) closest = yh0;
|
||||
if (containsY(yh1) && (closest == nullptr || a->distanceToSqr(yh1) < a->distanceToSqr(closest))) closest = yh1;
|
||||
if (containsZ(zh0) && (closest == nullptr || a->distanceToSqr(zh0) < a->distanceToSqr(closest))) closest = zh0;
|
||||
if (containsZ(zh1) && (closest == nullptr || a->distanceToSqr(zh1) < a->distanceToSqr(closest))) closest = zh1;
|
||||
if (containsX(xh0) && (closest == NULL || a->distanceToSqr(xh0) < a->distanceToSqr(closest))) closest = xh0;
|
||||
if (containsX(xh1) && (closest == NULL || a->distanceToSqr(xh1) < a->distanceToSqr(closest))) closest = xh1;
|
||||
if (containsY(yh0) && (closest == NULL || a->distanceToSqr(yh0) < a->distanceToSqr(closest))) closest = yh0;
|
||||
if (containsY(yh1) && (closest == NULL || a->distanceToSqr(yh1) < a->distanceToSqr(closest))) closest = yh1;
|
||||
if (containsZ(zh0) && (closest == NULL || a->distanceToSqr(zh0) < a->distanceToSqr(closest))) closest = zh0;
|
||||
if (containsZ(zh1) && (closest == NULL || a->distanceToSqr(zh1) < a->distanceToSqr(closest))) closest = zh1;
|
||||
|
||||
if (closest == nullptr) return nullptr;
|
||||
if (closest == NULL) return NULL;
|
||||
|
||||
int face = -1;
|
||||
|
||||
@@ -1000,9 +1000,9 @@ HitResult *Tile::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *b)
|
||||
|
||||
bool Tile::containsX(Vec3 *v)
|
||||
{
|
||||
if( v == nullptr) return false;
|
||||
if( v == NULL) return false;
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return v->y >= tls->yy0 && v->y <= tls->yy1 && v->z >= tls->zz0 && v->z <= tls->zz1;
|
||||
@@ -1010,9 +1010,9 @@ bool Tile::containsX(Vec3 *v)
|
||||
|
||||
bool Tile::containsY(Vec3 *v)
|
||||
{
|
||||
if( v == nullptr) return false;
|
||||
if( v == NULL) return false;
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return v->x >= tls->xx0 && v->x <= tls->xx1 && v->z >= tls->zz0 && v->z <= tls->zz1;
|
||||
@@ -1020,9 +1020,9 @@ bool Tile::containsY(Vec3 *v)
|
||||
|
||||
bool Tile::containsZ(Vec3 *v)
|
||||
{
|
||||
if( v == nullptr) return false;
|
||||
if( v == NULL) return false;
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return v->x >= tls->xx0 && v->x <= tls->xx1 && v->y >= tls->yy0 && v->y <= tls->yy1;
|
||||
@@ -1092,14 +1092,14 @@ void Tile::handleEntityInside(Level *level, int x, int y, int z, shared_ptr<Enti
|
||||
|
||||
void Tile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
}
|
||||
|
||||
double Tile::getShapeX0()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->xx0;
|
||||
@@ -1107,7 +1107,7 @@ double Tile::getShapeX0()
|
||||
|
||||
double Tile::getShapeX1()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->xx1;
|
||||
@@ -1115,7 +1115,7 @@ double Tile::getShapeX1()
|
||||
|
||||
double Tile::getShapeY0()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->yy0;
|
||||
@@ -1123,7 +1123,7 @@ double Tile::getShapeY0()
|
||||
|
||||
double Tile::getShapeY1()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->yy1;
|
||||
@@ -1131,7 +1131,7 @@ double Tile::getShapeY1()
|
||||
|
||||
double Tile::getShapeZ0()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->zz0;
|
||||
@@ -1139,7 +1139,7 @@ double Tile::getShapeZ0()
|
||||
|
||||
double Tile::getShapeZ1()
|
||||
{
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
// 4J Stu - Added this so that the TLS shape is correct for this tile
|
||||
if(tls->tileId != this->id) updateDefaultShape();
|
||||
return tls->zz1;
|
||||
@@ -1194,7 +1194,7 @@ void Tile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y,
|
||||
// 4J Stu - Special case - only record a crop destroy if is fully grown
|
||||
if( id==Tile::wheat_Id )
|
||||
{
|
||||
if( Tile::wheat->getResource(data, nullptr, 0) > 0 )
|
||||
if( Tile::wheat->getResource(data, NULL, 0) > 0 )
|
||||
player->awardStat(
|
||||
GenericStats::blocksMined(id),
|
||||
GenericStats::param_blocksMined(id,data,1)
|
||||
@@ -1202,7 +1202,7 @@ void Tile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y,
|
||||
}
|
||||
else if (id == Tile::potatoes_Id)
|
||||
{
|
||||
if (Tile::potatoes->getResource(data, nullptr, 0) > 0)
|
||||
if (Tile::potatoes->getResource(data, NULL, 0) > 0)
|
||||
player->awardStat(
|
||||
GenericStats::blocksMined(id),
|
||||
GenericStats::param_blocksMined(id,data,1)
|
||||
@@ -1210,7 +1210,7 @@ void Tile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y,
|
||||
}
|
||||
else if (id == Tile::carrots_Id)
|
||||
{
|
||||
if (Tile::potatoes->getResource(data, nullptr, 0) > 0)
|
||||
if (Tile::potatoes->getResource(data, NULL, 0) > 0)
|
||||
player->awardStat(
|
||||
GenericStats::blocksMined(id),
|
||||
GenericStats::param_blocksMined(id,data,1)
|
||||
@@ -1233,7 +1233,7 @@ void Tile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y,
|
||||
if (isSilkTouchable() && EnchantmentHelper::hasSilkTouch(player))
|
||||
{
|
||||
shared_ptr<ItemInstance> item = getSilkTouchItemInstance(data);
|
||||
if (item != nullptr)
|
||||
if (item != NULL)
|
||||
{
|
||||
popResource(level, x, y, z, item);
|
||||
}
|
||||
@@ -1257,7 +1257,7 @@ shared_ptr<ItemInstance> Tile::getSilkTouchItemInstance(int data)
|
||||
{
|
||||
popData = data;
|
||||
}
|
||||
return std::make_shared<ItemInstance>(id, 1, popData);
|
||||
return shared_ptr<ItemInstance>(new ItemInstance(id, 1, popData));
|
||||
}
|
||||
|
||||
int Tile::getResourceCountForLootBonus(int bonusLevel, Random *random)
|
||||
@@ -1388,7 +1388,7 @@ bool Tile::isMatching(int tileIdA, int tileIdB)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (tileIdA == 0 || tileIdB == 0 || tiles[tileIdA] == nullptr || tiles[tileIdB] == nullptr)
|
||||
if (tileIdA == 0 || tileIdB == 0 || tiles[tileIdA] == NULL || tiles[tileIdB] == NULL)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user