Proper building detection
This commit is contained in:
@@ -27,7 +27,7 @@ typedef enum BUILDINGS {
|
||||
} BUILDINGS;
|
||||
|
||||
|
||||
static bool getTileBuilding(BzTile tile) {
|
||||
static BUILDINGS getTileBuilding(BzTile tile) {
|
||||
switch (tile) {
|
||||
case 0:
|
||||
case 1:
|
||||
@@ -47,6 +47,8 @@ static bool getTileBuilding(BzTile tile) {
|
||||
return BUILDINGS_WAREHOUSE;
|
||||
case 6:
|
||||
case 7:
|
||||
case 38:
|
||||
case 39:
|
||||
return BUILDINGS_MINE;
|
||||
case 8:
|
||||
case 9:
|
||||
@@ -93,22 +95,99 @@ static bool getTileBuilding(BzTile tile) {
|
||||
}
|
||||
|
||||
static BUILDINGS getBuildingFromStr(const char *str) {
|
||||
if (strncmp("keep", str, 4)) return BUILDINGS_KEEP;
|
||||
if (strncmp("granary", str, 7)) return BUILDINGS_GRANARY;
|
||||
if (strncmp("armory", str, 6)) return BUILDINGS_ARMORY;
|
||||
if (strncmp("warehouse", str, 9)) return BUILDINGS_WAREHOUSE;
|
||||
if (strncmp("mine", str, 4)) return BUILDINGS_MINE;
|
||||
if (strncmp("baracks", str, 7)) return BUILDINGS_BARACKS;
|
||||
if (strncmp("orchard", str, 7)) return BUILDINGS_ORCHARD;
|
||||
if (strncmp("animal_farm", str, 11)) return BUILDINGS_ANIMAL_FARM;
|
||||
if (strncmp("fletcher", str, 8)) return BUILDINGS_FLETCHER;
|
||||
if (strncmp("smithy", str, 6)) return BUILDINGS_SMITHY;
|
||||
if (strncmp("workshop", str, 8)) return BUILDINGS_WORKSHOP;
|
||||
if (strncmp("farm", str, 4)) return BUILDINGS_FARM;
|
||||
if (strncmp("road", str, 4)) return BUILDINGS_ROAD;
|
||||
if (strncmp("wall", str, 4)) return BUILDINGS_WALL;
|
||||
if (strncmp("gatehouse", str, 9)) return BUILDINGS_GATEHOUSE;
|
||||
if (strncmp("tower", str, 5)) return BUILDINGS_TOWER;
|
||||
if (strncmp("small_tower", str, 11)) return BUILDINGS_SMALL_TOWER;
|
||||
if (strncmp("keep", str, 4) == 0) return BUILDINGS_KEEP;
|
||||
if (strncmp("granary", str, 7) == 0) return BUILDINGS_GRANARY;
|
||||
if (strncmp("armory", str, 6) == 0) return BUILDINGS_ARMORY;
|
||||
if (strncmp("warehouse", str, 9) == 0) return BUILDINGS_WAREHOUSE;
|
||||
if (strncmp("mine", str, 4) == 0) return BUILDINGS_MINE;
|
||||
if (strncmp("baracks", str, 7) == 0) return BUILDINGS_BARACKS;
|
||||
if (strncmp("orchard", str, 7) == 0) return BUILDINGS_ORCHARD;
|
||||
if (strncmp("animal_farm", str, 11) == 0) return BUILDINGS_ANIMAL_FARM;
|
||||
if (strncmp("fletcher", str, 8) == 0) return BUILDINGS_FLETCHER;
|
||||
if (strncmp("smithy", str, 6) == 0) return BUILDINGS_SMITHY;
|
||||
if (strncmp("workshop", str, 8) == 0) return BUILDINGS_WORKSHOP;
|
||||
if (strncmp("farm", str, 4) == 0) return BUILDINGS_FARM;
|
||||
if (strncmp("road", str, 4) == 0) return BUILDINGS_ROAD;
|
||||
if (strncmp("wall", str, 4) == 0) return BUILDINGS_WALL;
|
||||
if (strncmp("gatehouse", str, 9) == 0) return BUILDINGS_GATEHOUSE;
|
||||
if (strncmp("tower", str, 5) == 0) return BUILDINGS_TOWER;
|
||||
if (strncmp("small_tower", str, 11) == 0) return BUILDINGS_SMALL_TOWER;
|
||||
else return BUILDINGS_NONE;
|
||||
}
|
||||
static void getBuildingSize(BUILDINGS type, BzTile *outWidth, BzTile *outHeight) {
|
||||
switch (type) {
|
||||
case BUILDINGS_KEEP:
|
||||
if (outWidth) *outWidth = 3;
|
||||
if (outHeight) *outHeight = 3;
|
||||
break;
|
||||
case BUILDINGS_GRANARY:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_ARMORY:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_WAREHOUSE:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_MINE:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 2;
|
||||
break;
|
||||
case BUILDINGS_BARACKS:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 2;
|
||||
break;
|
||||
case BUILDINGS_ORCHARD:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 2;
|
||||
break;
|
||||
case BUILDINGS_ANIMAL_FARM:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 2;
|
||||
break;
|
||||
case BUILDINGS_FLETCHER:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_SMITHY:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_WORKSHOP:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_FARM:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_ROAD:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_WALL:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_GATEHOUSE:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
case BUILDINGS_TOWER:
|
||||
if (outWidth) *outWidth = 2;
|
||||
if (outHeight) *outHeight = 2;
|
||||
break;
|
||||
case BUILDINGS_SMALL_TOWER:
|
||||
if (outWidth) *outWidth = 1;
|
||||
if (outHeight) *outHeight = 1;
|
||||
break;
|
||||
default:
|
||||
if (outWidth) *outWidth = 0;
|
||||
if (outHeight) *outHeight = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user