(svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch.
authorrubidium
Fri, 14 Sep 2007 21:32:21 +0000
changeset 7577 ab000224166b
parent 7576 702396fd6908
child 7578 d0b783a8a3e2
(svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch.
src/industry_cmd.cpp
src/table/industry_land.h
src/table/town_land.h
src/town_cmd.cpp
--- a/src/industry_cmd.cpp	Thu Sep 13 22:48:11 2007 +0000
+++ b/src/industry_cmd.cpp	Fri Sep 14 21:32:21 2007 +0000
@@ -299,8 +299,8 @@
 			(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));
--- a/src/table/industry_land.h	Thu Sep 13 22:48:11 2007 +0000
+++ b/src/table/industry_land.h	Fri Sep 14 21:32:21 2007 +0000
@@ -39,7 +39,7 @@
  * @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] = {
--- a/src/table/town_land.h	Thu Sep 13 22:48:11 2007 +0000
+++ b/src/table/town_land.h	Fri Sep 14 21:32:21 2007 +0000
@@ -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[] = {
--- a/src/town_cmd.cpp	Thu Sep 13 22:48:11 2007 +0000
+++ b/src/town_cmd.cpp	Fri Sep 14 21:32:21 2007 +0000
@@ -182,8 +182,8 @@
 		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)