summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2013-05-26 19:29:43 +0000
committerfrosch <frosch@openttd.org>2013-05-26 19:29:43 +0000
commit559b7ef35eb4896e4f2e35d2dc8afb3d86519c3e (patch)
tree015f076635610d6f3db255f518559b94aefc0ff2
parented851034f50d4a6614c40bdc45bd651fc1cf0a74 (diff)
downloadopenttd-559b7ef35eb4896e4f2e35d2dc8afb3d86519c3e.tar.xz
(svn r25293) -Add: GUI sprite for default window size button.
-rw-r--r--bin/baseset/openttd.grfbin824160 -> 824190 bytes
-rw-r--r--bin/baseset/orig_dos.obg2
-rw-r--r--bin/baseset/orig_dos_de.obg2
-rw-r--r--bin/baseset/orig_win.obg2
-rw-r--r--media/extra_grf/openttdgui.nfo3
-rw-r--r--media/extra_grf/openttdgui.pngbin25150 -> 25164 bytes
-rw-r--r--src/table/sprites.h4
7 files changed, 8 insertions, 5 deletions
diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
index aebde9bc7..5feaf9045 100644
--- a/bin/baseset/openttd.grf
+++ b/bin/baseset/openttd.grf
Binary files differ
diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg
index d3fe423d9..b0288098c 100644
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -62,7 +62,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF = c683a77e1a43aed7db29ef318b166dd9
+OPENTTD.GRF = dabc0ac311d075b814df92fa6268790a
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg
index b1a0d2812..be2536b72 100644
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -62,7 +62,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF = c683a77e1a43aed7db29ef318b166dd9
+OPENTTD.GRF = dabc0ac311d075b814df92fa6268790a
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg
index c864e81ad..5008558ee 100644
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -62,7 +62,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF = c683a77e1a43aed7db29ef318b166dd9
+OPENTTD.GRF = dabc0ac311d075b814df92fa6268790a
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo
index 5fc451c4b..7743deb8a 100644
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -7,7 +7,7 @@
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "OpenTTD GUI graphics"
- -1 * 3 05 15 \b 168 // OPENTTD_SPRITE_COUNT
+ -1 * 3 05 15 \b 169 // OPENTTD_SPRITE_COUNT
-1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal
@@ -176,3 +176,4 @@
-1 sprites/openttdgui.png 8bpp 296 440 8 8 0 0 normal
-1 sprites/openttdgui.png 8bpp 312 440 14 10 0 0 normal
-1 sprites/openttdgui.png 8bpp 328 440 14 10 0 0 normal
+ -1 sprites/openttdgui.png 8bpp 348 440 7 7 0 0 normal
diff --git a/media/extra_grf/openttdgui.png b/media/extra_grf/openttdgui.png
index 00017335b..1d0c1aab6 100644
--- a/media/extra_grf/openttdgui.png
+++ b/media/extra_grf/openttdgui.png
Binary files differ
diff --git a/src/table/sprites.h b/src/table/sprites.h
index 463716cb1..cc2486831 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -56,7 +56,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682;
/** Extra graphic spritenumbers */
static const SpriteID SPR_OPENTTD_BASE = 4896;
-static const uint16 OPENTTD_SPRITE_COUNT = 168;
+static const uint16 OPENTTD_SPRITE_COUNT = 169;
/* Halftile-selection sprites */
static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE;
@@ -157,6 +157,8 @@ static const SpriteID SPR_IMG_SWITCH_TOOLBAR = SPR_OPENTTD_BASE + 144;
static const SpriteID SPR_IMG_DELETE_LEFT = SPR_OPENTTD_BASE + 166;
static const SpriteID SPR_IMG_DELETE_RIGHT = SPR_OPENTTD_BASE + 167;
+static const SpriteID SPR_WINDOW_DEFSIZE = SPR_OPENTTD_BASE + 168;
+
static const SpriteID SPR_SIGNALS_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT;
static const uint16 PRESIGNAL_SPRITE_COUNT = 48;
static const uint16 PRESIGNAL_AND_SEMAPHORE_SPRITE_COUNT = 112;