AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 12:05:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Inventory in classic+hax mode should be the same as classic mode

Browse Source 
This also matches how it appears in original classic and WoM
This commit is contained in:
UnknownShadow200 2020-03-10 19:40:37 +11:00
parent 19c4583188
commit a04e0104f9
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Inventory.c
View File

@ -76,19 +76,10 @@ static const cc_uint8 classicInventory[42] = {
BLOCK_INDIGO, BLOCK_VIOLET, BLOCK_MAGENTA, BLOCK_PINK, BLOCK_BLACK, BLOCK_GRAY, BLOCK_WHITE, BLOCK_COAL_ORE, BLOCK_IRON_ORE, BLOCK_INDIGO, BLOCK_VIOLET, BLOCK_MAGENTA, BLOCK_PINK, BLOCK_BLACK, BLOCK_GRAY, BLOCK_WHITE, BLOCK_COAL_ORE, BLOCK_IRON_ORE,
BLOCK_GOLD_ORE, BLOCK_IRON, BLOCK_GOLD, BLOCK_BOOKSHELF, BLOCK_TNT, BLOCK_OBSIDIAN, BLOCK_GOLD_ORE, BLOCK_IRON, BLOCK_GOLD, BLOCK_BOOKSHELF, BLOCK_TNT, BLOCK_OBSIDIAN,
}; };
static const cc_uint8 classicHacksInventory[49] = {
BLOCK_STONE, BLOCK_GRASS, BLOCK_COBBLE, BLOCK_BRICK, BLOCK_DIRT, BLOCK_WOOD, BLOCK_BEDROCK, BLOCK_WATER, BLOCK_STILL_WATER, BLOCK_LAVA,
BLOCK_STILL_LAVA, BLOCK_LOG, BLOCK_LEAVES, BLOCK_GLASS, BLOCK_SLAB, BLOCK_MOSSY_ROCKS, BLOCK_SAPLING, BLOCK_DANDELION, BLOCK_ROSE, BLOCK_BROWN_SHROOM,
BLOCK_RED_SHROOM, BLOCK_SAND, BLOCK_GRAVEL, BLOCK_SPONGE, BLOCK_RED, BLOCK_ORANGE, BLOCK_YELLOW, BLOCK_LIME, BLOCK_GREEN, BLOCK_TEAL,
BLOCK_AQUA, BLOCK_CYAN, BLOCK_BLUE, BLOCK_INDIGO, BLOCK_VIOLET, BLOCK_MAGENTA, BLOCK_PINK, BLOCK_BLACK, BLOCK_GRAY, BLOCK_WHITE,
BLOCK_COAL_ORE, BLOCK_IRON_ORE, BLOCK_GOLD_ORE, BLOCK_DOUBLE_SLAB, BLOCK_IRON, BLOCK_GOLD, BLOCK_BOOKSHELF, BLOCK_TNT, BLOCK_OBSIDIAN,
};
static BlockID Inventory_DefaultMapping(int slot) { static BlockID Inventory_DefaultMapping(int slot) {
if (Game_PureClassic) { if (Game_ClassicMode) {
if (slot < 9 * 4 + 6) return classicInventory[slot]; if (slot < 9 * 4 + 6) return classicInventory[slot];
} else if (Game_ClassicMode) {
if (slot < 10 * 4 + 9) return classicHacksInventory[slot];
}else if (slot < BLOCK_MAX_CPE) { }else if (slot < BLOCK_MAX_CPE) {
return (BlockID)(slot + 1); return (BlockID)(slot + 1);
} }
@ -134,6 +125,7 @@ static void Inventory_Reset(void) {
static void Inventory_Init(void) { static void Inventory_Init(void) {
BlockID* inv = Inventory.Table; BlockID* inv = Inventory.Table;
Inventory_Reset(); Inventory_Reset();
Inventory.BlocksPerRow = Game_ClassicMode ? 9 : 10;
inv[0] = BLOCK_STONE; inv[1] = BLOCK_COBBLE; inv[2] = BLOCK_BRICK; inv[0] = BLOCK_STONE; inv[1] = BLOCK_COBBLE; inv[2] = BLOCK_BRICK;
inv[3] = BLOCK_DIRT; inv[4] = BLOCK_WOOD; inv[5] = BLOCK_LOG; inv[3] = BLOCK_DIRT; inv[4] = BLOCK_WOOD; inv[5] = BLOCK_LOG;

2
src/Inventory.h
View File

@ -25,6 +25,8 @@ CC_VAR extern struct _InventoryData {
int Offset; int Offset;
/* Whether the user is allowed to change selected/held block. */ /* Whether the user is allowed to change selected/held block. */
cc_bool CanChangeSelected; cc_bool CanChangeSelected;
/* Number of blocks in each row in inventory menu. */
cc_uint8 BlocksPerRow;
} Inventory; } Inventory;
/* Gets the block at the nth index in the current hotbar. */ /* Gets the block at the nth index in the current hotbar. */

2
src/Screens.c
View File

@ -1070,7 +1070,7 @@ static void InventoryScreen_Init(void* screen) {
TableWidget_Create(&s->table); TableWidget_Create(&s->table);
s->table.font = &s->font; s->table.font = &s->font;
s->table.blocksPerRow = Game_PureClassic ? 9 : 10; s->table.blocksPerRow = Inventory.BlocksPerRow;
TableWidget_RecreateBlocks(&s->table); TableWidget_RecreateBlocks(&s->table);
/* Can't immediately move to selected here, because cursor grabbed */ /* Can't immediately move to selected here, because cursor grabbed */