cpp/openttd-patchpack/source Changeset - r7659:8e01cc9c2a94

Changeset - r7659:8e01cc9c2a94

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 17 years ago 2007-09-30 19:33:40
rubidium@openttd.org

(svn r11190) -Fix: make snowy roofs of (newgrf) houses also transparent.

5 files changed with 11 insertions and 5 deletions:

src/newgrf_house.cpp

src/newgrf_industrytiles.cpp

src/station_cmd.cpp

src/viewport.cpp

src/viewport.h

0 comments (0 inline, 0 general)

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -343,13 +343,13 @@ void DrawTileLayout(const TileInfo *ti, @@
 				ti->x + dtss->delta_x, ti->y + dtss->delta_y,
 				dtss->size_x, dtss->size_y,
 				dtss->size_z, ti->z + dtss->delta_z,
 				HASBIT(_transparent_opt, TO_HOUSES)
 			);
 		} else {
 			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y);
+			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, HASBIT(_transparent_opt, TO_HOUSES));
+		}
+	}
+}
 void DrawNewHouseTile(TileInfo *ti, HouseID house_id)
+{

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -193,13 +193,13 @@ void IndustryDrawTileLayout(const TileIn @@
 				ti->x + dtss->delta_x, ti->y + dtss->delta_y,
 				dtss->size_x, dtss->size_y,
 				dtss->size_z, ti->z + dtss->delta_z,
 				!HASBIT(image, SPRITE_MODIFIER_OPAQUE) && HASBIT(_transparent_opt, TO_INDUSTRIES)
 			);
 		} else {
 			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y);
+			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, HASBIT(_transparent_opt, TO_INDUSTRIES));
+		}
+	}
+}
 uint16 GetIndustryTileCallback(CallbackID callback, uint32 param1, uint32 param2, IndustryGfx gfx_id, Industry *industry, TileIndex tile)
+{

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2112,13 +2112,13 @@ static void DrawTile_Station(TileInfo *t @@
 				ti->x + dtss->delta_x, ti->y + dtss->delta_y,
 				dtss->size_x, dtss->size_y,
 				dtss->size_z, ti->z + dtss->delta_z,
 				HASBIT(_transparent_opt, TO_BUILDINGS)
 			);
 		} else {
 			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y);
+			AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, HASBIT(_transparent_opt, TO_BUILDINGS));
+		}
+	}
+}
 void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, RoadType roadtype, int image)
+{

src/viewport.cpp

➞

Show inline comments

@@ @@ -610,19 +610,25 @@ void StartSpriteCombine() @@
 void EndSpriteCombine()
+{
 	_cur_vd->combine_sprites = 0;
+}
 void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y)
+void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y, bool transparent)
+{
 	ViewportDrawer *vd = _cur_vd;
 	ChildScreenSpriteToDraw *cs;
 	assert((image & SPRITE_MASK) < MAX_SPRITES);
 	/* make the sprites transparent with the right palette */
 	if (transparent) {
 		SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
 		pal = PALETTE_TO_TRANSPARENT;
+	}
 	if (vd->spritelist_mem >= vd->eof_spritelist_mem) {
 		DEBUG(sprite, 0, "Out of sprite memory");
 		return;
+	}
 	cs = (ChildScreenSpriteToDraw*)vd->spritelist_mem;

src/viewport.h

➞

Show inline comments

@@ @@ -58,13 +58,13 @@ enum { @@
 void OffsetGroundSprite(int x, int y);
 void DrawGroundSprite(SpriteID image, SpriteID pal);
 void DrawGroundSpriteAt(SpriteID image, SpriteID pal, int32 x, int32 y, byte z);
 void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, int h, int dz, int z, bool transparent = false, int bb_offset_x = 0, int bb_offset_y = 0, int bb_offset_z = 0);
 void *AddStringToDraw(int x, int y, StringID string, uint64 params_1, uint64 params_2);
 void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y);
+void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y, bool transparent = false);
 void StartSpriteCombine();
 void EndSpriteCombine();
 void HandleViewportClicked(const ViewPort *vp, int x, int y);

0 comments (0 inline, 0 general)