KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type in extract_common.py (BzTileID)

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-01-06 19:55:40 +01:00
parent f667614cfe
commit 114a464c95
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
game/game_tileset.h
View File

@@ -279,7 +279,7 @@ static BuildingType getTileBuilding(BzTileID tile) {
} }
} }
static BuildingType getBuildingTile(BuildingType type) { static BzTileID getBuildingTile(BuildingType type) {
switch (type) { switch (type) {
case BUILDING_KEEP: return 5892; case BUILDING_KEEP: return 5892;
default: return -1; default: return -1;
@@ -332,7 +332,7 @@ typedef enum AnimType {
ANIM_NONE, ANIM_NONE,
} AnimType; } AnimType;
static EntityType getEntityTile(EntityType type) { static BzTileID getEntityTile(EntityType type) {
switch (type) { switch (type) {
case ENTITY_WORKER: return 27; case ENTITY_WORKER: return 27;
case ENTITY_WOOD: return 7424; case ENTITY_WOOD: return 7424;
@@ -418,7 +418,7 @@ typedef enum ItemType {
ITEM_NONE, ITEM_NONE,
} ItemType; } ItemType;
static ItemType getItemTile(ItemType type) { static BzTileID getItemTile(ItemType type) {
switch (type) { switch (type) {
case ITEM_STAFF: return 7680; case ITEM_STAFF: return 7680;
case ITEM_PICKAXE: return 7681; case ITEM_PICKAXE: return 7681;

2
scripts/extract_common.py
View File

@@ -173,7 +173,7 @@ class EnumWriter:
def output_enum_to_tile(self, func_name): def output_enum_to_tile(self, func_name):
writer = self.writer writer = self.writer
writer.output(f"static {self.enum_type} {func_name}({self.enum_type} type) ") writer.output(f"static BzTileID {func_name}({self.enum_type} type) ")
writer.block_start() writer.block_start()
writer.output("switch (type) ") writer.output("switch (type) ")