cpp/openttd-patchpack/source Changeset - r26432:9fd12fb33058

Changeset - r26432:9fd12fb33058

Parent rev.

Child rev.

[Not reviewed]

master

2 5 0

frosch - 2 years ago 2022-09-26 15:09:30
frosch@openttd.org

Cleanup: Remove unused flag sprites.

7 files changed with 3 insertions and 52 deletions:

media/baseset/openttd.grf

bin+mod

media/baseset/openttd/flags.nfo

media/baseset/openttd/flags.png

bin+del

media/baseset/openttd/openttd.nfo

src/network/network_gui.cpp

src/newgrf.cpp

src/table/sprites.h

0 comments (0 inline, 0 general)

media/baseset/openttd.grf

➞

Show inline comments

binary diff not shown

media/baseset/openttd/flags.nfo

➞

Show inline comments

deleted file

media/baseset/openttd/flags.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

media/baseset/openttd/openttd.nfo

➞

Show inline comments

@@ @@ -92,7 +92,6 @@ @@
 #include "roadstops.nfo"
 #include "aqueduct.nfo"
 #include "autorail.nfo"
 #include "flags.nfo"
 #include "openttdgui.nfo"
 #include "airport_preview.nfo"
 #include "chars.nfo"

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -103,8 +103,7 @@ public: @@
 		leaf = new NWidgetLeaf(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_INFO, STR_EMPTY, STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP);
 		leaf->SetMinimalSize(14 + GetSpriteSize(SPR_LOCK, nullptr, ZOOM_LVL_OUT_4X).width
 		                        + GetSpriteSize(SPR_BLOT, nullptr, ZOOM_LVL_OUT_4X).width
 		                        + GetSpriteSize(SPR_FLAGS_BASE, nullptr, ZOOM_LVL_OUT_4X).width, 12);
 		                        + GetSpriteSize(SPR_BLOT, nullptr, ZOOM_LVL_OUT_4X).width, 12);
 		leaf->SetFill(0, 1);
 		this->Add(leaf);

src/newgrf.cpp

➞

Show inline comments

@@ @@ -6170,7 +6170,7 @@ static const Action5Type _action5_types[ @@
 	/* 0x11 */ { A5BLOCK_ALLOW_OFFSET, SPR_ROADSTOP_BASE,            1, ROADSTOP_SPRITE_COUNT,                       "Road stop graphics"       },
 	/* 0x12 */ { A5BLOCK_ALLOW_OFFSET, SPR_AQUEDUCT_BASE,            1, AQUEDUCT_SPRITE_COUNT,                       "Aqueduct graphics"        },
 	/* 0x13 */ { A5BLOCK_ALLOW_OFFSET, SPR_AUTORAIL_BASE,            1, AUTORAIL_SPRITE_COUNT,                       "Autorail graphics"        },
-	/* 0x14 */ { A5BLOCK_ALLOW_OFFSET, SPR_FLAGS_BASE,               1, FLAGS_SPRITE_COUNT,                          "Flag graphics"            },
+	/* 0x14 */ { A5BLOCK_INVALID,      0,                            1, 0,                                           "Flag graphics"            }, // deprecated, no longer used.
 	/* 0x15 */ { A5BLOCK_ALLOW_OFFSET, SPR_OPENTTD_BASE,             1, OPENTTD_SPRITE_COUNT,                        "OpenTTD GUI graphics"     },
 	/* 0x16 */ { A5BLOCK_ALLOW_OFFSET, SPR_AIRPORT_PREVIEW_BASE,     1, SPR_AIRPORT_PREVIEW_COUNT,                   "Airport preview graphics" },
 	/* 0x17 */ { A5BLOCK_ALLOW_OFFSET, SPR_RAILTYPE_TUNNEL_BASE,     1, RAILTYPE_TUNNEL_BASE_COUNT,                  "Railtype tunnel base"     },

src/table/sprites.h

➞

Show inline comments

@@ @@ -293,12 +293,8 @@ static const uint16 TRAMWAY_SPRITE_COUNT @@
 static const SpriteID SPR_ONEWAY_BASE = SPR_TRAMWAY_BASE + TRAMWAY_SPRITE_COUNT;
 static const uint16 ONEWAY_SPRITE_COUNT = 6;
 /** Flags sprites (in same order as enum NetworkLanguage) */
 static const SpriteID SPR_FLAGS_BASE = SPR_ONEWAY_BASE + ONEWAY_SPRITE_COUNT;
 static const uint16 FLAGS_SPRITE_COUNT = 36;
 /** Tunnel sprites with grass only for custom railtype tunnel. */
-static const SpriteID SPR_RAILTYPE_TUNNEL_BASE = SPR_FLAGS_BASE + FLAGS_SPRITE_COUNT;
+static const SpriteID SPR_RAILTYPE_TUNNEL_BASE = SPR_ONEWAY_BASE + ONEWAY_SPRITE_COUNT;
 static const uint16 RAILTYPE_TUNNEL_BASE_COUNT = 16;
 /* Not really a sprite, but an empty bounding box. Used to construct bounding boxes that help sorting the sprites, but do not have a sprite associated. */

0 comments (0 inline, 0 general)