cpp/openttd-patchpack/source Changeset - r22524:0268bf1f5071

Changeset - r22524:0268bf1f5071

Parent rev.

Child rev.

[Not reviewed]

master

0 7 1

frosch - 7 years ago 2017-01-14 18:00:02
frosch@openttd.org

(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf

8 files changed with 106 insertions and 96 deletions:

bin/baseset/openttd.grf

bin+mod

bin/baseset/orig_dos.obg

bin/baseset/orig_dos_de.obg

bin/baseset/orig_extra.grf

bin+mod

bin/baseset/orig_win.obg

media/extra_grf/canals.nfo

media/extra_grf/canals_extra.nfo

101

media/extra_grf/orig_extra.nfo

0 comments (0 inline, 0 general)

bin/baseset/openttd.grf

➞

Show inline comments

binary diff not shown

bin/baseset/orig_dos.obg

➞

Show inline comments

@@ @@ -76,7 +76,7 @@ TRGI.GRF = da6a6c9dcc451eec88d7 @@
 TRGC.GRF          = ed446637e034104c5559b32c18afe78d
 TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 [origin]
 default           = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_dos_de.obg

➞

Show inline comments

@@ @@ -75,7 +75,7 @@ TRGI.GRF = da6a6c9dcc451eec88d7 @@
 TRGC.GRF          = ed446637e034104c5559b32c18afe78d
 TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 [origin]
 default           = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_extra.grf

➞

Show inline comments

binary diff not shown

bin/baseset/orig_win.obg

➞

Show inline comments

@@ @@ -76,7 +76,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83 @@
 TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 [origin]
 default           = You can find it on your Transport Tycoon Deluxe CD-ROM.

media/extra_grf/canals.nfo

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // 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 "Canal graphics by George / PaulC"
    -1 * 0	 0C "Canal graphics by George"
    -1 * 3	 05 08 41
 // Canal slopes
    -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
@@ @@ -77,95 +77,3 @@ @@
    -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
 // Canal icon
    -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
 // Differentiation for the climates starts here
 // Canal edges (arctic snowy)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
    -1 * 7        02 05 10 01 00 00 00
 // Canal edges (arctic normal)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
    -1 * 7        02 05 11 01 00 00 00
 // Choose the right arctic canal edges
    -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
    -1 * 6        07 83 01 \7! 01 01
    -1 * 7        03 05 01 02 00 12 00
 // Canal edges (tropic desert)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
    -1 * 7        02 05 13 01 00 00 00
 // Canal edges (tropic rainforest)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
    -1 * 7        02 05 14 01 00 00 00
 // Choose the right tropic canal edges
    -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
    -1 * 6        07 83 01 \7! 02 01
    -1 * 7        03 05 01 02 00 15 00
 // Canal edges (toyland)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
    -1 * 7        02 05 16 01 00 00 00
    -1 * 6        07 83 01 \7! 03 01
    -1 * 7        03 05 01 02 00 16 00

media/extra_grf/canals_extra.nfo

➞

Show inline comments

@@ new file 100644 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // 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 "Extra canal graphics by PaulC"
 // Differentiation for the climates starts here
 // Canal edges (arctic snowy)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
    -1 * 7        02 05 10 01 00 00 00
 // Canal edges (arctic normal)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
    -1 * 7        02 05 11 01 00 00 00
 // Choose the right arctic canal edges
    -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
    -1 * 6        07 83 01 \7! 01 01
    -1 * 7        03 05 01 02 00 12 00
 // Canal edges (tropic desert)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
    -1 * 7        02 05 13 01 00 00 00
 // Canal edges (tropic rainforest)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
    -1 * 7        02 05 14 01 00 00 00
 // Choose the right tropic canal edges
    -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
    -1 * 6        07 83 01 \7! 02 01
    -1 * 7        03 05 01 02 00 15 00
 // Canal edges (toyland)
    -1 * 4        01 05 01 \b12
    -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
    -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
    -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
    -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
    -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
    -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
    -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
    -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
    -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
    -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
    -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
    -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
    -1 * 7        02 05 16 01 00 00 00
    -1 * 6        07 83 01 \7! 03 01
    -1 * 7        03 05 01 02 00 16 00

media/extra_grf/orig_extra.nfo

➞

Show inline comments

@@ @@ -77,6 +77,7 @@ @@
 //
 #include "shore.nfo"
 #include "fix_graphics.nfo"
 #include "canals_extra.nfo"
 #include "rivers/rapids.nfo"
 #include "rivers/temperate.nfo"
 #include "rivers/arctic.nfo"

0 comments (0 inline, 0 general)