summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2012-02-24 22:19:45 +0000
committerrubidium <rubidium@openttd.org>2012-02-24 22:19:45 +0000
commit46b08db917f1fe2c804e4a8fdffd03c5d8be980e (patch)
treecbb4bd623d0ccabb7f0708cc7722fd1d22f1462f
parent74785478ec78cda428d607f6f18b9665bb9896f1 (diff)
downloadopenttd-46b08db917f1fe2c804e4a8fdffd03c5d8be980e.tar.xz
(svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression
-rw-r--r--Makefile.grf.in2
-rw-r--r--bin/baseset/openttd.grfbin852958 -> 823799 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--config.lib6
6 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.grf.in b/Makefile.grf.in
index 2112f2a8a..45fb919f5 100644
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -66,7 +66,7 @@ $(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
$(E) '$(STAGE) Compiling openttd.grf'
- $(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf
+ $(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
# Clean up temporary files.
clean:
diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
index 9b5c9badb..3133fc296 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 349823dc2..b5904a76c 100644
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF = 541d8a4fa650334dae5f67dc8d122f65
[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 60e3a6a17..ba14be363 100644
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF = 541d8a4fa650334dae5f67dc8d122f65
[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 e377c2301..bc6b509b4 100644
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF = 541d8a4fa650334dae5f67dc8d122f65
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/config.lib b/config.lib
index 4e1954287..d3de42486 100644
--- a/config.lib
+++ b/config.lib
@@ -3120,9 +3120,9 @@ detect_grfcodec() {
log 2 " returned $version"
log 2 " exit code $ret"
- if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "897" ]; then
- if [ -n "$version" ] && [ "$version" -lt "897" ]; then
- log 1 "checking grfcodec... needs at least version 5.1.4 (r897), disabled"
+ if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "904" ]; then
+ if [ -n "$version" ] && [ "$version" -lt "904" ]; then
+ log 1 "checking grfcodec... needs at least version 5.1.4 (r904), disabled"
else
log 1 "checking grfcodec... not found"
fi