wip_feat(PS3): Implement SPU variants for a portion of TU19's blocks
crashes at a stack overflow, cant be assed to fix it atm
This commit is contained in:
@@ -129,8 +129,14 @@ public:
|
||||
Icon_SPU dispenserTile_iconFront;
|
||||
Icon_SPU dispenserTile_iconFrontVertical;
|
||||
|
||||
Icon_SPU dropperTile_iconFront;
|
||||
Icon_SPU dropperTile_iconFrontVertical;
|
||||
|
||||
Icon_SPU railTile_iconTurn;
|
||||
Icon_SPU railTile_iconTurnGolden;
|
||||
Icon_SPU poweredRailTile_icon;
|
||||
Icon_SPU poweredRailTile_iconPowered;
|
||||
Icon_SPU activatorRailTile_icon;
|
||||
Icon_SPU activatorRailTile_iconPowered;
|
||||
|
||||
Icon_SPU detectorRailTile_icons[2];
|
||||
|
||||
@@ -178,7 +184,7 @@ public:
|
||||
Icon_SPU redStoneDust_iconCrossOver;
|
||||
Icon_SPU redStoneDust_iconLineOver;
|
||||
|
||||
Icon_SPU clothTile_icons[16];
|
||||
Icon_SPU woolTile_icons[16];
|
||||
|
||||
Icon_SPU stoneSlab_iconSide;
|
||||
|
||||
@@ -193,6 +199,12 @@ public:
|
||||
Icon_SPU quartzBlock_iconTop;
|
||||
Icon_SPU quartzBlock_iconBottom;
|
||||
|
||||
Icon_SPU clayHardened_colored_icons[16];
|
||||
Icon_SPU hayBlockTile_icon;
|
||||
Icon_SPU hayBlockTile_iconTop;
|
||||
|
||||
Icon_SPU daylightDetector_icons[2];
|
||||
|
||||
|
||||
int anvilPart; // normally part of the AnvilTile class
|
||||
|
||||
@@ -296,19 +308,24 @@ public:
|
||||
static const int SHAPE_FLOWER_POT = 33;
|
||||
static const int SHAPE_BEACON = 34;
|
||||
static const int SHAPE_ANVIL = 35;
|
||||
static const int SHAPE_HOPPER = 38;
|
||||
static const int SHAPE_QUARTZ = 39;
|
||||
static const int SHAPE_THIN_PANE = 40;
|
||||
|
||||
static const int SHAPE_COUNT = 41;
|
||||
|
||||
// 4J - this array of simple constants made so the compiler can optimise references to Ids that were previous of the form Tile_SPU::<whatever>->id, and are now simply Tile_SPU::whatever_Id
|
||||
static const int rock_Id = 1;
|
||||
static const int stone_Id = 1;
|
||||
static const int grass_Id = 2;
|
||||
static const int dirt_Id = 3;
|
||||
static const int stoneBrick_Id = 4;
|
||||
static const int cobblestone_Id = 4;
|
||||
static const int wood_Id = 5;
|
||||
static const int sapling_Id = 6;
|
||||
static const int unbreakable_Id = 7;
|
||||
static const int water_Id = 8;
|
||||
static const int calmWater_Id = 9;
|
||||
static const int lava_Id = 10;
|
||||
|
||||
static const int calmLava_Id = 11;
|
||||
static const int sand_Id = 12;
|
||||
static const int gravel_Id = 13;
|
||||
@@ -319,26 +336,29 @@ public:
|
||||
static const int leaves_Id = 18;
|
||||
static const int sponge_Id = 19;
|
||||
static const int glass_Id = 20;
|
||||
|
||||
static const int lapisOre_Id = 21;
|
||||
static const int lapisBlock_Id = 22;
|
||||
static const int dispenser_Id = 23;
|
||||
static const int sandStone_Id = 24;
|
||||
static const int musicBlock_Id = 25;
|
||||
static const int noteblock_Id = 25;
|
||||
static const int bed_Id = 26;
|
||||
static const int goldenRail_Id = 27;
|
||||
static const int detectorRail_Id = 28;
|
||||
static const int pistonStickyBase_Id = 29;
|
||||
static const int web_Id = 30;
|
||||
|
||||
static const int tallgrass_Id = 31;
|
||||
static const int deadBush_Id = 32;
|
||||
static const int pistonBase_Id = 33;
|
||||
static const int pistonExtensionPiece_Id = 34;
|
||||
static const int cloth_Id = 35;
|
||||
static const int wool_Id = 35;
|
||||
static const int pistonMovingPiece_Id = 36;
|
||||
static const int flower_Id = 37;
|
||||
static const int rose_Id = 38;
|
||||
static const int mushroom1_Id = 39;
|
||||
static const int mushroom2_Id = 40;
|
||||
static const int mushroom_brown_Id = 39;
|
||||
static const int mushroom_red_Id = 40;
|
||||
|
||||
static const int goldBlock_Id = 41;
|
||||
static const int ironBlock_Id = 42;
|
||||
static const int stoneSlab_Id = 43;
|
||||
@@ -346,9 +366,10 @@ public:
|
||||
static const int redBrick_Id = 45;
|
||||
static const int tnt_Id = 46;
|
||||
static const int bookshelf_Id = 47;
|
||||
static const int mossStone_Id = 48;
|
||||
static const int mossyCobblestone_Id = 48;
|
||||
static const int obsidian_Id = 49;
|
||||
static const int torch_Id = 50;
|
||||
|
||||
static const int fire_Id = 51;
|
||||
static const int mobSpawner_Id = 52;
|
||||
static const int stairs_wood_Id = 53;
|
||||
@@ -357,8 +378,9 @@ public:
|
||||
static const int diamondOre_Id = 56;
|
||||
static const int diamondBlock_Id = 57;
|
||||
static const int workBench_Id = 58;
|
||||
static const int crops_Id = 59;
|
||||
static const int wheat_Id = 59;
|
||||
static const int farmland_Id = 60;
|
||||
|
||||
static const int furnace_Id = 61;
|
||||
static const int furnace_lit_Id = 62;
|
||||
static const int sign_Id = 63;
|
||||
@@ -369,37 +391,40 @@ public:
|
||||
static const int wallSign_Id = 68;
|
||||
static const int lever_Id = 69;
|
||||
static const int pressurePlate_stone_Id = 70;
|
||||
|
||||
static const int door_iron_Id = 71;
|
||||
static const int pressurePlate_wood_Id = 72;
|
||||
static const int redStoneOre_Id = 73;
|
||||
static const int redStoneOre_lit_Id = 74;
|
||||
static const int notGate_off_Id = 75;
|
||||
static const int notGate_on_Id = 76;
|
||||
static const int redstoneTorch_off_Id = 75;
|
||||
static const int redstoneTorch_on_Id = 76;
|
||||
static const int button_stone_Id = 77;
|
||||
static const int topSnow_Id = 78;
|
||||
static const int ice_Id = 79;
|
||||
static const int snow_Id = 80;
|
||||
|
||||
static const int cactus_Id = 81;
|
||||
static const int clay_Id = 82;
|
||||
static const int reeds_Id = 83;
|
||||
static const int recordPlayer_Id = 84;
|
||||
static const int jukebox_Id = 84;
|
||||
static const int fence_Id = 85;
|
||||
static const int pumpkin_Id = 86;
|
||||
static const int hellRock_Id = 87;
|
||||
static const int hellSand_Id = 88;
|
||||
static const int lightGem_Id = 89;
|
||||
static const int netherRack_Id = 87;
|
||||
static const int soulsand_Id = 88;
|
||||
static const int glowstone_Id = 89;
|
||||
static const int portalTile_Id = 90;
|
||||
|
||||
static const int litPumpkin_Id = 91;
|
||||
static const int cake_Id = 92;
|
||||
static const int diode_off_Id = 93;
|
||||
static const int diode_on_Id = 94;
|
||||
static const int aprilFoolsJoke_Id = 95;
|
||||
static const int stained_glass_Id = 95;
|
||||
static const int trapdoor_Id = 96;
|
||||
|
||||
static const int monsterStoneEgg_Id = 97;
|
||||
static const int stoneBrickSmooth_Id = 98;
|
||||
static const int hugeMushroom1_Id = 99;
|
||||
static const int hugeMushroom2_Id = 100;
|
||||
static const int stoneBrick_Id = 98;
|
||||
static const int hugeMushroom_brown_Id = 99;
|
||||
static const int hugeMushroom_red_Id = 100;
|
||||
|
||||
static const int ironFence_Id = 101;
|
||||
static const int thinGlass_Id = 102;
|
||||
static const int melon_Id = 103;
|
||||
@@ -408,9 +433,9 @@ public:
|
||||
static const int vine_Id = 106;
|
||||
static const int fenceGate_Id = 107;
|
||||
static const int stairs_bricks_Id = 108;
|
||||
static const int stairs_stoneBrickSmooth_Id = 109;
|
||||
|
||||
static const int stairs_stoneBrick_Id = 109;
|
||||
static const int mycel_Id = 110;
|
||||
|
||||
static const int waterLily_Id = 111;
|
||||
static const int netherBrick_Id = 112;
|
||||
static const int netherFence_Id = 113;
|
||||
@@ -421,36 +446,55 @@ public:
|
||||
static const int cauldron_Id = 118;
|
||||
static const int endPortalTile_Id = 119;
|
||||
static const int endPortalFrameTile_Id = 120;
|
||||
static const int whiteStone_Id = 121;
|
||||
|
||||
static const int endStone_Id = 121;
|
||||
static const int dragonEgg_Id = 122;
|
||||
static const int redstoneLight_Id = 123;
|
||||
static const int redstoneLight_lit_Id = 124;
|
||||
|
||||
|
||||
static const int woodSlab_Id = 125;
|
||||
static const int woodSlabHalf_Id = 126;
|
||||
static const int cocoa_Id = 127;
|
||||
static const int stairs_sandstone_Id = 128;
|
||||
static const int stairs_sprucewood_Id = 134;
|
||||
static const int stairs_birchwood_Id = 135;
|
||||
static const int stairs_junglewood_Id = 136;
|
||||
static const int emeraldOre_Id = 129;
|
||||
static const int enderChest_Id = 130;
|
||||
|
||||
static const int tripWireSource_Id = 131;
|
||||
static const int tripWire_Id = 132;
|
||||
static const int emeraldBlock_Id = 133;
|
||||
|
||||
static const int stairs_sprucewood_Id = 134;
|
||||
static const int stairs_birchwood_Id = 135;
|
||||
static const int stairs_junglewood_Id = 136;
|
||||
static const int commandBlock_Id = 137;
|
||||
static const int beacon_Id = 138;
|
||||
static const int cobbleWall_Id = 139;
|
||||
static const int flowerPot_Id = 140;
|
||||
|
||||
static const int carrots_Id = 141;
|
||||
static const int potatoes_Id = 142;
|
||||
static const int anvil_Id = 145;
|
||||
static const int button_wood_Id = 143;
|
||||
static const int skull_Id = 144;
|
||||
static const int anvil_Id = 145;
|
||||
static const int chest_trap_Id = 146;
|
||||
static const int weightedPlate_light_Id = 147;
|
||||
static const int weightedPlate_heavy_Id = 148;
|
||||
static const int comparator_off_Id = 149;
|
||||
static const int comparator_on_Id = 150;
|
||||
|
||||
static const int daylightDetector_Id = 151;
|
||||
static const int redstoneBlock_Id = 152;
|
||||
static const int netherQuartz_Id = 153;
|
||||
static const int hopper_Id = 154;
|
||||
static const int quartzBlock_Id = 155;
|
||||
static const int stairs_quartz_Id = 156;
|
||||
static const int activatorRail_Id = 157;
|
||||
static const int dropper_Id = 158;
|
||||
static const int clayHardened_colored_Id = 159;
|
||||
static const int stained_glass_pane_Id = 160;
|
||||
|
||||
static const int hayBlock_Id = 170;
|
||||
static const int woolCarpet_Id = 171;
|
||||
static const int clayHardened_Id = 172;
|
||||
static const int coalBlock_Id = 173;
|
||||
|
||||
static Tile_SPU m_tiles[256];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user