From 556035f4489176ecc9863f80cccbcfc9070d2e66 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 14 Sep 2007 21:32:21 +0000 Subject: [PATCH] (svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch. --- src/industry_cmd.cpp | 4 ++-- src/table/industry_land.h | 2 +- src/table/town_land.h | 2 +- src/town_cmd.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 260e840657..97adbb84ea 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -299,8 +299,8 @@ static void DrawTile_Industry(TileInfo *ti) (HASBIT(image, PALETTE_MODIFIER_COLOR) && dits->building.pal == PAL_NONE) ? GENERAL_SPRITE_COLOR(ind->random_color) : dits->building.pal, ti->x + dits->subtile_x, ti->y + dits->subtile_y, - dits->width + 1, - dits->height + 1, + dits->width, + dits->height, dits->dz, ti->z, HASBIT(_transparent_opt, TO_INDUSTRIES)); diff --git a/src/table/industry_land.h b/src/table/industry_land.h index cbab09c43a..1f41101faa 100644 --- a/src/table/industry_land.h +++ b/src/table/industry_land.h @@ -39,7 +39,7 @@ struct DrawIndustryCoordinates { * @param dz virtual height of the sprite * @param p this allows to specify a special drawing procedure. * @see DrawBuildingsTileStruct */ -#define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w - 1, h - 1, dz, p } +#define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w, h, dz, p } /** Structure for industry tiles drawing */ static const DrawBuildingsTileStruct _industry_draw_tile_data[NEW_INDUSTRYTILEOFFSET * 4] = { diff --git a/src/table/town_land.h b/src/table/town_land.h index 3e5b244bbc..89d7d30a1f 100644 --- a/src/table/town_land.h +++ b/src/table/town_land.h @@ -15,7 +15,7 @@ * @param dz the virtual height of the sprite * @param p set to 1 if a lift is present () * @see DrawBuildingsTileStruct */ -#define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w - 1, h - 1, dz, p} +#define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w, h, dz, p} /** structure of houses graphics*/ static const DrawBuildingsTileStruct _town_draw_tile_data[] = { diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 4cecdaa157..f399f09a25 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -182,8 +182,8 @@ static void DrawTile_Town(TileInfo *ti) AddSortableSpriteToDraw(image, dcts->building.pal, ti->x + dcts->subtile_x, ti->y + dcts->subtile_y, - dcts->width + 1, - dcts->height + 1, + dcts->width, + dcts->height, dcts->dz, ti->z, HASBIT(_transparent_opt, TO_HOUSES)