Skip to content

Commit 95aa827

Browse files
author
s.kushnirenko
committed
images: add image definition for IMG_PERSONAL_MANSION
what: + remove unused building_properties entry for GROUP_BUILDING_GOVERNORS_HOUSE
1 parent 710f7c3 commit 95aa827

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

src/building/properties.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static building_properties properties[400] = {
8383
{3, 0, GROUP_BUILDING_SHIPYARD}, // shipwright
8484
{3, 0, GROUP_BUILDING_DOCK}, // dock
8585
{2, 0, GROUP_BUILDING_FISHING_WHARF}, // wharf (fish)
86-
{3, 0, GROUP_BUILDING_GOVERNORS_HOUSE},
86+
{3, 0, 0, 0},
8787
{4, 0, GROUP_BUILDING_GOVERNORS_VILLA},
8888
{5, 0, GROUP_BUILDING_GOVERNORS_PALACE}, // mansions ^^^
8989
{2, 1, 0, 0},
@@ -265,6 +265,7 @@ void building_properties_init() {
265265
properties[BUILDING_BRICKLAYERS_GUILD] = {2, 0, 0, 0, 0, IMG_BRICKLAYERS_GUILD};
266266
properties[BUILDING_FIREHOUSE] = {1, 0, 0, 0, 0, IMG_BUILDING_FIREHOUSE};
267267
properties[BUILDING_APOTHECARY] = {1, 0, 0, 0, 0, IMG_BUILDING_APOTHECARY};
268+
properties[BUILDING_PERSONAL_MANSION] = {3, 0, 0, 0, 0, IMG_PERSONAL_MANSION};
268269
}
269270

270271
const building_properties* building_properties_for_type(e_building_type type) {

src/graphics/image_groups.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ enum e_pack {
151151
#define GROUP_BUILDING_STORAGE_YARD PACK_GENERAL, 82
152152
#define GROUP_BUILDING_STORAGE_YARD_SPACE_EMPTY PACK_GENERAL, 83
153153
#define GROUP_BUILDING_STORAGE_YARD_SPACE_FILLED PACK_GENERAL, 84
154-
#define GROUP_BUILDING_GOVERNORS_HOUSE PACK_GENERAL, 85
154+
//#define GROUP_BUILDING_GOVERNORS_HOUSE PACK_GENERAL, 85
155155
#define GROUP_BUILDING_GOVERNORS_VILLA PACK_GENERAL, 86
156156
#define GROUP_BUILDING_GOVERNORS_PALACE PACK_GENERAL, 87
157157
#define GROUP_SIDEBAR_BRIEFING_ROTATE_BUTTONS PACK_GENERAL, 89

src/graphics/indexes.h

+1
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ REGISTER_IMG(IMG_BIGSLED_BRICKS, 126)
127127
REGISTER_IMG(IMG_SMALL_MASTABA_BRICKS, 127)
128128
REGISTER_IMG(IMG_BUILDING_FIREHOUSE, 128)
129129
REGISTER_IMG(IMG_BUILDING_APOTHECARY, 128)
130+
REGISTER_IMG(IMG_PERSONAL_MANSION, 129)

src/scripts/images.js

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ images = [
148148
{img: IMG_SMALL_MASTABA_BRICKS, pack:PACK_MASTABA, id:1, offset:0},
149149
{img: IMG_BUILDING_FIREHOUSE, pack:PACK_GENERAL, id:78},
150150
{img: IMG_BUILDING_APOTHECARY, pack:PACK_GENERAL, id:68},
151+
{img: IMG_PERSONAL_MANSION, pack:PACK_GENERAL, id:85},
151152
]
152153

153154
cart_offsets = [

0 commit comments

Comments
 (0)