author | celestar |
Wed, 13 Jun 2007 11:45:14 +0000 | |
branch | gamebalance |
changeset 9911 | 0b8b245a2391 |
parent 9910 | 0b2aebc8283e |
child 9912 | 1ac8aac92385 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3 |
/** @file newgrf.cpp */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
6 |
||
7 |
#include <stdarg.h> |
|
8 |
||
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1883
diff
changeset
|
9 |
#include "openttd.h" |
1299
0a6510cc889b
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1183
diff
changeset
|
10 |
#include "debug.h" |
0 | 11 |
#include "gfx.h" |
12 |
#include "fileio.h" |
|
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
13 |
#include "functions.h" |
0 | 14 |
#include "engine.h" |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
15 |
#include "spritecache.h" |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
16 |
#include "station.h" |
405
6830ae7a0d5d
(svn r602) -newgrf: Move DrawTileSeqStruct & co and struct SpriteGroup to sprite.h (pasky)
darkvater
parents:
404
diff
changeset
|
17 |
#include "sprite.h" |
452
520e4ed6945d
(svn r662) [newgrf] Moved grfspecial.c to newgrf.c/newgrf.h
dominik
parents:
449
diff
changeset
|
18 |
#include "newgrf.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2013
diff
changeset
|
19 |
#include "variables.h" |
3566
7bdf06a03960
(svn r4447) - NewGRF: It seems I committed printing action NOP Action 0x0C which is mainly used for comments. So leave it in, but fix the created warning. Use proper action name for check_length() in Action 0x10
Darkvater
parents:
3561
diff
changeset
|
20 |
#include "string.h" |
3821
2bb8a2643fdf
(svn r4832) - NewGRF: add support for original string ID to newgrf text handling. So far, this is used for vehicles when no English or American translation is provided.
peter1138
parents:
3814
diff
changeset
|
21 |
#include "table/strings.h" |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
22 |
#include "bridge.h" |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
23 |
#include "town.h" |
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
24 |
#include "economy.h" |
2962
dbd168a4703a
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2958
diff
changeset
|
25 |
#include "newgrf_engine.h" |
3577
9e345c932ba2
(svn r4463) -Codechange. Include vehicle.h directly instead of implicitly via station.h in a number of source files
celestar
parents:
3571
diff
changeset
|
26 |
#include "vehicle.h" |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
27 |
#include "newgrf_text.h" |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
28 |
#include "table/sprites.h" |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
29 |
#include "fontcache.h" |
4293
2c24234a7aec
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4230
diff
changeset
|
30 |
#include "date.h" |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
31 |
#include "currency.h" |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
32 |
#include "landscape.h" |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
33 |
#include "sound.h" |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
34 |
#include "newgrf_config.h" |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
35 |
#include "newgrf_house.h" |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
36 |
#include "newgrf_sound.h" |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
37 |
#include "newgrf_spritegroup.h" |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
38 |
#include "helpers.hpp" |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
39 |
#include "table/town_land.h" |
6417
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6416
diff
changeset
|
40 |
#include "cargotype.h" |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
41 |
#include "industry.h" |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
42 |
#include "newgrf_canal.h" |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
43 |
#include "newgrf_commons.h" |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
44 |
|
0 | 45 |
/* TTDPatch extended GRF format codec |
46 |
* (c) Petr Baudis 2004 (GPL'd) |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
47 |
* Changes by Florian octo Forster are (c) by the OpenTTD development team. |
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
48 |
* |
0 | 49 |
* Contains portions of documentation by TTDPatch team. |
50 |
* Thanks especially to Josef Drexler for the documentation as well as a lot |
|
51 |
* of help at #tycoon. Also thanks to Michael Blunck for is GRF files which |
|
52 |
* served as subject to the initial testing of this codec. */ |
|
53 |
||
455 | 54 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
55 |
static int _skip_sprites; // XXX |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
56 |
static uint _file_index; // XXX |
5209
fa3ad39e2fa7
(svn r7324) -Codechange: reset newgrf signal location data
peter1138
parents:
5161
diff
changeset
|
57 |
SpriteID _signal_base; |
5210
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
58 |
SpriteID _coast_base; |
0 | 59 |
|
2340
0a9f3eeccb96
(svn r2866) Move all functions and tables which aren't directly involved in managing the sprite heap to a new file gfxinit.c.
tron
parents:
2336
diff
changeset
|
60 |
static GRFFile *_cur_grffile; |
1477 | 61 |
GRFFile *_first_grffile; |
3707
2999a89e8abd
(svn r4650) - NewGRF: use the correct type for _cur_spriteid
peter1138
parents:
3704
diff
changeset
|
62 |
static SpriteID _cur_spriteid; |
5225
52ddcedcc6f7
(svn r7345) -Codechange: enumification of NewGRF loading stage, and move enum definition to header for future use.
peter1138
parents:
5211
diff
changeset
|
63 |
static GrfLoadingStage _cur_stage; |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
64 |
static uint32 _nfo_line; |
0 | 65 |
|
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
66 |
static GRFConfig *_cur_grfconfig; |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
67 |
|
3814
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
68 |
/* Miscellaneous GRF features, set by Action 0x0D, parameter 0x9E */ |
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
69 |
static byte _misc_grf_features = 0; |
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
70 |
|
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
71 |
/* 32 * 8 = 256 flags. Apparently TTDPatch uses this many.. */ |
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
72 |
static uint32 _ttdpatch_flags[8]; |
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
73 |
|
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
74 |
/* Used by Action 0x06 to preload a pseudo sprite and modify its content */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
75 |
static byte *_preload_sprite = NULL; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
76 |
|
4742
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
77 |
/* Set if any vehicle is loaded which uses 2cc (two company colours) */ |
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
78 |
bool _have_2cc = false; |
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
79 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
80 |
/* Set if there are any newhouses loaded. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
81 |
bool _have_newhouses = false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
82 |
|
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
83 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
84 |
enum GrfDataType { |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
85 |
GDT_SOUND, |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
86 |
}; |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
87 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
88 |
static byte _grf_data_blocks; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
89 |
static GrfDataType _grf_data_type; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
90 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
91 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
92 |
enum grfspec_feature { |
373
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
93 |
GSF_TRAIN, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
94 |
GSF_ROAD, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
95 |
GSF_SHIP, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
96 |
GSF_AIRCRAFT, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
97 |
GSF_STATION, |
2438
eaef2b29fa3d
(svn r2964) Fix: newgrf: Include missing grf feature canal.
peter1138
parents:
2421
diff
changeset
|
98 |
GSF_CANAL, |
391
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
99 |
GSF_BRIDGE, |
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
100 |
GSF_TOWNHOUSE, |
3620
b459e678a003
(svn r4517) - NewGRF: fix and complete the feature list
peter1138
parents:
3614
diff
changeset
|
101 |
GSF_GLOBALVAR, |
b459e678a003
(svn r4517) - NewGRF: fix and complete the feature list
peter1138
parents:
3614
diff
changeset
|
102 |
GSF_INDUSTRYTILES, |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
103 |
GSF_INDUSTRIES, |
3620
b459e678a003
(svn r4517) - NewGRF: fix and complete the feature list
peter1138
parents:
3614
diff
changeset
|
104 |
GSF_CARGOS, |
b459e678a003
(svn r4517) - NewGRF: fix and complete the feature list
peter1138
parents:
3614
diff
changeset
|
105 |
GSF_SOUNDFX, |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
106 |
}; |
373
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
107 |
|
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
108 |
|
0 | 109 |
typedef void (*SpecialSpriteHandler)(byte *buf, int len); |
110 |
||
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
111 |
static const uint _vehcounts[4] = { |
373
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
112 |
/* GSF_TRAIN */ NUM_TRAIN_ENGINES, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
113 |
/* GSF_ROAD */ NUM_ROAD_ENGINES, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
114 |
/* GSF_SHIP */ NUM_SHIP_ENGINES, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
115 |
/* GSF_AIRCRAFT */ NUM_AIRCRAFT_ENGINES |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
116 |
}; |
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
117 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
118 |
static const uint _vehshifts[4] = { |
373
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
119 |
/* GSF_TRAIN */ 0, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
120 |
/* GSF_ROAD */ ROAD_ENGINES_INDEX, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
121 |
/* GSF_SHIP */ SHIP_ENGINES_INDEX, |
218e83c92cb8
(svn r561) -newgrf: killed some of the magic numbers in the code (pasky)
celestar
parents:
372
diff
changeset
|
122 |
/* GSF_AIRCRAFT */ AIRCRAFT_ENGINES_INDEX, |
0 | 123 |
}; |
124 |
||
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
125 |
enum { |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
126 |
MAX_STATIONS = 256, |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
127 |
}; |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
128 |
|
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
129 |
static uint16 cargo_allowed[TOTAL_NUM_ENGINES]; |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
130 |
static uint16 cargo_disallowed[TOTAL_NUM_ENGINES]; |
0 | 131 |
|
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
132 |
/* Contains the GRF ID of the owner of a vehicle if it has been reserved */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
133 |
static uint32 _grm_engines[TOTAL_NUM_ENGINES]; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
134 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
135 |
/** DEBUG() function dedicated to newGRF debugging messages |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
136 |
* Function is essentialy the same as DEBUG(grf, severity, ...) with the |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
137 |
* addition of file:line information when parsing grf files. |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
138 |
* NOTE: for the above reason(s) grfmsg() should ONLY be used for |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
139 |
* loading/parsing grf files, not for runtime debug messages as there |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
140 |
* is no file information available during that time. |
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
141 |
* @param severity debugging severity level, see debug.h |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
142 |
* @param str message in printf() format */ |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
143 |
void CDECL grfmsg(int severity, const char *str, ...) |
0 | 144 |
{ |
65
f9f866bc609c
(svn r66) -Fix Station list updated on station deletion/station rename
darkvater
parents:
51
diff
changeset
|
145 |
char buf[1024]; |
0 | 146 |
va_list va; |
147 |
||
148 |
va_start(va, str); |
|
1477 | 149 |
vsnprintf(buf, sizeof(buf), str, va); |
0 | 150 |
va_end(va); |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
151 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
152 |
DEBUG(grf, severity, "[%s:%d] %s", _cur_grfconfig->filename, _nfo_line, buf); |
0 | 153 |
} |
154 |
||
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
155 |
static inline bool check_length(int real, int wanted, const char *str) |
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
156 |
{ |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
157 |
if (real >= wanted) return true; |
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
158 |
grfmsg(0, "%s: Invalid pseudo sprite length %d (expected %d)!", str, real, wanted); |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
159 |
return false; |
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
160 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
161 |
|
500
ef288590e096
(svn r793) Merge INLINE -> inline replacement (revision 376)
tron
parents:
490
diff
changeset
|
162 |
static inline byte grf_load_byte(byte **buf) |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
163 |
{ |
0 | 164 |
return *(*buf)++; |
165 |
} |
|
166 |
||
167 |
static uint16 grf_load_word(byte **buf) |
|
168 |
{ |
|
3711
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
169 |
uint16 val = grf_load_byte(buf); |
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
170 |
return val | (grf_load_byte(buf) << 8); |
0 | 171 |
} |
172 |
||
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
173 |
static uint16 grf_load_extended(byte** buf) |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
174 |
{ |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
175 |
uint16 val; |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
176 |
val = grf_load_byte(buf); |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
177 |
if (val == 0xFF) val = grf_load_word(buf); |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
178 |
return val; |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
179 |
} |
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
180 |
|
2324 | 181 |
static uint32 grf_load_dword(byte **buf) |
0 | 182 |
{ |
3711
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
183 |
uint32 val = grf_load_word(buf); |
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
184 |
return val | (grf_load_word(buf) << 16); |
0 | 185 |
} |
186 |
||
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
187 |
static uint32 grf_load_var(byte size, byte **buf) |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
188 |
{ |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
189 |
switch (size) { |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
190 |
case 1: return grf_load_byte(buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
191 |
case 2: return grf_load_word(buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
192 |
case 4: return grf_load_dword(buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
193 |
default: |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
194 |
NOT_REACHED(); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
195 |
return 0; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
196 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
197 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
198 |
|
6416
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
199 |
static const char *grf_load_string(byte **buf, size_t max_len) |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
200 |
{ |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
201 |
const char *string = *(const char **)buf; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
202 |
size_t string_length = ttd_strnlen(string, max_len); |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
203 |
|
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
204 |
if (string_length == max_len) { |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
205 |
/* String was not NUL terminated, so make sure it is now. */ |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
206 |
(*buf)[string_length - 1] = '\0'; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
207 |
grfmsg(7, "String was not terminated with a zero byte."); |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
208 |
} else { |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
209 |
/* Increase the string length to include the NUL byte. */ |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
210 |
string_length++; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
211 |
} |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
212 |
*buf += string_length; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
213 |
|
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
214 |
return string; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
215 |
} |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
216 |
|
1477 | 217 |
static GRFFile *GetFileByGRFID(uint32 grfid) |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
218 |
{ |
1477 | 219 |
GRFFile *file; |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
220 |
|
1477 | 221 |
for (file = _first_grffile; file != NULL; file = file->next) { |
222 |
if (file->grfid == grfid) break; |
|
223 |
} |
|
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
224 |
return file; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
225 |
} |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
226 |
|
1477 | 227 |
static GRFFile *GetFileByFilename(const char *filename) |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
228 |
{ |
1477 | 229 |
GRFFile *file; |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
230 |
|
1477 | 231 |
for (file = _first_grffile; file != NULL; file = file->next) { |
232 |
if (strcmp(file->filename, filename) == 0) break; |
|
233 |
} |
|
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
234 |
return file; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
235 |
} |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
236 |
|
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
237 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
238 |
/** Used when setting an object's property to map to the GRF's strings |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
239 |
* while taking in consideration the "drift" between TTDPatch string system and OpenTTD's one |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
240 |
* @param grfid Id of the grf file |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
241 |
* @param str StringID that we want to have the equivalent in OoenTTD |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
242 |
* @return the properly adjusted StringID |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
243 |
*/ |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
244 |
static StringID MapGRFStringID(uint32 grfid, StringID str) |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
245 |
{ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
246 |
/* 0xD0 and 0xDC stand for all the TextIDs in the range |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
247 |
* of 0xD000 (misc graphics texts) and 0xDC00 (misc persistent texts). |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
248 |
* These strings are unique to each grf file, and thus require to be used with the |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
249 |
* grfid in which they are declared */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
250 |
if (GB(str, 8, 8) == 0xD0 || GB(str, 8, 8) == 0xDC) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
251 |
return GetGRFStringID(grfid, str); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
252 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
253 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
254 |
/* We have some changes in our cargo strings, resulting in some missing. */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
255 |
if (str >= 0x006E && str <= 0x008D) return str - 0x20; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
256 |
if (str >= 0x008E && str <= 0x00AD) return str - 0x20; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
257 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
258 |
/* Map building names according to our lang file changes |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
259 |
* 0x200F = Tall Office Block, first house name in the original data, the one that TTDPatch stil uses |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
260 |
* 0x201F = Old houses is the last house name. |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
261 |
* OpenTTD does not have exactly the same order aymore, so, the code below allows |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
262 |
* to compensate for the difference */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
263 |
if (str >= 0x200F && str <= 0x201F) return str + (STR_200F_TALL_OFFICE_BLOCK - 0x200F); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
264 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
265 |
return str; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
266 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
267 |
|
9907
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
268 |
static uint8 MapDOSColour(uint8 colour) |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
269 |
{ |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
270 |
if (_use_dos_palette) return colour; |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
271 |
|
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
272 |
if (colour < 10) { |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
273 |
static uint8 dos_to_win_colour_map[] = { 0, 215, 216, 136, 88, 106, 32, 33, 40, 245 }; |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
274 |
return dos_to_win_colour_map[colour]; |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
275 |
} |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
276 |
|
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
277 |
if (colour >= 245 && colour < 254) return colour - 28; |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
278 |
|
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
279 |
return colour; |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
280 |
} |
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
281 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
282 |
|
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
283 |
typedef bool (*VCI_Handler)(uint engine, int numinfo, int prop, byte **buf, int len); |
0 | 284 |
|
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
285 |
#define FOR_EACH_OBJECT for (i = 0; i < numinfo; i++) |
0 | 286 |
|
287 |
static void dewagonize(int condition, int engine) |
|
288 |
{ |
|
289 |
EngineInfo *ei = &_engine_info[engine]; |
|
290 |
RailVehicleInfo *rvi = &_rail_vehicle_info[engine]; |
|
291 |
||
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
292 |
if (condition != 0) { |
0 | 293 |
ei->unk2 &= ~0x80; |
6356
688f81d17aec
(svn r8753) -Regression (r8455): Do not unilateraly decide that this engine is a single-headed. Only do it if it previously had no power and that now there is. Or something...
belugas
parents:
6223
diff
changeset
|
294 |
if (rvi->railveh_type == RAILVEH_WAGON) |
688f81d17aec
(svn r8753) -Regression (r8455): Do not unilateraly decide that this engine is a single-headed. Only do it if it previously had no power and that now there is. Or something...
belugas
parents:
6223
diff
changeset
|
295 |
rvi->railveh_type = RAILVEH_SINGLEHEAD; |
0 | 296 |
} else { |
297 |
ei->unk2 |= 0x80; |
|
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
298 |
rvi->railveh_type = RAILVEH_WAGON; |
0 | 299 |
} |
300 |
} |
|
301 |
||
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
302 |
static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **bufp, int len) |
0 | 303 |
{ |
304 |
EngineInfo *ei = &_engine_info[engine]; |
|
305 |
RailVehicleInfo *rvi = &_rail_vehicle_info[engine]; |
|
306 |
byte *buf = *bufp; |
|
307 |
int i; |
|
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
308 |
bool ret = false; |
0 | 309 |
|
310 |
switch (prop) { |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
311 |
case 0x05: // Track type |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
312 |
FOR_EACH_OBJECT { |
0 | 313 |
uint8 tracktype = grf_load_byte(&buf); |
314 |
||
3026
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
315 |
switch (tracktype) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
316 |
case 0: rvi[i].railtype = rvi[i].engclass >= 2 ? RAILTYPE_ELECTRIC : RAILTYPE_RAIL; break; |
6014 | 317 |
case 1: rvi[i].railtype = RAILTYPE_MONO; break; |
318 |
case 2: rvi[i].railtype = RAILTYPE_MAGLEV; break; |
|
3026
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
319 |
default: |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
320 |
grfmsg(1, "RailVehicleChangeInfo: Invalid track type %d specified, ignoring", tracktype); |
3026
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
321 |
break; |
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
322 |
} |
0 | 323 |
} |
3026
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
324 |
break; |
6401a6942660
(svn r3606) - NewGRF: Convert from TTDP railtype values to our own railtypes. (These are currently the same, but won't be forever...)
peter1138
parents:
3023
diff
changeset
|
325 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
326 |
case 0x08: // AI passenger service |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
327 |
/* @todo missing feature */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
328 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
329 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
330 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
331 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
332 |
case 0x09: // Speed (1 unit is 1 kmh) |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
333 |
FOR_EACH_OBJECT { |
0 | 334 |
uint16 speed = grf_load_word(&buf); |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
335 |
if (speed == 0xFFFF) speed = 0; |
0 | 336 |
|
337 |
rvi[i].max_speed = speed; |
|
338 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
339 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
340 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
341 |
case 0x0B: // Power |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
342 |
FOR_EACH_OBJECT { |
0 | 343 |
uint16 power = grf_load_word(&buf); |
344 |
||
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
345 |
if (rvi[i].railveh_type == RAILVEH_MULTIHEAD) power /= 2; |
1894
0053e4f13db8
(svn r2400) - Fix: [newgrf] Load power for dual-headed engines correctly
hackykid
parents:
1891
diff
changeset
|
346 |
|
0 | 347 |
rvi[i].power = power; |
348 |
dewagonize(power, engine + i); |
|
349 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
350 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
351 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
352 |
case 0x0D: // Running cost factor |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
353 |
FOR_EACH_OBJECT { |
0 | 354 |
uint8 runcostfact = grf_load_byte(&buf); |
355 |
||
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
356 |
if (rvi[i].railveh_type == RAILVEH_MULTIHEAD) runcostfact /= 2; |
2836
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
357 |
|
0 | 358 |
rvi[i].running_cost_base = runcostfact; |
359 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
360 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
361 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
362 |
case 0x0E: // Running cost base |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
363 |
FOR_EACH_OBJECT { |
0 | 364 |
uint32 base = grf_load_dword(&buf); |
365 |
||
366 |
switch (base) { |
|
2840
d68a605b2087
(svn r3388) - NewGRF: Allow train running cost class to differ from engine class. Also fix typo in r3384.
peter1138
parents:
2838
diff
changeset
|
367 |
case 0x4C30: rvi[i].running_cost_class = 0; break; |
d68a605b2087
(svn r3388) - NewGRF: Allow train running cost class to differ from engine class. Also fix typo in r3384.
peter1138
parents:
2838
diff
changeset
|
368 |
case 0x4C36: rvi[i].running_cost_class = 1; break; |
d68a605b2087
(svn r3388) - NewGRF: Allow train running cost class to differ from engine class. Also fix typo in r3384.
peter1138
parents:
2838
diff
changeset
|
369 |
case 0x4C3C: rvi[i].running_cost_class = 2; break; |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
370 |
case 0: break; // Used by wagons |
5324
b2429a2def00
(svn r7485) -Codechange: [NewGRF] Add debug warning for unsupported running cost bases for rail vehicles.
peter1138
parents:
5317
diff
changeset
|
371 |
default: |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
372 |
grfmsg(1, "RailVehicleChangeInfo: Unsupported running cost base 0x%04X, ignoring", base); |
5324
b2429a2def00
(svn r7485) -Codechange: [NewGRF] Add debug warning for unsupported running cost bases for rail vehicles.
peter1138
parents:
5317
diff
changeset
|
373 |
break; |
0 | 374 |
} |
375 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
376 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
377 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
378 |
case 0x12: // Sprite ID |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
379 |
FOR_EACH_OBJECT { |
0 | 380 |
uint8 spriteid = grf_load_byte(&buf); |
381 |
||
2895
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
382 |
/* TTD sprite IDs point to a location in a 16bit array, but we use it |
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
383 |
* as an array index, so we need it to be half the original value. */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
384 |
if (spriteid < 0xFD) spriteid >>= 1; |
2895
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
385 |
|
0 | 386 |
rvi[i].image_index = spriteid; |
387 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
388 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
389 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
390 |
case 0x13: // Dual-headed |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
391 |
FOR_EACH_OBJECT { |
0 | 392 |
uint8 dual = grf_load_byte(&buf); |
393 |
||
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
394 |
if (dual != 0) { |
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
395 |
if (rvi[i].railveh_type != RAILVEH_MULTIHEAD) { |
2836
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
396 |
// adjust power and running cost if needed |
1894
0053e4f13db8
(svn r2400) - Fix: [newgrf] Load power for dual-headed engines correctly
hackykid
parents:
1891
diff
changeset
|
397 |
rvi[i].power /= 2; |
2836
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
398 |
rvi[i].running_cost_base /= 2; |
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
399 |
} |
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
400 |
rvi[i].railveh_type = RAILVEH_MULTIHEAD; |
0 | 401 |
} else { |
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
402 |
if (rvi[i].railveh_type == RAILVEH_MULTIHEAD) { |
2836
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
403 |
// adjust power and running cost if needed |
1894
0053e4f13db8
(svn r2400) - Fix: [newgrf] Load power for dual-headed engines correctly
hackykid
parents:
1891
diff
changeset
|
404 |
rvi[i].power *= 2; |
2840
d68a605b2087
(svn r3388) - NewGRF: Allow train running cost class to differ from engine class. Also fix typo in r3384.
peter1138
parents:
2838
diff
changeset
|
405 |
rvi[i].running_cost_base *= 2; |
2836
b5e8424f5955
(svn r3384) - NewGRF fix: running cost should be halved for dual head vehicles.
peter1138
parents:
2812
diff
changeset
|
406 |
} |
6126
40a18030c3aa
(svn r8465) -Regression (r8455): Switching from dual to single head should switch to wagon if power is zero. .Or something.
peter1138
parents:
6119
diff
changeset
|
407 |
rvi[i].railveh_type = rvi[i].power == 0 ? |
40a18030c3aa
(svn r8465) -Regression (r8455): Switching from dual to single head should switch to wagon if power is zero. .Or something.
peter1138
parents:
6119
diff
changeset
|
408 |
RAILVEH_WAGON : RAILVEH_SINGLEHEAD; |
0 | 409 |
} |
410 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
411 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
412 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
413 |
case 0x14: // Cargo capacity |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
414 |
FOR_EACH_OBJECT rvi[i].capacity = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
415 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
416 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
417 |
case 0x15: // Cargo type |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
418 |
FOR_EACH_OBJECT { |
0 | 419 |
uint8 ctype = grf_load_byte(&buf); |
420 |
||
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
421 |
if (ctype < NUM_CARGO && HASBIT(_cargo_mask, ctype)) { |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
422 |
rvi[i].cargo_type = ctype; |
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
423 |
} else { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
424 |
rvi[i].cargo_type = CT_INVALID; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
425 |
grfmsg(2, "RailVehicleChangeInfo: Invalid cargo type %d, using first refittable", ctype); |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
426 |
} |
0 | 427 |
} |
3023
e56ff3134c77
(svn r3603) - NewGRF: Support loading of AI rank data
peter1138
parents:
3006
diff
changeset
|
428 |
break; |
e56ff3134c77
(svn r3603) - NewGRF: Support loading of AI rank data
peter1138
parents:
3006
diff
changeset
|
429 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
430 |
case 0x16: // Weight |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
431 |
FOR_EACH_OBJECT SB(rvi[i].weight, 0, 8, grf_load_byte(&buf)); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
432 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
433 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
434 |
case 0x17: // Cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
435 |
FOR_EACH_OBJECT rvi[i].base_cost = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
436 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
437 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
438 |
case 0x18: // AI rank |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
439 |
FOR_EACH_OBJECT rvi[i].ai_rank = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
440 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
441 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
442 |
case 0x19: // Engine traction type |
2838
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
443 |
/* What do the individual numbers mean? |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
444 |
* 0x00 .. 0x07: Steam |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
445 |
* 0x08 .. 0x27: Diesel |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
446 |
* 0x28 .. 0x31: Electric |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
447 |
* 0x32 .. 0x37: Monorail |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
448 |
* 0x38 .. 0x41: Maglev |
7d6a3195f87d
(svn r3386) - NewGRF: Small comment update, and fix for possible issue with engine class not getting set.
peter1138
parents:
2836
diff
changeset
|
449 |
*/ |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
450 |
FOR_EACH_OBJECT { |
0 | 451 |
uint8 traction = grf_load_byte(&buf); |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
452 |
EngineClass engclass; |
0 | 453 |
|
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
454 |
if (traction <= 0x07) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
455 |
engclass = EC_STEAM; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
456 |
} else if (traction <= 0x27) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
457 |
engclass = EC_DIESEL; |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3095
diff
changeset
|
458 |
} else if (traction <= 0x31) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
459 |
engclass = EC_ELECTRIC; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
460 |
} else if (traction <= 0x37) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
461 |
engclass = EC_MONORAIL; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
462 |
} else if (traction <= 0x41) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
463 |
engclass = EC_MAGLEV; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
464 |
} else { |
0 | 465 |
break; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
466 |
} |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
467 |
if (rvi[i].railtype == RAILTYPE_RAIL && engclass >= EC_ELECTRIC) rvi[i].railtype = RAILTYPE_ELECTRIC; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
468 |
if (rvi[i].railtype == RAILTYPE_ELECTRIC && engclass < EC_ELECTRIC) rvi[i].railtype = RAILTYPE_RAIL; |
0 | 469 |
|
470 |
rvi[i].engclass = engclass; |
|
471 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
472 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
473 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
474 |
case 0x1A: // Alter purchase list sort order |
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
475 |
FOR_EACH_OBJECT { |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
476 |
EngineID pos = grf_load_byte(&buf); |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
477 |
|
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
478 |
if (pos < NUM_TRAIN_ENGINES) { |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
479 |
AlterRailVehListOrder(engine + i, pos); |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
480 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
481 |
grfmsg(2, "RailVehicleChangeInfo: Invalid train engine ID %d, ignoring", pos); |
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
482 |
} |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
483 |
} |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
484 |
break; |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
485 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
486 |
case 0x1B: // Powered wagons power bonus |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
487 |
FOR_EACH_OBJECT rvi[i].pow_wag_power = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
488 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
489 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
490 |
case 0x1C: // Refit cost |
3997
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
491 |
FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf); |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
492 |
break; |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
493 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
494 |
case 0x1D: // Refit cargo |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
495 |
FOR_EACH_OBJECT ei[i].refit_mask = grf_load_dword(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
496 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
497 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
498 |
case 0x1E: // Callback |
3956
0f43adbc293a
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3924
diff
changeset
|
499 |
FOR_EACH_OBJECT ei[i].callbackmask = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
500 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
501 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
502 |
case 0x1F: // Tractive effort coefficient |
5588
1bcb6b4c01d8
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5570
diff
changeset
|
503 |
FOR_EACH_OBJECT rvi[i].tractive_effort = grf_load_byte(&buf); |
1bcb6b4c01d8
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5570
diff
changeset
|
504 |
break; |
1bcb6b4c01d8
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5570
diff
changeset
|
505 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
506 |
case 0x21: // Shorter vehicle |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
507 |
FOR_EACH_OBJECT rvi[i].shorten_factor = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
508 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
509 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
510 |
case 0x22: // Visual effect |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
511 |
/* see note in engine.h about rvi->visual_effect */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
512 |
FOR_EACH_OBJECT rvi[i].visual_effect = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
513 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
514 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
515 |
case 0x23: // Powered wagons weight bonus |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
516 |
FOR_EACH_OBJECT rvi[i].pow_wag_weight = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
517 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
518 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
519 |
case 0x24: // High byte of vehicle weight |
2542
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
520 |
FOR_EACH_OBJECT { |
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
521 |
byte weight = grf_load_byte(&buf); |
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
522 |
|
2545
d1965652e523
(svn r3074) -NewGrf: Fix stupid typo in weight setting.
peter1138
parents:
2542
diff
changeset
|
523 |
if (weight > 4) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
524 |
grfmsg(2, "RailVehicleChangeInfo: Nonsensical weight of %d tons, ignoring", weight << 8); |
2542
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
525 |
} else { |
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
526 |
SB(rvi[i].weight, 8, 8, weight); |
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
527 |
} |
fdea27216e48
(svn r3071) -NewGRF: Add support for rail vehicle weight greater than 255 tons.
peter1138
parents:
2530
diff
changeset
|
528 |
} |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
529 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
530 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
531 |
case 0x25: // User-defined bit mask to set when checking veh. var. 42 |
3862
898c8212afa1
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3845
diff
changeset
|
532 |
FOR_EACH_OBJECT rvi[i].user_def_data = grf_load_byte(&buf); |
898c8212afa1
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3845
diff
changeset
|
533 |
break; |
898c8212afa1
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3845
diff
changeset
|
534 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
535 |
case 0x26: // Retire vehicle early |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
536 |
FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
537 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
538 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
539 |
case 0x27: // Miscellaneous flags |
4742
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
540 |
FOR_EACH_OBJECT { |
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
541 |
ei[i].misc_flags = grf_load_byte(&buf); |
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
542 |
if (HASBIT(ei[i].misc_flags, EF_USES_2CC)) _have_2cc = true; |
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
543 |
} |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
544 |
break; |
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
545 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
546 |
case 0x28: // Cargo classes allowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
547 |
FOR_EACH_OBJECT cargo_allowed[engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
548 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
549 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
550 |
case 0x29: // Cargo classes disallowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
551 |
FOR_EACH_OBJECT cargo_disallowed[engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
552 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
553 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
554 |
case 0x2A: // Long format introduction date (days since year 0) |
5114
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
555 |
FOR_EACH_OBJECT ei[i].base_intro = grf_load_dword(&buf); |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
556 |
break; |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
557 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
558 |
/* @todo air drag and retire vehicle early |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
559 |
* Fall-through for unimplemented one byte long properties. */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
560 |
case 0x20: // Air drag |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
561 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
562 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
563 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
564 |
|
0 | 565 |
default: |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
566 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
567 |
break; |
0 | 568 |
} |
569 |
*bufp = buf; |
|
570 |
return ret; |
|
571 |
} |
|
572 |
||
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
573 |
static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **bufp, int len) |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
574 |
{ |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
575 |
EngineInfo *ei = &_engine_info[ROAD_ENGINES_INDEX + engine]; |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
576 |
RoadVehicleInfo *rvi = &_road_vehicle_info[engine]; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
577 |
byte *buf = *bufp; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
578 |
int i; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
579 |
bool ret = false; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
580 |
|
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
581 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
582 |
case 0x08: // Speed (1 unit is 0.5 kmh) |
3488
d1d5c0f3f69d
(svn r4339) - Comment Change: NewGRF, update comments for units of speed
peter1138
parents:
3355
diff
changeset
|
583 |
FOR_EACH_OBJECT rvi[i].max_speed = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
584 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
585 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
586 |
case 0x09: // Running cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
587 |
FOR_EACH_OBJECT rvi[i].running_cost = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
588 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
589 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
590 |
case 0x0A: // Running cost base |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
591 |
/* @todo : I have no idea. --pasky |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
592 |
* I THINK it is used for overriding the base cost of all road vehicle (_price.roadveh_base) --belugas */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
593 |
FOR_EACH_OBJECT grf_load_dword(&buf); |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
594 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
595 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
596 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
597 |
case 0x0E: // Sprite ID |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
598 |
FOR_EACH_OBJECT { |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
599 |
uint8 spriteid = grf_load_byte(&buf); |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
600 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
601 |
/* cars have different custom id in the GRF file */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
602 |
if (spriteid == 0xFF) spriteid = 0xFD; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
603 |
|
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
604 |
if (spriteid < 0xFD) spriteid >>= 1; |
2895
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
605 |
|
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
606 |
rvi[i].image_index = spriteid; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
607 |
} |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
608 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
609 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
610 |
case 0x0F: // Cargo capacity |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
611 |
FOR_EACH_OBJECT rvi[i].capacity = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
612 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
613 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
614 |
case 0x10: // Cargo type |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
615 |
FOR_EACH_OBJECT { |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
616 |
uint8 cargo = grf_load_byte(&buf); |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
617 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
618 |
if (cargo < NUM_CARGO && HASBIT(_cargo_mask, cargo)) { |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
619 |
rvi[i].cargo_type = cargo; |
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
620 |
} else { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
621 |
rvi[i].cargo_type = CT_INVALID; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
622 |
grfmsg(2, "RoadVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo); |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
623 |
} |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
624 |
} |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
625 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
626 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
627 |
case 0x11: // Cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
628 |
FOR_EACH_OBJECT rvi[i].base_cost = grf_load_byte(&buf); // ?? is it base_cost? |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
629 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
630 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
631 |
case 0x12: // SFX |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
632 |
FOR_EACH_OBJECT rvi[i].sfx = (SoundFx)grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
633 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
634 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
635 |
case 0x13: // Power in 10hp |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
636 |
case 0x14: // Weight in 1/4 tons |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
637 |
case 0x15: // Speed in mph*0.8 |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
638 |
/* TODO: Support for road vehicles realistic power |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
639 |
* computations (called rvpower in TTDPatch) is just |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
640 |
* missing in OTTD yet. --pasky */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
641 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
642 |
ret = true; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
643 |
break; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
644 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
645 |
case 0x16: // Cargos available for refitting |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
646 |
FOR_EACH_OBJECT ei[i].refit_mask = grf_load_dword(&buf); |
3006
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
647 |
break; |
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
648 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
649 |
case 0x17: // Callback mask |
3956
0f43adbc293a
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3924
diff
changeset
|
650 |
FOR_EACH_OBJECT ei[i].callbackmask = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
651 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
652 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
653 |
case 0x1A: // Refit cost |
3997
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
654 |
FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf); |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
655 |
break; |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
656 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
657 |
case 0x1B: // Retire vehicle early |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
658 |
FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
659 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
660 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
661 |
case 0x1C: // Miscellaneous flags |
4952
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
662 |
FOR_EACH_OBJECT { |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
663 |
ei[i].misc_flags = grf_load_byte(&buf); |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
664 |
if (HASBIT(ei[i].misc_flags, EF_USES_2CC)) _have_2cc = true; |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
665 |
} |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
666 |
break; |
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
667 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
668 |
case 0x1D: // Cargo classes allowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
669 |
FOR_EACH_OBJECT cargo_allowed[ROAD_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
670 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
671 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
672 |
case 0x1E: // Cargo classes disallowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
673 |
FOR_EACH_OBJECT cargo_disallowed[ROAD_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
674 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
675 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
676 |
case 0x1F: // Long format introduction date (days since year 0) |
5114
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
677 |
FOR_EACH_OBJECT ei[i].base_intro = grf_load_dword(&buf); |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
678 |
break; |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
679 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
680 |
case 0x18: // Tractive effort |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
681 |
case 0x19: // Air drag |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
682 |
/* @todo */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
683 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
684 |
ret = true; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
685 |
break; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
686 |
|
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
687 |
default: |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
688 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
689 |
break; |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
690 |
} |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
691 |
|
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
692 |
*bufp = buf; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
693 |
return ret; |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
694 |
} |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
695 |
|
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
696 |
static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **bufp, int len) |
0 | 697 |
{ |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
698 |
EngineInfo *ei = &_engine_info[SHIP_ENGINES_INDEX + engine]; |
0 | 699 |
ShipVehicleInfo *svi = &_ship_vehicle_info[engine]; |
700 |
byte *buf = *bufp; |
|
701 |
int i; |
|
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
702 |
bool ret = false; |
0 | 703 |
|
704 |
//printf("e %x prop %x?\n", engine, prop); |
|
705 |
switch (prop) { |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
706 |
case 0x08: // Sprite ID |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
707 |
FOR_EACH_OBJECT { |
0 | 708 |
uint8 spriteid = grf_load_byte(&buf); |
709 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
710 |
/* ships have different custom id in the GRF file */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
711 |
if (spriteid == 0xFF) spriteid = 0xFD; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
712 |
|
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
713 |
if (spriteid < 0xFD) spriteid >>= 1; |
2895
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
714 |
|
0 | 715 |
svi[i].image_index = spriteid; |
716 |
} |
|
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
717 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
718 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
719 |
case 0x09: // Refittable |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
720 |
FOR_EACH_OBJECT svi[i].refittable = (grf_load_byte(&buf) != 0); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
721 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
722 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
723 |
case 0x0A: // Cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
724 |
FOR_EACH_OBJECT svi[i].base_cost = grf_load_byte(&buf); // ?? is it base_cost? |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
725 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
726 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
727 |
case 0x0B: // Speed (1 unit is 0.5 kmh) |
3488
d1d5c0f3f69d
(svn r4339) - Comment Change: NewGRF, update comments for units of speed
peter1138
parents:
3355
diff
changeset
|
728 |
FOR_EACH_OBJECT svi[i].max_speed = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
729 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
730 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
731 |
case 0x0C: // Cargo type |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
732 |
FOR_EACH_OBJECT { |
0 | 733 |
uint8 cargo = grf_load_byte(&buf); |
734 |
||
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
735 |
if (cargo < NUM_CARGO && HASBIT(_cargo_mask, cargo)) { |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
736 |
svi[i].cargo_type = cargo; |
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
737 |
} else { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
738 |
svi[i].cargo_type = CT_INVALID; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
739 |
grfmsg(2, "ShipVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo); |
2846
ac8731dd4121
(svn r3394) - NewGRF fix: ignore non-climate dependent cargo types. The spec is rather vague on this, but we don't support newcargos anyway.
peter1138
parents:
2840
diff
changeset
|
740 |
} |
0 | 741 |
} |
3006
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
742 |
break; |
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
743 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
744 |
case 0x0D: // Cargo capacity |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
745 |
FOR_EACH_OBJECT svi[i].capacity = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
746 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
747 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
748 |
case 0x0F: // Running cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
749 |
FOR_EACH_OBJECT svi[i].running_cost = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
750 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
751 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
752 |
case 0x10: // SFX |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
753 |
FOR_EACH_OBJECT svi[i].sfx = (SoundFx)grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
754 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
755 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
756 |
case 0x11: // Cargos available for refitting |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
757 |
FOR_EACH_OBJECT ei[i].refit_mask = grf_load_dword(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
758 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
759 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
760 |
case 0x12: // Callback mask |
3956
0f43adbc293a
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3924
diff
changeset
|
761 |
FOR_EACH_OBJECT ei[i].callbackmask = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
762 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
763 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
764 |
case 0x13: // Refit cost |
3997
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
765 |
FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf); |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
766 |
break; |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
767 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
768 |
case 0x16: // Retire vehicle early |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
769 |
FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
770 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
771 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
772 |
case 0x17: // Miscellaneous flags |
4952
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
773 |
FOR_EACH_OBJECT { |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
774 |
ei[i].misc_flags = grf_load_byte(&buf); |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
775 |
if (HASBIT(ei[i].misc_flags, EF_USES_2CC)) _have_2cc = true; |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
776 |
} |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
777 |
break; |
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
778 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
779 |
case 0x18: // Cargo classes allowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
780 |
FOR_EACH_OBJECT cargo_allowed[SHIP_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
781 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
782 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
783 |
case 0x19: // Cargo classes disallowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
784 |
FOR_EACH_OBJECT cargo_disallowed[SHIP_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
785 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
786 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
787 |
case 0x1A: // Long format introduction date (days since year 0) |
5114
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
788 |
FOR_EACH_OBJECT ei[i].base_intro = grf_load_dword(&buf); |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
789 |
break; |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
790 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
791 |
case 0x14: // Ocean speed fraction |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
792 |
case 0x15: // Canal speed fraction |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
793 |
/* @todo */ |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
794 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
795 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
796 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
797 |
|
0 | 798 |
default: |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
799 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
800 |
break; |
0 | 801 |
} |
802 |
||
803 |
*bufp = buf; |
|
804 |
return ret; |
|
805 |
} |
|
806 |
||
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
807 |
static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte **bufp, int len) |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
808 |
{ |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
809 |
EngineInfo *ei = &_engine_info[AIRCRAFT_ENGINES_INDEX + engine]; |
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
810 |
AircraftVehicleInfo *avi = &_aircraft_vehicle_info[engine]; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
811 |
byte *buf = *bufp; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
812 |
int i; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
813 |
bool ret = false; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
814 |
|
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
815 |
//printf("e %x prop %x?\n", engine, prop); |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
816 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
817 |
case 0x08: // Sprite ID |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
818 |
FOR_EACH_OBJECT { |
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
819 |
uint8 spriteid = grf_load_byte(&buf); |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
820 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
821 |
/* aircraft have different custom id in the GRF file */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
822 |
if (spriteid == 0xFF) spriteid = 0xFD; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
823 |
|
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
824 |
if (spriteid < 0xFD) spriteid >>= 1; |
2895
943612f25754
(svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf)
peter1138
parents:
2876
diff
changeset
|
825 |
|
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
826 |
avi[i].image_index = spriteid; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
827 |
} |
3006
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
828 |
break; |
f106b4538f41
(svn r3586) - NewGRF: Load callback masks for all vehicle types.
peter1138
parents:
2971
diff
changeset
|
829 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
830 |
case 0x09: // Helicopter |
4926
f67f27fb122f
(svn r6906) - Fix [FS#370]: Clear 'large plane' flag if 'helicopter' flag is set. (mart3p)
peter1138
parents:
4918
diff
changeset
|
831 |
FOR_EACH_OBJECT { |
f67f27fb122f
(svn r6906) - Fix [FS#370]: Clear 'large plane' flag if 'helicopter' flag is set. (mart3p)
peter1138
parents:
4918
diff
changeset
|
832 |
if (grf_load_byte(&buf) == 0) { |
6106
0c9b10a8fedf
(svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
Darkvater
parents:
6014
diff
changeset
|
833 |
avi[i].subtype = AIR_HELI; |
4926
f67f27fb122f
(svn r6906) - Fix [FS#370]: Clear 'large plane' flag if 'helicopter' flag is set. (mart3p)
peter1138
parents:
4918
diff
changeset
|
834 |
} else { |
6106
0c9b10a8fedf
(svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
Darkvater
parents:
6014
diff
changeset
|
835 |
SB(avi[i].subtype, 0, 1, 1); // AIR_CTOL |
4926
f67f27fb122f
(svn r6906) - Fix [FS#370]: Clear 'large plane' flag if 'helicopter' flag is set. (mart3p)
peter1138
parents:
4918
diff
changeset
|
836 |
} |
f67f27fb122f
(svn r6906) - Fix [FS#370]: Clear 'large plane' flag if 'helicopter' flag is set. (mart3p)
peter1138
parents:
4918
diff
changeset
|
837 |
} |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
838 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
839 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
840 |
case 0x0A: // Large |
6106
0c9b10a8fedf
(svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
Darkvater
parents:
6014
diff
changeset
|
841 |
FOR_EACH_OBJECT SB(avi[i].subtype, 1, 1, (grf_load_byte(&buf) != 0 ? 1 : 0)); // AIR_FAST |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
842 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
843 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
844 |
case 0x0B: // Cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
845 |
FOR_EACH_OBJECT avi[i].base_cost = grf_load_byte(&buf); // ?? is it base_cost? |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
846 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
847 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
848 |
case 0x0C: // Speed (1 unit is 8 mph, we translate to 1 unit is 1 km/h) |
6519
367d6f96e23f
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6512
diff
changeset
|
849 |
FOR_EACH_OBJECT avi[i].max_speed = (grf_load_byte(&buf) * 129) / 10; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
850 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
851 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
852 |
case 0x0D: // Acceleration |
6519
367d6f96e23f
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6512
diff
changeset
|
853 |
FOR_EACH_OBJECT avi[i].acceleration = (grf_load_byte(&buf) * 129) / 10; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
854 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
855 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
856 |
case 0x0E: // Running cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
857 |
FOR_EACH_OBJECT avi[i].running_cost = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
858 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
859 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
860 |
case 0x0F: // Passenger capacity |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
861 |
FOR_EACH_OBJECT avi[i].passenger_capacity = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
862 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
863 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
864 |
case 0x11: // Mail capacity |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
865 |
FOR_EACH_OBJECT avi[i].mail_capacity = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
866 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
867 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
868 |
case 0x12: // SFX |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
869 |
FOR_EACH_OBJECT avi[i].sfx = (SoundFx)grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
870 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
871 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
872 |
case 0x13: // Cargos available for refitting |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
873 |
FOR_EACH_OBJECT ei[i].refit_mask = grf_load_dword(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
874 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
875 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
876 |
case 0x14: // Callback mask |
3956
0f43adbc293a
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3924
diff
changeset
|
877 |
FOR_EACH_OBJECT ei[i].callbackmask = grf_load_byte(&buf); |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
878 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
879 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
880 |
case 0x15: // Refit cost |
3997
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
881 |
FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf); |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
882 |
break; |
29c77eab14a4
(svn r5201) - NewGRF: add loading of default refit costs. This information is not yet used
peter1138
parents:
3956
diff
changeset
|
883 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
884 |
case 0x16: // Retire vehicle early |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
885 |
FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
886 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
887 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
888 |
case 0x17: // Miscellaneous flags |
4952
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
889 |
FOR_EACH_OBJECT { |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
890 |
ei[i].misc_flags = grf_load_byte(&buf); |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
891 |
if (HASBIT(ei[i].misc_flags, EF_USES_2CC)) _have_2cc = true; |
8f4969f51719
(svn r6946) - Fix (r6654): This applies to all vehicle types, not just rail vehicles... (mart3p)
peter1138
parents:
4926
diff
changeset
|
892 |
} |
3095
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
893 |
break; |
2d4498efac3b
(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)
peter1138
parents:
3089
diff
changeset
|
894 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
895 |
case 0x18: // Cargo classes allowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
896 |
FOR_EACH_OBJECT cargo_allowed[AIRCRAFT_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
897 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
898 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
899 |
case 0x19: // Cargo classes disallowed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
900 |
FOR_EACH_OBJECT cargo_disallowed[AIRCRAFT_ENGINES_INDEX + engine + i] = grf_load_word(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
901 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
902 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
903 |
case 0x1A: // Long format introduction date (days since year 0) |
5114
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
904 |
FOR_EACH_OBJECT ei[i].base_intro = grf_load_dword(&buf); |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
905 |
break; |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
906 |
|
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
907 |
default: |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
908 |
ret = true; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
909 |
break; |
381
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
910 |
} |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
911 |
|
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
912 |
*bufp = buf; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
913 |
return ret; |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
914 |
} |
94c4794d6bd4
(svn r570) -newgrf: Support for custom aircrafts via GRF files. Planeset seems to work :). Also use aircraft_vehinfo() instead of the old tables (pasky).
darkvater
parents:
379
diff
changeset
|
915 |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
916 |
static bool StationChangeInfo(uint stid, int numinfo, int prop, byte **bufp, int len) |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
917 |
{ |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
918 |
StationSpec **statspec; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
919 |
byte *buf = *bufp; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
920 |
int i; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
921 |
bool ret = false; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
922 |
|
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
923 |
if (stid + numinfo > MAX_STATIONS) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
924 |
grfmsg(1, "StationChangeInfo: Station %u is invalid, max %u, ignoring", stid + numinfo, MAX_STATIONS); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
925 |
return false; |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
926 |
} |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
927 |
|
3501
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
928 |
/* Allocate station specs if necessary */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
929 |
if (_cur_grffile->stations == NULL) _cur_grffile->stations = CallocT<StationSpec*>(MAX_STATIONS); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
930 |
|
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
931 |
statspec = &_cur_grffile->stations[stid]; |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
932 |
|
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
933 |
if (prop != 0x08) { |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
934 |
/* Check that all stations we are modifying are defined. */ |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
935 |
FOR_EACH_OBJECT { |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
936 |
if (statspec[i] == NULL) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
937 |
grfmsg(2, "StationChangeInfo: Attempt to modify undefined station %u, ignoring", stid + i); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
938 |
return false; |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
939 |
} |
3501
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
940 |
} |
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
941 |
} |
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
942 |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
943 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
944 |
case 0x08: // Class ID |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
945 |
FOR_EACH_OBJECT { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
946 |
/* Property 0x08 is special; it is where the station is allocated */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
947 |
if (statspec[i] == NULL) statspec[i] = CallocT<StationSpec>(1); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
948 |
|
3711
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
949 |
/* Swap classid because we read it in BE meaning WAYP or DFLT */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
950 |
uint32 classid = grf_load_dword(&buf); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
951 |
statspec[i]->sclass = AllocateStationClass(BSWAP32(classid)); |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
952 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
953 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
954 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
955 |
case 0x09: // Define sprite layout |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
956 |
FOR_EACH_OBJECT { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
957 |
StationSpec *statspec = _cur_grffile->stations[stid + i]; |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
958 |
|
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
959 |
statspec->tiles = grf_load_extended(&buf); |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
960 |
statspec->renderdata = CallocT<DrawTileSprites>(statspec->tiles); |
3740
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
961 |
statspec->copied_renderdata = false; |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
962 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
963 |
for (uint t = 0; t < statspec->tiles; t++) { |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
964 |
DrawTileSprites *dts = &statspec->renderdata[t]; |
3570
f9749bae861e
(svn r4452) - NewGRF: switch to unsigned ints for array indices.
peter1138
parents:
3566
diff
changeset
|
965 |
uint seq_count = 0; |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
966 |
|
3737
26341085bbbf
(svn r4719) - Newstations: instead of drawing nothing, fall back to the default sprite layout if a station layout specifies so.
peter1138
parents:
3736
diff
changeset
|
967 |
dts->seq = NULL; |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
968 |
dts->ground_sprite = grf_load_word(&buf); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
969 |
dts->ground_pal = grf_load_word(&buf); |
3775
f3f1ba3111fa
(svn r4767) - Newstations: fix loading / use of custom ground sprites
peter1138
parents:
3771
diff
changeset
|
970 |
if (dts->ground_sprite == 0) continue; |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
971 |
if (HASBIT(dts->ground_pal, 15)) { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
972 |
CLRBIT(dts->ground_pal, 15); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
973 |
SETBIT(dts->ground_sprite, SPRITE_MODIFIER_USE_OFFSET); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
974 |
} |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
975 |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
976 |
while (buf < *bufp + len) { |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
977 |
DrawTileSeqStruct *dtss; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
978 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
979 |
/* no relative bounding box support */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
980 |
dts->seq = ReallocT((DrawTileSeqStruct*)dts->seq, ++seq_count); |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
981 |
dtss = (DrawTileSeqStruct*) &dts->seq[seq_count - 1]; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
982 |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
983 |
dtss->delta_x = grf_load_byte(&buf); |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
984 |
if ((byte) dtss->delta_x == 0x80) break; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
985 |
dtss->delta_y = grf_load_byte(&buf); |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
986 |
dtss->delta_z = grf_load_byte(&buf); |
4230
cd86b1c47f33
(svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z}
tron
parents:
4201
diff
changeset
|
987 |
dtss->size_x = grf_load_byte(&buf); |
cd86b1c47f33
(svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z}
tron
parents:
4201
diff
changeset
|
988 |
dtss->size_y = grf_load_byte(&buf); |
cd86b1c47f33
(svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z}
tron
parents:
4201
diff
changeset
|
989 |
dtss->size_z = grf_load_byte(&buf); |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
990 |
dtss->image = grf_load_word(&buf); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
991 |
dtss->pal = grf_load_word(&buf); |
3771
b34d07131ad1
(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.
peter1138
parents:
3768
diff
changeset
|
992 |
|
3775
f3f1ba3111fa
(svn r4767) - Newstations: fix loading / use of custom ground sprites
peter1138
parents:
3771
diff
changeset
|
993 |
/* Remap flags as ours collide */ |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
994 |
if (HASBIT(dtss->pal, 15)) { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
995 |
CLRBIT(dtss->pal, 15); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
996 |
SETBIT(dtss->image, SPRITE_MODIFIER_USE_OFFSET); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
997 |
} |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
998 |
|
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
999 |
if (HASBIT(dtss->image, 15)) { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1000 |
CLRBIT(dtss->image, 15); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1001 |
SETBIT(dtss->image, PALETTE_MODIFIER_COLOR); |
3775
f3f1ba3111fa
(svn r4767) - Newstations: fix loading / use of custom ground sprites
peter1138
parents:
3771
diff
changeset
|
1002 |
} |
3771
b34d07131ad1
(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.
peter1138
parents:
3768
diff
changeset
|
1003 |
if (HASBIT(dtss->image, 14)) { |
b34d07131ad1
(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.
peter1138
parents:
3768
diff
changeset
|
1004 |
CLRBIT(dtss->image, 14); |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1005 |
SETBIT(dtss->image, PALETTE_MODIFIER_TRANSPARENT); |
3771
b34d07131ad1
(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.
peter1138
parents:
3768
diff
changeset
|
1006 |
} |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1007 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1008 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1009 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1010 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1011 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1012 |
case 0x0A: // Copy sprite layout |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1013 |
FOR_EACH_OBJECT { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1014 |
StationSpec *statspec = _cur_grffile->stations[stid + i]; |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
1015 |
byte srcid = grf_load_byte(&buf); |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1016 |
const StationSpec *srcstatspec = _cur_grffile->stations[srcid]; |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
1017 |
|
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1018 |
statspec->tiles = srcstatspec->tiles; |
3738
d41775f0f3fb
(svn r4720) - Newstations: instead of literally copying sprite layout data, just copy the pointer to the existing data.
peter1138
parents:
3737
diff
changeset
|
1019 |
statspec->renderdata = srcstatspec->renderdata; |
3740
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
1020 |
statspec->copied_renderdata = true; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1021 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1022 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1023 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1024 |
case 0x0B: // Callback mask |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1025 |
FOR_EACH_OBJECT statspec[i]->callbackmask = grf_load_byte(&buf); |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1026 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1027 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1028 |
case 0x0C: // Disallowed number of platforms |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1029 |
FOR_EACH_OBJECT statspec[i]->disallowed_platforms = grf_load_byte(&buf); |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1030 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1031 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1032 |
case 0x0D: // Disallowed platform lengths |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1033 |
FOR_EACH_OBJECT statspec[i]->disallowed_lengths = grf_load_byte(&buf); |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1034 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1035 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1036 |
case 0x0E: // Define custom layout |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1037 |
FOR_EACH_OBJECT { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1038 |
StationSpec *statspec = _cur_grffile->stations[stid + i]; |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1039 |
|
5060
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1040 |
statspec->copied_layouts = false; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1041 |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1042 |
while (buf < *bufp + len) { |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1043 |
byte length = grf_load_byte(&buf); |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1044 |
byte number = grf_load_byte(&buf); |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1045 |
StationLayout layout; |
3570
f9749bae861e
(svn r4452) - NewGRF: switch to unsigned ints for array indices.
peter1138
parents:
3566
diff
changeset
|
1046 |
uint l, p; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1047 |
|
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1048 |
if (length == 0 || number == 0) break; |
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1049 |
|
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1050 |
//debug("l %d > %d ?", length, stat->lengths); |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1051 |
if (length > statspec->lengths) { |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1052 |
statspec->platforms = ReallocT(statspec->platforms, length); |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1053 |
memset(statspec->platforms + statspec->lengths, 0, length - statspec->lengths); |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1054 |
|
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1055 |
statspec->layouts = ReallocT(statspec->layouts, length); |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1056 |
memset(statspec->layouts + statspec->lengths, 0, |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1057 |
(length - statspec->lengths) * sizeof(*statspec->layouts)); |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1058 |
|
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1059 |
statspec->lengths = length; |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1060 |
} |
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1061 |
l = length - 1; // index is zero-based |
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1062 |
|
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1063 |
//debug("p %d > %d ?", number, stat->platforms[l]); |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1064 |
if (number > statspec->platforms[l]) { |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1065 |
statspec->layouts[l] = ReallocT(statspec->layouts[l], number); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1066 |
/* We expect NULL being 0 here, but C99 guarantees that. */ |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1067 |
memset(statspec->layouts[l] + statspec->platforms[l], 0, |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1068 |
(number - statspec->platforms[l]) * sizeof(**statspec->layouts)); |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1069 |
|
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1070 |
statspec->platforms[l] = number; |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1071 |
} |
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1072 |
|
542 | 1073 |
p = 0; |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1074 |
layout = MallocT<byte>(length * number); |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1075 |
for (l = 0; l < length; l++) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1076 |
for (p = 0; p < number; p++) { |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1077 |
layout[l * number + p] = grf_load_byte(&buf); |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1078 |
} |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1079 |
} |
449
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1080 |
|
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1081 |
l--; |
d9325d9f24bb
(svn r659) Support for cutomized TTDPatch-style new stations (no selector GUI yet) (pasky)
tron
parents:
448
diff
changeset
|
1082 |
p--; |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1083 |
free(statspec->layouts[l][p]); |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3672
diff
changeset
|
1084 |
statspec->layouts[l][p] = layout; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1085 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1086 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1087 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1088 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1089 |
case 0x0F: // Copy custom layout |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1090 |
FOR_EACH_OBJECT { |
5060
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1091 |
StationSpec *statspec = _cur_grffile->stations[stid + i]; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1092 |
byte srcid = grf_load_byte(&buf); |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1093 |
const StationSpec *srcstatspec = _cur_grffile->stations[srcid]; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1094 |
|
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1095 |
statspec->lengths = srcstatspec->lengths; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1096 |
statspec->platforms = srcstatspec->platforms; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1097 |
statspec->layouts = srcstatspec->layouts; |
2d577061b0ec
(svn r7113) -Codechange: [NewStations] Add support for copying custom station layouts
peter1138
parents:
5037
diff
changeset
|
1098 |
statspec->copied_layouts = true; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1099 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1100 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1101 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1102 |
case 0x10: // Little/lots cargo threshold |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1103 |
FOR_EACH_OBJECT statspec[i]->cargo_threshold = grf_load_word(&buf); |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1104 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1105 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1106 |
case 0x11: // Pylon placement |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1107 |
FOR_EACH_OBJECT statspec[i]->pylons = grf_load_byte(&buf); |
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1108 |
break; |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1109 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1110 |
case 0x12: // Cargo types for random triggers |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1111 |
FOR_EACH_OBJECT statspec[i]->cargo_triggers = grf_load_dword(&buf); |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1112 |
break; |
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1113 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1114 |
case 0x13: // General flags |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1115 |
FOR_EACH_OBJECT statspec[i]->flags = grf_load_byte(&buf); |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1116 |
break; |
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1117 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1118 |
case 0x14: // Overhead wire placement |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1119 |
FOR_EACH_OBJECT statspec[i]->wires = grf_load_byte(&buf); |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1120 |
break; |
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1121 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1122 |
case 0x15: // Blocked tiles |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
1123 |
FOR_EACH_OBJECT statspec[i]->blocked = grf_load_byte(&buf); |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1124 |
break; |
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1125 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1126 |
case 0x16: // @todo Animation info |
6154
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1127 |
FOR_EACH_OBJECT grf_load_word(&buf); |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1128 |
ret = true; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1129 |
break; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1130 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1131 |
case 0x17: // @todo Animation speed |
6154
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1132 |
FOR_EACH_OBJECT grf_load_byte(&buf); |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1133 |
ret = true; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1134 |
break; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1135 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1136 |
case 0x18: // @todo Animation triggers |
6154
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1137 |
FOR_EACH_OBJECT grf_load_word(&buf); |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1138 |
ret = true; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1139 |
break; |
dac2e6d13112
(svn r8526) -Codechange: add stubs for unsupported newgrf station properties
peter1138
parents:
6140
diff
changeset
|
1140 |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1141 |
default: |
3505
e9a3a6b79561
(svn r4356) - NewGRF: Load more newstation properties.
peter1138
parents:
3504
diff
changeset
|
1142 |
ret = true; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1143 |
break; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1144 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1145 |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1146 |
*bufp = buf; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1147 |
return ret; |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1148 |
} |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1149 |
|
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1150 |
static bool BridgeChangeInfo(uint brid, int numinfo, int prop, byte **bufp, int len) |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1151 |
{ |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1152 |
byte *buf = *bufp; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1153 |
int i; |
3504
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1154 |
bool ret = false; |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1155 |
|
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1156 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1157 |
case 0x08: // Year of availability |
4322
0bee6d9bc452
(svn r5975) -Cleanup: use ORIGINAL_BASE_YEAR & ORIGINAL_MAX_YEAR where the functions really depend on the original date format.
rubidium
parents:
4321
diff
changeset
|
1158 |
FOR_EACH_OBJECT _bridge[brid + i].avail_year = ORIGINAL_BASE_YEAR + grf_load_byte(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1159 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1160 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1161 |
case 0x09: // Minimum length |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1162 |
FOR_EACH_OBJECT _bridge[brid + i].min_length = grf_load_byte(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1163 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1164 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1165 |
case 0x0A: // Maximum length |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1166 |
FOR_EACH_OBJECT _bridge[brid + i].max_length = grf_load_byte(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1167 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1168 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1169 |
case 0x0B: // Cost factor |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1170 |
FOR_EACH_OBJECT _bridge[brid + i].price = grf_load_byte(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1171 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1172 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1173 |
case 0x0C: // Maximum speed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1174 |
FOR_EACH_OBJECT _bridge[brid + i].speed = grf_load_word(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1175 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1176 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1177 |
case 0x0D: // Bridge sprite tables |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1178 |
FOR_EACH_OBJECT { |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1179 |
Bridge *bridge = &_bridge[brid + i]; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1180 |
byte tableid = grf_load_byte(&buf); |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1181 |
byte numtables = grf_load_byte(&buf); |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1182 |
|
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1183 |
if (bridge->sprite_table == NULL) { |
3555
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1184 |
/* Allocate memory for sprite table pointers and zero out */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1185 |
bridge->sprite_table = CallocT<PalSpriteID*>(7); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1186 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1187 |
|
3555
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1188 |
for (; numtables-- != 0; tableid++) { |
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1189 |
if (tableid >= 7) { // skip invalid data |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1190 |
grfmsg(1, "BridgeChangeInfo: Table %d >= 7, skipping", tableid); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1191 |
for (byte sprite = 0; sprite < 32; sprite++) grf_load_dword(&buf); |
3555
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1192 |
continue; |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1193 |
} |
3555
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1194 |
|
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1195 |
if (bridge->sprite_table[tableid] == NULL) { |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
1196 |
bridge->sprite_table[tableid] = MallocT<PalSpriteID>(32); |
3555
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1197 |
} |
7a4f6e2aee0f
(svn r4429) - CodeChange[newgrf]: Action0, prop 0x0D. use calloc to allocate memory and zero it out and change the loop a little
Darkvater
parents:
3548
diff
changeset
|
1198 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1199 |
for (byte sprite = 0; sprite < 32; sprite++) { |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1200 |
SpriteID image = grf_load_word(&buf); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1201 |
SpriteID pal = grf_load_word(&buf); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1202 |
|
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1203 |
if (HASBIT(pal, 15)) { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1204 |
SETBIT(image, PALETTE_MODIFIER_TRANSPARENT); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1205 |
} |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1206 |
|
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1207 |
/* Clear old color modifer bit */ |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1208 |
CLRBIT(image, 15); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1209 |
|
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1210 |
bridge->sprite_table[tableid][sprite].sprite = image; |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1211 |
bridge->sprite_table[tableid][sprite].pal = pal; |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5868
diff
changeset
|
1212 |
} |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1213 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1214 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1215 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1216 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1217 |
case 0x0E: // Flags; bit 0 - disable far pillars |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1218 |
FOR_EACH_OBJECT _bridge[brid + i].flags = grf_load_byte(&buf); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1219 |
break; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1220 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1221 |
case 0x0F: // Long format year of availability (year since year 0) |
5114
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
1222 |
FOR_EACH_OBJECT _bridge[brid + i].avail_year = clamp(grf_load_dword(&buf), MIN_YEAR, MAX_YEAR); |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
1223 |
break; |
2a29f37a7c1e
(svn r7191) -Feature: Add NewGRF support for 32 bit dates, allowing vehicles and bridges to be available before 1920.
peter1138
parents:
5108
diff
changeset
|
1224 |
|
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1225 |
default: |
3504
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1226 |
ret = true; |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1227 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1228 |
|
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1229 |
*bufp = buf; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1230 |
return ret; |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
1231 |
} |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1232 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1233 |
static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, int len) |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1234 |
{ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1235 |
HouseSpec **housespec; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1236 |
byte *buf = *bufp; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1237 |
int i; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1238 |
bool ret = false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1239 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1240 |
if (hid + numinfo >= HOUSE_MAX) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1241 |
grfmsg(1, "TownHouseChangeInfo: Too many houses loaded (%u), max (%u). Ignoring.", hid + numinfo, HOUSE_MAX-1); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1242 |
return false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1243 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1244 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1245 |
/* Allocate house specs if they haven't been allocated already. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1246 |
if (_cur_grffile->housespec == NULL) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1247 |
_cur_grffile->housespec = CallocT<HouseSpec*>(HOUSE_MAX); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1248 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1249 |
/* Reset any overrides that have been set. */ |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1250 |
_house_mngr.ResetOverride(); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1251 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1252 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1253 |
housespec = &_cur_grffile->housespec[hid]; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1254 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1255 |
if (prop != 0x08) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1256 |
/* Check that all the houses being modified have been defined. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1257 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1258 |
if (housespec[i] == NULL) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1259 |
grfmsg(2, "TownHouseChangeInfo: Attempt to modify undefined house %u. Ignoring.", hid + i); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1260 |
return false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1261 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1262 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1263 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1264 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1265 |
switch (prop) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1266 |
case 0x08: // Substitute building type, and definition of a new house |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1267 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1268 |
byte subs_id = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1269 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1270 |
if (subs_id == 0xFF) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1271 |
/* Instead of defining a new house, a substitute house id |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1272 |
* of 0xFF disables the old house with the current id. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1273 |
_house_specs[hid + i].enabled = false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1274 |
continue; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1275 |
} else if (subs_id >= NEW_HOUSE_OFFSET) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1276 |
/* The substitute id must be one of the original houses. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1277 |
grfmsg(2, "TownHouseChangeInfo: Attempt to use new house %u as substitute house for %u. Ignoring.", subs_id, hid + i); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1278 |
return false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1279 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1280 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1281 |
/* Allocate space for this house. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1282 |
if (housespec[i] == NULL) housespec[i] = CallocT<HouseSpec>(1); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1283 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1284 |
memcpy(housespec[i], &_house_specs[subs_id], sizeof(_house_specs[subs_id])); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1285 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1286 |
housespec[i]->enabled = true; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1287 |
housespec[i]->local_id = hid + i; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1288 |
housespec[i]->substitute_id = subs_id; |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1289 |
housespec[i]->grffile = _cur_grffile; |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1290 |
housespec[i]->random_colour[0] = 0x04; // those 4 random colours are the base colour |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1291 |
housespec[i]->random_colour[1] = 0x08; // for all new houses |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1292 |
housespec[i]->random_colour[2] = 0x0C; // they stand for red, blue, orange and green |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1293 |
housespec[i]->random_colour[3] = 0x06; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1294 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1295 |
/* New houses do not (currently) expect to have a default start |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1296 |
* date before 1930, as this breaks the build date stuff. See |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1297 |
* FinaliseHouseArray() for more details. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1298 |
if (housespec[i]->min_date < 1930) housespec[i]->min_date = 1930; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1299 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1300 |
_have_newhouses = true; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1301 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1302 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1303 |
case 0x09: // Building flags |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1304 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1305 |
byte state = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1306 |
housespec[i]->building_flags = (BuildingFlags)state; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1307 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1308 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1309 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1310 |
case 0x0A: // Availability years |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1311 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1312 |
uint16 years = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1313 |
housespec[i]->min_date = GB(years, 0, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 0, 8); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1314 |
housespec[i]->max_date = GB(years, 8, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 8, 8); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1315 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1316 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1317 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1318 |
case 0x0B: // Population |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1319 |
FOR_EACH_OBJECT housespec[i]->population = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1320 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1321 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1322 |
case 0x0C: // Mail generation multiplier |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1323 |
FOR_EACH_OBJECT housespec[i]->mail_generation = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1324 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1325 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1326 |
case 0x0D: // Passenger acceptance |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1327 |
case 0x0E: // Mail acceptance |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1328 |
FOR_EACH_OBJECT housespec[i]->cargo_acceptance[prop - 0x0D] = grf_load_byte(&buf); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1329 |
break; |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1330 |
case 0x0F: // Goods/candy, food/fizzy drinks acceptance |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1331 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1332 |
int8 goods = grf_load_byte(&buf); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1333 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1334 |
/* If value of goods is negative, it means in fact food or, if in toyland, fizzy_drink acceptance. |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1335 |
* Else, we have "standard" 3rd cargo type, goods or candy, for toyland once more */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1336 |
housespec[i]->accepts_cargo[2] = (goods >= 0) ? ((_opt.landscape == LT_TOYLAND) ? CT_CANDY : CT_GOODS) : |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1337 |
((_opt.landscape == LT_TOYLAND) ? CT_FIZZY_DRINKS : CT_FOOD); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1338 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1339 |
housespec[i]->cargo_acceptance[2] = abs(goods); // but we do need positive value here |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1340 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1341 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1342 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1343 |
case 0x10: // Local authority rating decrease on removal |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1344 |
FOR_EACH_OBJECT housespec[i]->remove_rating_decrease = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1345 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1346 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1347 |
case 0x11: // Removal cost multiplier |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1348 |
FOR_EACH_OBJECT housespec[i]->removal_cost = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1349 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1350 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1351 |
case 0x12: // Building name ID |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1352 |
FOR_EACH_OBJECT housespec[i]->building_name = MapGRFStringID(_cur_grffile->grfid, grf_load_word(&buf)); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1353 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1354 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1355 |
case 0x13: // Building availability mask |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1356 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1357 |
uint16 avail = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1358 |
housespec[i]->building_availability = (HouseZones)avail; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1359 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1360 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1361 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1362 |
case 0x14: // House callback flags |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1363 |
FOR_EACH_OBJECT housespec[i]->callback_mask = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1364 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1365 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1366 |
case 0x15: // House override byte |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1367 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1368 |
byte override = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1369 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1370 |
/* The house being overridden must be an original house. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1371 |
if (override >= NEW_HOUSE_OFFSET) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1372 |
grfmsg(2, "TownHouseChangeInfo: Attempt to override new house %u with house id %u. Ignoring.", override, hid); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1373 |
return false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1374 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1375 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1376 |
_house_mngr.Add(hid, override); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1377 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1378 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1379 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1380 |
case 0x16: // Periodic refresh multiplier |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1381 |
FOR_EACH_OBJECT housespec[i]->processing_time = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1382 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1383 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1384 |
case 0x17: // Four random colours to use |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1385 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1386 |
uint j; |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
1387 |
for (j = 0; j < 4; j++) housespec[i]->random_colour[j] = grf_load_byte(&buf); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1388 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1389 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1390 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1391 |
case 0x18: // Relative probability of appearing |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1392 |
FOR_EACH_OBJECT housespec[i]->probability = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1393 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1394 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1395 |
case 0x19: // Extra flags |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1396 |
FOR_EACH_OBJECT { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1397 |
byte flags = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1398 |
housespec[i]->extra_flags = (HouseExtraFlags)flags; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1399 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1400 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1401 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1402 |
case 0x1A: // Animation frames |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1403 |
FOR_EACH_OBJECT housespec[i]->animation_frames = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1404 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1405 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1406 |
case 0x1B: // Animation speed |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1407 |
FOR_EACH_OBJECT housespec[i]->animation_speed = clamp(grf_load_byte(&buf), 2, 16); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1408 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1409 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1410 |
case 0x1C: // Class of the building type |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1411 |
FOR_EACH_OBJECT housespec[i]->class_id = AllocateHouseClassID(grf_load_byte(&buf), _cur_grffile->grfid); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1412 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1413 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1414 |
case 0x1D: // Callback flags 2 |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1415 |
FOR_EACH_OBJECT housespec[i]->callback_mask |= (grf_load_byte(&buf) << 8); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1416 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1417 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1418 |
case 0x1E: // Accepted cargo types |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1419 |
FOR_EACH_OBJECT { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1420 |
uint32 cargotypes = grf_load_dword(&buf); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1421 |
|
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1422 |
/* Check if the cargo types should not be changed */ |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1423 |
if (cargotypes == 0xFFFFFFFF) break; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1424 |
|
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1425 |
for (uint j = 0; j < 3; j++) { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1426 |
/* Get the cargo number from the 'list' */ |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1427 |
uint8 cargo_part = GB(cargotypes, 8 * j, 8); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1428 |
CargoID cargo = GetCargoTranslation(cargo_part, _cur_grffile); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1429 |
|
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1430 |
if (cargo == CT_INVALID) { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1431 |
/* Disable acceptance of invalid cargo type */ |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1432 |
housespec[i]->cargo_acceptance[j] = 0; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1433 |
} else { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1434 |
housespec[i]->accepts_cargo[j] = cargo; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1435 |
} |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1436 |
} |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1437 |
} |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1438 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1439 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1440 |
case 0x1F: // Minimum life span |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1441 |
FOR_EACH_OBJECT housespec[i]->minimum_life = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1442 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
1443 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1444 |
default: |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1445 |
ret = true; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1446 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1447 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1448 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1449 |
*bufp = buf; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1450 |
return ret; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1451 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1452 |
|
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1453 |
static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, int len) |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1454 |
{ |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1455 |
byte *buf = *bufp; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1456 |
int i; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1457 |
bool ret = false; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1458 |
|
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1459 |
switch (prop) { |
3504
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1460 |
case 0x08: /* Cost base factor */ |
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1461 |
FOR_EACH_OBJECT { |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1462 |
byte factor = grf_load_byte(&buf); |
2508
c1a1af1920ce
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
1463 |
uint price = gvid + i; |
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1464 |
|
9903
dc85aaa556ae
(svn r9534) [gamebalance] -Codechange: Made the prices a member of the Economy and removed all global variables concerning prices (INCOMPLETE).
celestar
parents:
9896
diff
changeset
|
1465 |
if (price < CEconomy::MAX_PRICE) { |
dc85aaa556ae
(svn r9534) [gamebalance] -Codechange: Made the prices a member of the Economy and removed all global variables concerning prices (INCOMPLETE).
celestar
parents:
9896
diff
changeset
|
1466 |
//SetPriceBaseMultiplier(price, factor); |
2508
c1a1af1920ce
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
1467 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1468 |
grfmsg(1, "GlobalVarChangeInfo: Price %d out of range, ignoring", price); |
2508
c1a1af1920ce
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
1469 |
} |
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1470 |
} |
3504
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1471 |
break; |
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1472 |
|
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1473 |
case 0x09: /* Cargo translation table */ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1474 |
/* This is loaded during the initialisation stage, so just skip it here. */ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1475 |
/* Each entry is 4 bytes. */ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1476 |
buf += numinfo * 4; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1477 |
break; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1478 |
|
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1479 |
case 0x0A: // Currency display names |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1480 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1481 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1482 |
StringID newone = GetGRFStringID(_cur_grffile->grfid, grf_load_word(&buf)); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1483 |
|
4504
3d20af4bd525
(svn r6289) -Fix(r6108) : case 0x48 (generic text) should not have been set over newstations.
belugas
parents:
4434
diff
changeset
|
1484 |
if ((newone != STR_UNDEFINED) && (curidx < NUM_CURRENCY)) { |
3d20af4bd525
(svn r6289) -Fix(r6108) : case 0x48 (generic text) should not have been set over newstations.
belugas
parents:
4434
diff
changeset
|
1485 |
_currency_specs[curidx].name = newone; |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1486 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1487 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1488 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1489 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1490 |
case 0x0B: // Currency multipliers |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1491 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1492 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1493 |
uint32 rate = grf_load_dword(&buf); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1494 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1495 |
if (curidx < NUM_CURRENCY) { |
4602
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1496 |
/* TTDPatch uses a multiple of 1000 for its conversion calculations, |
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1497 |
* which OTTD does not. For this reason, divide grf value by 1000, |
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1498 |
* to be compatible */ |
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1499 |
_currency_specs[curidx].rate = rate / 1000; |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1500 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1501 |
grfmsg(1, "GlobalVarChangeInfo: Currency multipliers %d out of range, ignoring", curidx); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1502 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1503 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1504 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1505 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1506 |
case 0x0C: // Currency options |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1507 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1508 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1509 |
uint16 options = grf_load_word(&buf); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1510 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1511 |
if (curidx < NUM_CURRENCY) { |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1512 |
_currency_specs[curidx].separator = GB(options, 0, 8); |
4602
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1513 |
/* By specifying only one bit, we prevent errors, |
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1514 |
* since newgrf specs said that only 0 and 1 can be set for symbol_pos */ |
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1515 |
_currency_specs[curidx].symbol_pos = GB(options, 8, 1); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1516 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1517 |
grfmsg(1, "GlobalVarChangeInfo: Currency option %d out of range, ignoring", curidx); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1518 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1519 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1520 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1521 |
|
4602
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1522 |
case 0x0D: // Currency prefix symbol |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1523 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1524 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1525 |
uint32 tempfix = grf_load_dword(&buf); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1526 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1527 |
if (curidx < NUM_CURRENCY) { |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1528 |
memcpy(_currency_specs[curidx].prefix,&tempfix,4); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1529 |
_currency_specs[curidx].prefix[4] = 0; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1530 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1531 |
grfmsg(1, "GlobalVarChangeInfo: Currency symbol %d out of range, ignoring", curidx); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1532 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1533 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1534 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1535 |
|
4602
36e779efee9a
(svn r6454) -Fix(r6108) : Allow custom currency to display both prefix and suffix
belugas
parents:
4504
diff
changeset
|
1536 |
case 0x0E: // Currency suffix symbol |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1537 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1538 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1539 |
uint32 tempfix = grf_load_dword(&buf); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1540 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1541 |
if (curidx < NUM_CURRENCY) { |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
1542 |
memcpy(&_currency_specs[curidx].suffix, &tempfix, 4); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1543 |
_currency_specs[curidx].suffix[4] = 0; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1544 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1545 |
grfmsg(1, "GlobalVarChangeInfo: Currency symbol %d out of range, ignoring", curidx); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1546 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1547 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1548 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1549 |
|
4504
3d20af4bd525
(svn r6289) -Fix(r6108) : case 0x48 (generic text) should not have been set over newstations.
belugas
parents:
4434
diff
changeset
|
1550 |
case 0x0F: // Euro introduction dates |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1551 |
FOR_EACH_OBJECT { |
4625
3e45c59b5d64
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
belugas
parents:
4602
diff
changeset
|
1552 |
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1553 |
Year year_euro = grf_load_word(&buf); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1554 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1555 |
if (curidx < NUM_CURRENCY) { |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1556 |
_currency_specs[curidx].to_euro = year_euro; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1557 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1558 |
grfmsg(1, "GlobalVarChangeInfo: Euro intro date %d out of range, ignoring", curidx); |
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1559 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1560 |
} |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1561 |
break; |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1562 |
|
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
1563 |
case 0x10: // 12 * 32 * B Snow line height table |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1564 |
if (numinfo > 1 || IsSnowLineSet()) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1565 |
grfmsg(1, "GlobalVarChangeInfo: The snowline can only be set once (%d)", numinfo); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1566 |
} else if (len < SNOW_LINE_MONTHS * SNOW_LINE_DAYS) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1567 |
grfmsg(1, "GlobalVarChangeInfo: Not enough entries set in the snowline table (%d)", len); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1568 |
} else { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1569 |
byte table[SNOW_LINE_MONTHS][SNOW_LINE_DAYS]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1570 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1571 |
for (uint i = 0; i < SNOW_LINE_MONTHS; i++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1572 |
for (uint j = 0; j < SNOW_LINE_DAYS; j++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1573 |
table[i][j] = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1574 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1575 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1576 |
SetSnowLine(table); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1577 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1578 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1579 |
|
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1580 |
default: |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1581 |
ret = true; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1582 |
} |
3504
546b53897c01
(svn r4355) - NewGRF: Minor clean up; use the correct return type and remove extraneous brackets.
peter1138
parents:
3501
diff
changeset
|
1583 |
|
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1584 |
*bufp = buf; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1585 |
return ret; |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1586 |
} |
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
1587 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1588 |
static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int len) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1589 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1590 |
if (cid + numinfo > NUM_CARGO) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1591 |
grfmsg(2, "CargoChangeInfo: Cargo type %d out of range (max %d)", cid + numinfo, NUM_CARGO - 1); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1592 |
return false; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1593 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1594 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1595 |
CargoSpec *cs = &_cargo[cid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1596 |
byte *buf = *bufp; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1597 |
int i; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1598 |
bool ret = false; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1599 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1600 |
switch (prop) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1601 |
case 0x08: /* Bit number of cargo */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1602 |
FOR_EACH_OBJECT { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1603 |
cs[i].bitnum = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1604 |
cs[i].grfid = _cur_grffile->grfid; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1605 |
if (cs->IsValid()) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1606 |
SETBIT(_cargo_mask, cid + i); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1607 |
} else { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1608 |
CLRBIT(_cargo_mask, cid + i); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1609 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1610 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1611 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1612 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1613 |
case 0x09: /* String ID for cargo type name */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1614 |
FOR_EACH_OBJECT cs[i].name = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1615 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1616 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1617 |
case 0x0A: /* String for cargo name, plural */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1618 |
FOR_EACH_OBJECT cs[i].name_plural = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1619 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1620 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1621 |
case 0x0B: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1622 |
/* String for units of cargo. This is different in OpenTTD to TTDPatch |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1623 |
* (e.g. 10 tonnes of coal) */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1624 |
FOR_EACH_OBJECT cs[i].units_volume = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1625 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1626 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1627 |
case 0x0C: /* String for quantity of cargo (e.g. 10 tonnes of coal) */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1628 |
FOR_EACH_OBJECT cs[i].quantifier = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1629 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1630 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1631 |
case 0x0D: /* String for two letter cargo abbreviation */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1632 |
FOR_EACH_OBJECT cs[i].abbrev = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1633 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1634 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1635 |
case 0x0E: /* Sprite ID for cargo icon */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1636 |
FOR_EACH_OBJECT cs[i].sprite = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1637 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1638 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1639 |
case 0x0F: /* Weight of one unit of cargo */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1640 |
FOR_EACH_OBJECT cs[i].weight = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1641 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1642 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1643 |
case 0x10: /* Used for payment calculation */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1644 |
FOR_EACH_OBJECT cs[i].transit_days[0] = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1645 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1646 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1647 |
case 0x11: /* Used for payment calculation */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1648 |
FOR_EACH_OBJECT cs[i].transit_days[1] = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1649 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1650 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1651 |
case 0x12: /* Base cargo price */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1652 |
FOR_EACH_OBJECT cs[i].initial_payment = grf_load_dword(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1653 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1654 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1655 |
case 0x13: /* Colour for station rating bars */ |
9907
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
1656 |
FOR_EACH_OBJECT cs[i].rating_colour = MapDOSColour(grf_load_byte(&buf)); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1657 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1658 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1659 |
case 0x14: /* Colour for cargo graph */ |
9907
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
1660 |
FOR_EACH_OBJECT cs[i].legend_colour = MapDOSColour(grf_load_byte(&buf)); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1661 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1662 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1663 |
case 0x15: /* Freight status */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1664 |
FOR_EACH_OBJECT cs[i].is_freight = grf_load_byte(&buf) != 0; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1665 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1666 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1667 |
case 0x16: /* Cargo classes */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1668 |
FOR_EACH_OBJECT cs[i].classes = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1669 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1670 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1671 |
case 0x17: /* Cargo label */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1672 |
FOR_EACH_OBJECT { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1673 |
cs[i].label = grf_load_dword(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1674 |
cs[i].label = BSWAP32(cs[i].label); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1675 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1676 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1677 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1678 |
case 0x18: /* Town growth substitute type */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1679 |
FOR_EACH_OBJECT { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1680 |
uint8 substitute_type = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1681 |
switch (substitute_type) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1682 |
case 0x00: cs[i].town_effect = TE_PASSENGERS; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1683 |
case 0x02: cs[i].town_effect = TE_MAIL; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1684 |
case 0x05: cs[i].town_effect = TE_GOODS; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1685 |
case 0x09: cs[i].town_effect = TE_WATER; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1686 |
case 0x0B: cs[i].town_effect = TE_FOOD; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1687 |
default: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1688 |
grfmsg(1, "CargoChangeInfo: Unknown town growth substitute value %d, setting to none.", substitute_type); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1689 |
case 0xFF: cs[i].town_effect = TE_NONE; break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1690 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1691 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1692 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1693 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1694 |
case 0x19: /* Town growth coefficient */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1695 |
FOR_EACH_OBJECT cs[i].multipliertowngrowth = grf_load_word(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1696 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1697 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1698 |
case 0x1A: /* Bitmask of callbacks to use */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1699 |
FOR_EACH_OBJECT cs[i].callback_mask = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1700 |
break; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1701 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1702 |
default: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1703 |
ret = true; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1704 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1705 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1706 |
*bufp = buf; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1707 |
return ret; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1708 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1709 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1710 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1711 |
static bool SoundEffectChangeInfo(uint sid, int numinfo, int prop, byte **bufp, int len) |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1712 |
{ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1713 |
byte *buf = *bufp; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1714 |
int i; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1715 |
bool ret = false; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1716 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1717 |
if (_cur_grffile->sound_offset == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1718 |
grfmsg(1, "SoundEffectChangeInfo: No effects defined, skipping"); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1719 |
return false; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1720 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1721 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1722 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1723 |
case 0x08: // Relative volume |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1724 |
FOR_EACH_OBJECT { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1725 |
uint sound = sid + i + _cur_grffile->sound_offset - GetNumOriginalSounds(); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1726 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1727 |
if (sound >= GetNumSounds()) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1728 |
grfmsg(1, "SoundEffectChangeInfo: Sound %d not defined (max %d)", sound, GetNumSounds()); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1729 |
} else { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1730 |
GetSound(sound)->volume = grf_load_byte(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1731 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1732 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1733 |
break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1734 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1735 |
case 0x09: // Priority |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1736 |
FOR_EACH_OBJECT { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1737 |
uint sound = sid + i + _cur_grffile->sound_offset - GetNumOriginalSounds(); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1738 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1739 |
if (sound >= GetNumSounds()) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1740 |
grfmsg(1, "SoundEffectChangeInfo: Sound %d not defined (max %d)", sound, GetNumSounds()); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1741 |
} else { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1742 |
GetSound(sound)->priority = grf_load_byte(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1743 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1744 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1745 |
break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1746 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1747 |
case 0x0A: // Override old sound |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1748 |
FOR_EACH_OBJECT { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1749 |
uint sound = sid + i + _cur_grffile->sound_offset - GetNumOriginalSounds(); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1750 |
uint orig_sound = grf_load_byte(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1751 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1752 |
if (sound >= GetNumSounds() || orig_sound >= GetNumSounds()) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1753 |
grfmsg(1, "SoundEffectChangeInfo: Sound %d or %d not defined (max %d)", sound, orig_sound, GetNumSounds()); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1754 |
} else { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1755 |
FileEntry *newfe = GetSound(sound); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1756 |
FileEntry *oldfe = GetSound(orig_sound); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1757 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1758 |
/* Literally copy the data of the new sound over the original */ |
5024
f13f2f2d43f9
(svn r7065) Use simple assignment instead of memcpy()
tron
parents:
5011
diff
changeset
|
1759 |
*oldfe = *newfe; |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1760 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1761 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1762 |
break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1763 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1764 |
default: |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1765 |
ret = true; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1766 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1767 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1768 |
*bufp = buf; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1769 |
return ret; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1770 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1771 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
1772 |
/* Action 0x00 */ |
3879
3e9cd6403d73
(svn r4928) CodeChange : Rename functions referring to "Vehicle" for "Feature".
belugas
parents:
3875
diff
changeset
|
1773 |
static void FeatureChangeInfo(byte *buf, int len) |
0 | 1774 |
{ |
1775 |
byte *bufend = buf + len; |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1776 |
uint i; |
0 | 1777 |
|
1778 |
/* <00> <feature> <num-props> <num-info> <id> (<property <new-info>)... |
|
1779 |
* |
|
1780 |
* B feature 0, 1, 2 or 3 for trains, road vehicles, ships or planes |
|
1781 |
* 4 for defining new train station sets |
|
1782 |
* B num-props how many properties to change per vehicle/station |
|
1783 |
* B num-info how many vehicles/stations to change |
|
1784 |
* B id ID of first vehicle/station to change, if num-info is |
|
1785 |
* greater than one, this one and the following |
|
1786 |
* vehicles/stations will be changed |
|
1787 |
* B property what property to change, depends on the feature |
|
1788 |
* V new-info new bytes of info (variable size; depends on properties) */ |
|
391
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
1789 |
/* TODO: Bridges, town houses. */ |
0 | 1790 |
|
2438
eaef2b29fa3d
(svn r2964) Fix: newgrf: Include missing grf feature canal.
peter1138
parents:
2421
diff
changeset
|
1791 |
static const VCI_Handler handler[] = { |
3825 | 1792 |
/* GSF_TRAIN */ RailVehicleChangeInfo, |
1793 |
/* GSF_ROAD */ RoadVehicleChangeInfo, |
|
1794 |
/* GSF_SHIP */ ShipVehicleChangeInfo, |
|
1795 |
/* GSF_AIRCRAFT */ AircraftVehicleChangeInfo, |
|
1796 |
/* GSF_STATION */ StationChangeInfo, |
|
1797 |
/* GSF_CANAL */ NULL, |
|
1798 |
/* GSF_BRIDGE */ BridgeChangeInfo, |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
1799 |
/* GSF_TOWNHOUSE */ TownHouseChangeInfo, |
3825 | 1800 |
/* GSF_GLOBALVAR */ GlobalVarChangeInfo, |
1801 |
/* GSF_INDUSTRYTILES */NULL, |
|
1802 |
/* GSF_INDUSTRIES */ NULL, |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1803 |
/* GSF_CARGOS */ NULL, /* Cargo is handled during reservation */ |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
1804 |
/* GSF_SOUNDFX */ SoundEffectChangeInfo, |
0 | 1805 |
}; |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
1806 |
|
542 | 1807 |
EngineInfo *ei = NULL; |
0 | 1808 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
1809 |
if (!check_length(len, 6, "FeatureChangeInfo")) return; |
3714
402f02b01241
(svn r4657) - NewGRF: use grf_load_byte() in favour of array accesses
peter1138
parents:
3712
diff
changeset
|
1810 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1811 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1812 |
uint8 numprops = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1813 |
uint numinfo = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1814 |
uint engine = grf_load_byte(&buf); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
74
diff
changeset
|
1815 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1816 |
grfmsg(6, "FeatureChangeInfo: feature %d, %d properties, to apply to %d+%d", |
378
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
1817 |
feature, numprops, engine, numinfo); |
9f170b63d48e
(svn r567) -newgrf: Support for road vehicles customization (seems to work at
celestar
parents:
373
diff
changeset
|
1818 |
|
2440
443e2f3cce75
(svn r2966) Fix: newgrf: Replace special case with a check for the existence of a handler in VehicleChangeInfo.
peter1138
parents:
2439
diff
changeset
|
1819 |
if (feature >= lengthof(handler) || handler[feature] == NULL) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1820 |
grfmsg(1, "FeatureChangeInfo: Unsupported feature %d, skipping", feature); |
391
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
1821 |
return; |
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
1822 |
} |
573193308396
(svn r583) -newgrf: Hopefully prevent GRF files introducing new bridges or townhouses to crash the game (pasky).
darkvater
parents:
389
diff
changeset
|
1823 |
|
2439
c820a9751afc
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
peter1138
parents:
2438
diff
changeset
|
1824 |
if (feature <= GSF_AIRCRAFT) { |
c820a9751afc
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
peter1138
parents:
2438
diff
changeset
|
1825 |
if (engine + numinfo > _vehcounts[feature]) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1826 |
grfmsg(0, "FeatureChangeInfo: Last engine ID %d out of bounds (max %d), skipping", engine + numinfo, _vehcounts[feature]); |
2439
c820a9751afc
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
peter1138
parents:
2438
diff
changeset
|
1827 |
return; |
c820a9751afc
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
peter1138
parents:
2438
diff
changeset
|
1828 |
} |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
1829 |
ei = &_engine_info[engine + _vehshifts[feature]]; |
2439
c820a9751afc
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
peter1138
parents:
2438
diff
changeset
|
1830 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
1831 |
|
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
1832 |
while (numprops-- && buf < bufend) { |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
1833 |
uint8 prop = grf_load_byte(&buf); |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1834 |
bool ignoring = false; |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
1835 |
|
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1836 |
switch (feature) { |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1837 |
case GSF_TRAIN: |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1838 |
case GSF_ROAD: |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1839 |
case GSF_SHIP: |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1840 |
case GSF_AIRCRAFT: |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1841 |
/* Common properties for vehicles */ |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1842 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1843 |
case 0x00: // Introduction date |
4322
0bee6d9bc452
(svn r5975) -Cleanup: use ORIGINAL_BASE_YEAR & ORIGINAL_MAX_YEAR where the functions really depend on the original date format.
rubidium
parents:
4321
diff
changeset
|
1844 |
FOR_EACH_OBJECT ei[i].base_intro = grf_load_word(&buf) + DAYS_TILL_ORIGINAL_BASE_YEAR; |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1845 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1846 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1847 |
case 0x02: // Decay speed |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1848 |
FOR_EACH_OBJECT SB(ei[i].unk2, 0, 7, grf_load_byte(&buf) & 0x7F); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1849 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1850 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1851 |
case 0x03: // Vehicle life |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1852 |
FOR_EACH_OBJECT ei[i].lifelength = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1853 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1854 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1855 |
case 0x04: // Model life |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1856 |
FOR_EACH_OBJECT ei[i].base_life = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1857 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1858 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1859 |
case 0x06: // Climates available |
3089
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1860 |
FOR_EACH_OBJECT ei[i].climates = grf_load_byte(&buf); |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1861 |
break; |
e5d1c3984821
(svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables.
peter1138
parents:
3033
diff
changeset
|
1862 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1863 |
case 0x07: // Loading speed |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1864 |
/* Hyronymus explained me what does |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1865 |
* this mean and insists on having a |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1866 |
* credit ;-). --pasky */ |
5211
651c9272ad22
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5210
diff
changeset
|
1867 |
FOR_EACH_OBJECT ei[i].load_amount = grf_load_byte(&buf); |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1868 |
break; |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1869 |
|
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1870 |
default: |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1871 |
if (handler[feature](engine, numinfo, prop, &buf, bufend - buf)) { |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1872 |
ignoring = true; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1873 |
} |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1874 |
break; |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1875 |
} |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1876 |
break; |
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1877 |
|
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1878 |
default: |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1879 |
if (handler[feature](engine, numinfo, prop, &buf, bufend - buf)) { |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1880 |
ignoring = true; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1881 |
} |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1882 |
break; |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
1883 |
} |
2421
7b6750d797bd
(svn r2947) Reorder some code to prepare for future enhancements and get rid of some gotos (peter1138)
tron
parents:
2400
diff
changeset
|
1884 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
1885 |
if (ignoring) grfmsg(2, "FeatureChangeInfo: Ignoring property 0x%02X (not implemented)", prop); |
0 | 1886 |
} |
1887 |
} |
|
1888 |
||
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1889 |
/* Action 0x00 (GLS_SAFETYSCAN) */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1890 |
static void SafeChangeInfo(byte *buf, int len) |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1891 |
{ |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
1892 |
if (!check_length(len, 6, "SafeChangeInfo")) return; |
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1893 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1894 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1895 |
uint8 numprops = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1896 |
grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1897 |
grf_load_byte(&buf); |
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1898 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1899 |
if (feature == GSF_BRIDGE && numprops == 1) { |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1900 |
uint8 prop = grf_load_byte(&buf); |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1901 |
/* Bridge property 0x0D is redefinition of sprite layout tables, which |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1902 |
* is considered safe. */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1903 |
if (prop == 0x0D) return; |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1904 |
} |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1905 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1906 |
SETBIT(_cur_grfconfig->flags, GCF_UNSAFE); |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1907 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1908 |
/* Skip remainder of GRF */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1909 |
_skip_sprites = -1; |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1910 |
} |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
1911 |
|
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1912 |
/* Action 0x00 (GLS_INIT) */ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1913 |
static void InitChangeInfo(byte *buf, int len) |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1914 |
{ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1915 |
byte *bufend = buf + len; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1916 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1917 |
if (!check_length(len, 6, "InitChangeInfo")) return; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1918 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1919 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1920 |
uint8 numprops = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1921 |
uint8 numinfo = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
1922 |
uint8 index = grf_load_byte(&buf); |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1923 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1924 |
while (numprops-- && buf < bufend) { |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1925 |
uint8 prop = grf_load_byte(&buf); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1926 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1927 |
switch (feature) { |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1928 |
case GSF_GLOBALVAR: |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1929 |
switch (prop) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1930 |
case 0x09: // Cargo Translation Table |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1931 |
if (index != 0) { |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1932 |
grfmsg(1, "InitChangeInfo: Cargo translation table must start at zero"); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1933 |
return; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1934 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1935 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1936 |
free(_cur_grffile->cargo_list); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1937 |
_cur_grffile->cargo_max = numinfo; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1938 |
_cur_grffile->cargo_list = MallocT<CargoLabel>(numinfo); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1939 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1940 |
int i; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1941 |
FOR_EACH_OBJECT { |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1942 |
CargoLabel cl = grf_load_dword(&buf); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1943 |
_cur_grffile->cargo_list[i] = BSWAP32(cl); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1944 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1945 |
break; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1946 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1947 |
break; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1948 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1949 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1950 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
1951 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1952 |
/* Action 0x00 (GLS_RESERVE) */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1953 |
static void ReserveChangeInfo(byte *buf, int len) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1954 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1955 |
byte *bufend = buf + len; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1956 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1957 |
if (!check_length(len, 6, "InitChangeInfo")) return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1958 |
buf++; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1959 |
uint8 feature = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1960 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1961 |
if (feature != GSF_CARGOS) return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1962 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1963 |
uint8 numprops = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1964 |
uint8 numinfo = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1965 |
uint8 index = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1966 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1967 |
while (numprops-- && buf < bufend) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1968 |
uint8 prop = grf_load_byte(&buf); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1969 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1970 |
if (CargoChangeInfo(index, numinfo, prop, &buf, bufend - buf)) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
1971 |
grfmsg(2, "ReserveChangeInfo: Ignoring property 0x%02X (not implemented)", prop); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1972 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1973 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1974 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1975 |
|
439
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1976 |
#undef FOR_EACH_OBJECT |
4e71a04a7fce
(svn r648) Dummy skip-support for two new station properties. Rename FOR_EACH_ENGINE() to more appropriate FOR_EACH_OBJECT(). (pasky)
miham
parents:
438
diff
changeset
|
1977 |
|
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1978 |
/** |
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1979 |
* Creates a spritegroup representing a callback result |
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1980 |
* @param value The value that was used to represent this callback result |
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1981 |
* @return A spritegroup representing that callback result |
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1982 |
*/ |
4893
07d158194395
(svn r6837) - Codechange: More const SpriteGroups missed in r6836
peter1138
parents:
4869
diff
changeset
|
1983 |
static const SpriteGroup* NewCallBackResultSpriteGroup(uint16 value) |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1984 |
{ |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
1985 |
SpriteGroup *group = AllocateSpriteGroup(); |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1986 |
|
2488
cbe3d6b60c27
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2480
diff
changeset
|
1987 |
group->type = SGT_CALLBACK; |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1988 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1989 |
/* Old style callback results have the highest byte 0xFF so signify it is a callback result |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
1990 |
* New style ones only have the highest bit set (allows 15-bit results, instead of just 8) */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1991 |
if ((value >> 8) == 0xFF) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1992 |
value &= ~0xFF00; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1993 |
} else { |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1994 |
value &= ~0x8000; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
1995 |
} |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1996 |
|
2488
cbe3d6b60c27
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2480
diff
changeset
|
1997 |
group->g.callback.result = value; |
1883
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1998 |
|
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
1999 |
return group; |
3b02000cfbe0
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1873
diff
changeset
|
2000 |
} |
0 | 2001 |
|
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2002 |
/** |
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2003 |
* Creates a spritegroup representing a sprite number result. |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2004 |
* @param sprite The sprite number. |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2005 |
* @param num_sprites The number of sprites per set. |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2006 |
* @return A spritegroup representing the sprite number result. |
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2007 |
*/ |
4893
07d158194395
(svn r6837) - Codechange: More const SpriteGroups missed in r6836
peter1138
parents:
4869
diff
changeset
|
2008 |
static const SpriteGroup* NewResultSpriteGroup(SpriteID sprite, byte num_sprites) |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2009 |
{ |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
2010 |
SpriteGroup *group = AllocateSpriteGroup(); |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2011 |
group->type = SGT_RESULT; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2012 |
group->g.result.sprite = sprite; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2013 |
group->g.result.num_sprites = num_sprites; |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2014 |
return group; |
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2015 |
} |
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2016 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2017 |
/* Action 0x01 */ |
369
ab2266938fa8
(svn r557) -newgrf: Rename all 'superset' tokens to 'group' and some other small renamings (pasky and octo).
darkvater
parents:
368
diff
changeset
|
2018 |
static void NewSpriteSet(byte *buf, int len) |
0 | 2019 |
{ |
2020 |
/* <01> <feature> <num-sets> <num-ent> |
|
2021 |
* |
|
2022 |
* B feature feature to define sprites for |
|
2023 |
* 0, 1, 2, 3: veh-type, 4: train stations |
|
2024 |
* B num-sets number of sprite sets |
|
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2025 |
* E num-ent how many entries per sprite set |
0 | 2026 |
* For vehicles, this is the number of different |
2027 |
* vehicle directions in each sprite set |
|
2028 |
* Set num-dirs=8, unless your sprites are symmetric. |
|
2029 |
* In that case, use num-dirs=4. |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2030 |
*/ |
0 | 2031 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2032 |
if (!check_length(len, 4, "NewSpriteSet")) return; |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2033 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2034 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2035 |
uint8 num_sets = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2036 |
uint16 num_ents = grf_load_extended(&buf); |
0 | 2037 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2038 |
_cur_grffile->spriteset_start = _cur_spriteid; |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
2039 |
_cur_grffile->spriteset_feature = feature; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2040 |
_cur_grffile->spriteset_numsets = num_sets; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2041 |
_cur_grffile->spriteset_numents = num_ents; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2042 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2043 |
grfmsg(7, "New sprite set at %d of type %d, consisting of %d sets with %d views each (total %d)", |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2044 |
_cur_spriteid, feature, num_sets, num_ents, num_sets * num_ents |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2045 |
); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2046 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2047 |
for (uint16 i = 0; i < num_sets * num_ents; i++) { |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2048 |
LoadNextSprite(_cur_spriteid++, _file_index); |
3557
5d12a78ce141
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
peter1138
parents:
3555
diff
changeset
|
2049 |
_nfo_line++; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
2050 |
} |
0 | 2051 |
} |
2052 |
||
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2053 |
/* Action 0x01 (SKIP) */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2054 |
static void SkipAct1(byte *buf, int len) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2055 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2056 |
if (!check_length(len, 4, "SkipAct1")) return; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2057 |
buf++; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2058 |
grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2059 |
uint8 num_sets = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2060 |
uint16 num_ents = grf_load_extended(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2061 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2062 |
_skip_sprites = num_sets * num_ents; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2063 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2064 |
grfmsg(3, "SkipAct1: Skipping %d sprites", _skip_sprites); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2065 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2066 |
|
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2067 |
/* Helper function to either create a callback or link to a previously |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2068 |
* defined spritegroup. */ |
4893
07d158194395
(svn r6837) - Codechange: More const SpriteGroups missed in r6836
peter1138
parents:
4869
diff
changeset
|
2069 |
static const SpriteGroup* GetGroupFromGroupID(byte setid, byte type, uint16 groupid) |
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2070 |
{ |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2071 |
if (HASBIT(groupid, 15)) return NewCallBackResultSpriteGroup(groupid); |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2072 |
|
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2073 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2074 |
grfmsg(1, "GetGroupFromGroupID(0x%02X:0x%02X): Groupid 0x%04X does not exist, leaving empty", setid, type, groupid); |
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2075 |
return NULL; |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2076 |
} |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2077 |
|
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2078 |
return _cur_grffile->spritegroups[groupid]; |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2079 |
} |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2080 |
|
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2081 |
/* Helper function to either create a callback or a result sprite group. */ |
4893
07d158194395
(svn r6837) - Codechange: More const SpriteGroups missed in r6836
peter1138
parents:
4869
diff
changeset
|
2082 |
static const SpriteGroup* CreateGroupFromGroupID(byte feature, byte setid, byte type, uint16 spriteid, uint16 num_sprites) |
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2083 |
{ |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2084 |
if (HASBIT(spriteid, 15)) return NewCallBackResultSpriteGroup(spriteid); |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2085 |
|
3667
f87c17c36375
(svn r4582) - NewGRF: include an additional check to see if a spriteset id is within range.
peter1138
parents:
3666
diff
changeset
|
2086 |
if (spriteid >= _cur_grffile->spriteset_numsets) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2087 |
grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Sprite set %u invalid, max %u", setid, type, spriteid, _cur_grffile->spriteset_numsets); |
3667
f87c17c36375
(svn r4582) - NewGRF: include an additional check to see if a spriteset id is within range.
peter1138
parents:
3666
diff
changeset
|
2088 |
return NULL; |
f87c17c36375
(svn r4582) - NewGRF: include an additional check to see if a spriteset id is within range.
peter1138
parents:
3666
diff
changeset
|
2089 |
} |
f87c17c36375
(svn r4582) - NewGRF: include an additional check to see if a spriteset id is within range.
peter1138
parents:
3666
diff
changeset
|
2090 |
|
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2091 |
/* Check if the sprite is within range. This can fail if the Action 0x01 |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2092 |
* is skipped, as TTDPatch mandates that Action 0x02s must be processed. |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2093 |
* We don't have that rule, but must live by the Patch... */ |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2094 |
if (_cur_grffile->spriteset_start + spriteid * num_sprites + num_sprites > _cur_spriteid) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2095 |
grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Real Sprite IDs 0x%04X - 0x%04X do not (all) exist (max 0x%04X), leaving empty", |
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2096 |
setid, type, |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2097 |
_cur_grffile->spriteset_start + spriteid * num_sprites, |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2098 |
_cur_grffile->spriteset_start + spriteid * num_sprites + num_sprites - 1, _cur_spriteid - 1); |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2099 |
return NULL; |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2100 |
} |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2101 |
|
3803
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2102 |
if (feature != _cur_grffile->spriteset_feature) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2103 |
grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Sprite set feature 0x%02X does not match action feature 0x%02X, skipping", |
3803
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2104 |
_cur_grffile->spriteset_feature, feature); |
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2105 |
return NULL; |
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2106 |
} |
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2107 |
|
3666
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2108 |
return NewResultSpriteGroup(_cur_grffile->spriteset_start + spriteid * num_sprites, num_sprites); |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2109 |
} |
975cd26c8df7
(svn r4581) - NewGRF: replace replicated action 2 code with two functions to simplify code somewhat. Also check that a sprite id is
peter1138
parents:
3648
diff
changeset
|
2110 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2111 |
/* Action 0x02 */ |
369
ab2266938fa8
(svn r557) -newgrf: Rename all 'superset' tokens to 'group' and some other small renamings (pasky and octo).
darkvater
parents:
368
diff
changeset
|
2112 |
static void NewSpriteGroup(byte *buf, int len) |
0 | 2113 |
{ |
2114 |
/* <02> <feature> <set-id> <type/num-entries> <feature-specific-data...> |
|
2115 |
* |
|
2116 |
* B feature see action 1 |
|
2117 |
* B set-id ID of this particular definition |
|
2118 |
* B type/num-entries |
|
2119 |
* if 80 or greater, this is a randomized or variational |
|
2120 |
* list definition, see below |
|
2121 |
* otherwise it specifies a number of entries, the exact |
|
2122 |
* meaning depends on the feature |
|
2123 |
* V feature-specific-data (huge mess, don't even look it up --pasky) */ |
|
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2124 |
SpriteGroup *group = NULL; |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2125 |
byte *bufend = buf + len; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
74
diff
changeset
|
2126 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2127 |
if (!check_length(len, 5, "NewSpriteGroup")) return; |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2128 |
buf++; |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2129 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2130 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2131 |
uint8 setid = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2132 |
uint8 type = grf_load_byte(&buf); |
0 | 2133 |
|
2444
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2134 |
if (setid >= _cur_grffile->spritegroups_count) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2135 |
/* Allocate memory for new sprite group references. */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
2136 |
_cur_grffile->spritegroups = ReallocT(_cur_grffile->spritegroups, setid + 1); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2137 |
/* Initialise new space to NULL */ |
2488
cbe3d6b60c27
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2480
diff
changeset
|
2138 |
for (; _cur_grffile->spritegroups_count < (setid + 1); _cur_grffile->spritegroups_count++) |
cbe3d6b60c27
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2480
diff
changeset
|
2139 |
_cur_grffile->spritegroups[_cur_grffile->spritegroups_count] = NULL; |
2444
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2140 |
} |
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2141 |
|
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2142 |
switch (type) { |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2143 |
/* Deterministic Sprite Group */ |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2144 |
case 0x81: // Self scope, byte |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2145 |
case 0x82: // Parent scope, byte |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2146 |
case 0x85: // Self scope, word |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2147 |
case 0x86: // Parent scope, word |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2148 |
case 0x89: // Self scope, dword |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2149 |
case 0x8A: // Parent scope, dword |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2150 |
{ |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2151 |
byte varadjust; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2152 |
byte varsize; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2153 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2154 |
/* Check we can load the var size parameter */ |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2155 |
if (!check_length(bufend - buf, 1, "NewSpriteGroup (Deterministic) (1)")) return; |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2156 |
|
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2157 |
group = AllocateSpriteGroup(); |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2158 |
group->type = SGT_DETERMINISTIC; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2159 |
group->g.determ.var_scope = HASBIT(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2160 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2161 |
switch (GB(type, 2, 2)) { |
3672
73caf2e829f8
(svn r4588) - NewGRF: silence a false compiler warning
peter1138
parents:
3668
diff
changeset
|
2162 |
default: NOT_REACHED(); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2163 |
case 0: group->g.determ.size = DSG_SIZE_BYTE; varsize = 1; break; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2164 |
case 1: group->g.determ.size = DSG_SIZE_WORD; varsize = 2; break; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2165 |
case 2: group->g.determ.size = DSG_SIZE_DWORD; varsize = 4; break; |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2166 |
} |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2167 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2168 |
if (!check_length(bufend - buf, 5 + varsize, "NewSpriteGroup (Deterministic) (2)")) return; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2169 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2170 |
/* Loop through the var adjusts. Unfortunately we don't know how many we have |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2171 |
* from the outset, so we shall have to keep reallocing. */ |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2172 |
do { |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2173 |
DeterministicSpriteGroupAdjust *adjust; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2174 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2175 |
if (group->g.determ.num_adjusts > 0) { |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2176 |
if (!check_length(bufend - buf, 2 + varsize + 3, "NewSpriteGroup (Deterministic) (3)")) return; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2177 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2178 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2179 |
group->g.determ.num_adjusts++; |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
2180 |
group->g.determ.adjusts = ReallocT(group->g.determ.adjusts, group->g.determ.num_adjusts); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2181 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2182 |
adjust = &group->g.determ.adjusts[group->g.determ.num_adjusts - 1]; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2183 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2184 |
/* The first var adjust doesn't have an operation specified, so we set it to add. */ |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
2185 |
adjust->operation = group->g.determ.num_adjusts == 1 ? DSGA_OP_ADD : (DeterministicSpriteGroupAdjustOperation)grf_load_byte(&buf); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2186 |
adjust->variable = grf_load_byte(&buf); |
5868
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2187 |
if (adjust->variable == 0x7E) { |
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2188 |
/* Link subroutine group */ |
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2189 |
adjust->subroutine = GetGroupFromGroupID(setid, type, grf_load_byte(&buf)); |
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2190 |
} else { |
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2191 |
adjust->parameter = IS_BYTE_INSIDE(adjust->variable, 0x60, 0x80) ? grf_load_byte(&buf) : 0; |
baa704b6dc4f
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
maedhros
parents:
5860
diff
changeset
|
2192 |
} |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2193 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2194 |
varadjust = grf_load_byte(&buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2195 |
adjust->shift_num = GB(varadjust, 0, 5); |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
2196 |
adjust->type = (DeterministicSpriteGroupAdjustType)GB(varadjust, 6, 2); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2197 |
adjust->and_mask = grf_load_var(varsize, &buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2198 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2199 |
if (adjust->type != DSGA_TYPE_NONE) { |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2200 |
adjust->add_val = grf_load_var(varsize, &buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2201 |
adjust->divmod_val = grf_load_var(varsize, &buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2202 |
} else { |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2203 |
adjust->add_val = 0; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2204 |
adjust->divmod_val = 0; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2205 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2206 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2207 |
/* Continue reading var adjusts while bit 5 is set. */ |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2208 |
} while (HASBIT(varadjust, 5)); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2209 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2210 |
group->g.determ.num_ranges = grf_load_byte(&buf); |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2211 |
if (group->g.determ.num_ranges > 0) group->g.determ.ranges = CallocT<DeterministicSpriteGroupRange>(group->g.determ.num_ranges); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2212 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2213 |
if (!check_length(bufend - buf, 2 + (2 + 2 * varsize) * group->g.determ.num_ranges, "NewSpriteGroup (Deterministic)")) return; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2214 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2215 |
for (uint i = 0; i < group->g.determ.num_ranges; i++) { |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2216 |
group->g.determ.ranges[i].group = GetGroupFromGroupID(setid, type, grf_load_word(&buf)); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2217 |
group->g.determ.ranges[i].low = grf_load_var(varsize, &buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2218 |
group->g.determ.ranges[i].high = grf_load_var(varsize, &buf); |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2219 |
} |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2220 |
|
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2221 |
group->g.determ.default_group = GetGroupFromGroupID(setid, type, grf_load_word(&buf)); |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2222 |
break; |
445
0e3fa3da3899
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
441
diff
changeset
|
2223 |
} |
0e3fa3da3899
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
441
diff
changeset
|
2224 |
|
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2225 |
/* Randomized Sprite Group */ |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2226 |
case 0x80: // Self scope |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2227 |
case 0x83: // Parent scope |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2228 |
{ |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2229 |
if (!check_length(bufend - buf, 7, "NewSpriteGroup (Randomized) (1)")) return; |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2230 |
|
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2231 |
group = AllocateSpriteGroup(); |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2232 |
group->type = SGT_RANDOMIZED; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2233 |
group->g.random.var_scope = HASBIT(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2234 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2235 |
uint8 triggers = grf_load_byte(&buf); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2236 |
group->g.random.triggers = GB(triggers, 0, 7); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2237 |
group->g.random.cmp_mode = HASBIT(triggers, 7) ? RSG_CMP_ALL : RSG_CMP_ANY; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2238 |
group->g.random.lowest_randbit = grf_load_byte(&buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2239 |
group->g.random.num_groups = grf_load_byte(&buf); |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
2240 |
group->g.random.groups = CallocT<const SpriteGroup*>(group->g.random.num_groups); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2241 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2242 |
if (!check_length(bufend - buf, 2 * group->g.random.num_groups, "NewSpriteGroup (Randomized) (2)")) return; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2243 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2244 |
for (uint i = 0; i < group->g.random.num_groups; i++) { |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2245 |
group->g.random.groups[i] = GetGroupFromGroupID(setid, type, grf_load_word(&buf)); |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2246 |
} |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2247 |
|
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2248 |
break; |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2249 |
} |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2250 |
|
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2251 |
/* Neither a variable or randomized sprite group... must be a real group */ |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2252 |
default: |
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2253 |
{ |
3803
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2254 |
|
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2255 |
|
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2256 |
switch (feature) { |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2257 |
case GSF_TRAIN: |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2258 |
case GSF_ROAD: |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2259 |
case GSF_SHIP: |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2260 |
case GSF_AIRCRAFT: |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2261 |
case GSF_STATION: |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2262 |
case GSF_CANAL: |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2263 |
case GSF_CARGOS: |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2264 |
{ |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2265 |
byte sprites = _cur_grffile->spriteset_numents; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2266 |
byte num_loaded = type; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2267 |
byte num_loading = grf_load_byte(&buf); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2268 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2269 |
if (_cur_grffile->spriteset_start == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2270 |
grfmsg(0, "NewSpriteGroup: No sprite set to work on! Skipping"); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2271 |
return; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2272 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2273 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2274 |
if (!check_length(bufend - buf, 2 * num_loaded + 2 * num_loading, "NewSpriteGroup (Real) (1)")) return; |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2275 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2276 |
group = AllocateSpriteGroup(); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2277 |
group->type = SGT_REAL; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2278 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2279 |
group->g.real.num_loaded = num_loaded; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2280 |
group->g.real.num_loading = num_loading; |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
2281 |
if (num_loaded > 0) group->g.real.loaded = CallocT<const SpriteGroup*>(num_loaded); |
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
2282 |
if (num_loading > 0) group->g.real.loading = CallocT<const SpriteGroup*>(num_loading); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2283 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2284 |
grfmsg(6, "NewSpriteGroup: New SpriteGroup 0x%02X, %u views, %u loaded, %u loading", |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2285 |
setid, sprites, num_loaded, num_loading); |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2286 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2287 |
for (uint i = 0; i < num_loaded; i++) { |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2288 |
uint16 spriteid = grf_load_word(&buf); |
3803
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2289 |
group->g.real.loaded[i] = CreateGroupFromGroupID(feature, setid, type, spriteid, sprites); |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2290 |
grfmsg(8, "NewSpriteGroup: + rg->loaded[%i] = subset %u", i, spriteid); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2291 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2292 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2293 |
for (uint i = 0; i < num_loading; i++) { |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2294 |
uint16 spriteid = grf_load_word(&buf); |
3803
1bd124196372
(svn r4811) - NewGRF: only check a sprite set's feature when assigning a sprite result sprite group.
peter1138
parents:
3785
diff
changeset
|
2295 |
group->g.real.loading[i] = CreateGroupFromGroupID(feature, setid, type, spriteid, sprites); |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2296 |
grfmsg(8, "NewSpriteGroup: + rg->loading[%i] = subset %u", i, spriteid); |
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2297 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2298 |
|
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2299 |
break; |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2300 |
} |
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2301 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2302 |
case GSF_TOWNHOUSE: { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2303 |
byte sprites = _cur_grffile->spriteset_numents; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2304 |
byte num_sprites = max((uint8)1, type); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2305 |
uint i; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2306 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2307 |
group = AllocateSpriteGroup(); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2308 |
group->type = SGT_TILELAYOUT; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2309 |
group->g.layout.num_sprites = sprites; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2310 |
group->g.layout.dts = CallocT<DrawTileSprites>(1); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2311 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2312 |
/* Groundsprite */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2313 |
group->g.layout.dts->ground_sprite = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2314 |
group->g.layout.dts->ground_pal = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2315 |
/* Remap transparent/colour modifier bits */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2316 |
if (HASBIT(group->g.layout.dts->ground_sprite, 14)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2317 |
CLRBIT(group->g.layout.dts->ground_sprite, 14); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2318 |
SETBIT(group->g.layout.dts->ground_sprite, PALETTE_MODIFIER_TRANSPARENT); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2319 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2320 |
if (HASBIT(group->g.layout.dts->ground_sprite, 15)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2321 |
CLRBIT(group->g.layout.dts->ground_sprite, 15); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2322 |
SETBIT(group->g.layout.dts->ground_sprite, PALETTE_MODIFIER_COLOR); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2323 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2324 |
if (HASBIT(group->g.layout.dts->ground_pal, 14)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2325 |
CLRBIT(group->g.layout.dts->ground_pal, 14); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2326 |
SETBIT(group->g.layout.dts->ground_sprite, SPRITE_MODIFIER_OPAQUE); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2327 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2328 |
if (HASBIT(group->g.layout.dts->ground_pal, 15)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2329 |
/* Bit 31 set means this is a custom sprite, so rewrite it to the |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2330 |
* last spriteset defined. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2331 |
SpriteID sprite = _cur_grffile->spriteset_start + GB(group->g.layout.dts->ground_sprite, 0, 14) * sprites; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2332 |
SB(group->g.layout.dts->ground_sprite, 0, SPRITE_WIDTH, sprite); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2333 |
CLRBIT(group->g.layout.dts->ground_pal, 15); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2334 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2335 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2336 |
group->g.layout.dts->seq = CallocT<DrawTileSeqStruct>(num_sprites + 1); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2337 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2338 |
for (i = 0; i < num_sprites; i++) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2339 |
DrawTileSeqStruct *seq = (DrawTileSeqStruct*)&group->g.layout.dts->seq[i]; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2340 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2341 |
seq->image = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2342 |
seq->pal = grf_load_word(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2343 |
seq->delta_x = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2344 |
seq->delta_y = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2345 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2346 |
if (HASBIT(seq->image, 14)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2347 |
CLRBIT(seq->image, 14); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2348 |
SETBIT(seq->image, PALETTE_MODIFIER_TRANSPARENT); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2349 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2350 |
if (HASBIT(seq->image, 15)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2351 |
CLRBIT(seq->image, 15); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2352 |
SETBIT(seq->image, PALETTE_MODIFIER_COLOR); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2353 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2354 |
if (HASBIT(seq->pal, 14)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2355 |
CLRBIT(seq->pal, 14); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2356 |
SETBIT(seq->image, SPRITE_MODIFIER_OPAQUE); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2357 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2358 |
if (HASBIT(seq->pal, 15)) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2359 |
/* Bit 31 set means this is a custom sprite, so rewrite it to the |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2360 |
* last spriteset defined. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2361 |
SpriteID sprite = _cur_grffile->spriteset_start + GB(seq->image, 0, 14) * sprites; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2362 |
SB(seq->image, 0, SPRITE_WIDTH, sprite); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2363 |
CLRBIT(seq->pal, 15); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2364 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2365 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2366 |
if (type > 0) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2367 |
seq->delta_z = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2368 |
if ((byte)seq->delta_z == 0x80) continue; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2369 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2370 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2371 |
seq->size_x = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2372 |
seq->size_y = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2373 |
seq->size_z = grf_load_byte(&buf); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2374 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2375 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2376 |
/* Set the terminator value. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2377 |
((DrawTileSeqStruct*)group->g.layout.dts->seq)[i].delta_x = (byte)0x80; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2378 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2379 |
break; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2380 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2381 |
|
3668
d7ed0a867b49
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3667
diff
changeset
|
2382 |
/* Loading of Tile Layout and Production Callback groups would happen here */ |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2383 |
default: grfmsg(1, "NewSpriteGroup: Unsupported feature %d, skipping", feature); |
3633
414a50db1ac3
(svn r4537) - NewGRF: replace if cascade with a switch block in the sprite group loader
peter1138
parents:
3630
diff
changeset
|
2384 |
} |
2489
88827d8ae517
(svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.)
peter1138
parents:
2488
diff
changeset
|
2385 |
} |
0 | 2386 |
} |
2444
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2387 |
|
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2388 |
_cur_grffile->spritegroups[setid] = group; |
0 | 2389 |
} |
2390 |
||
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2391 |
static CargoID TranslateCargo(uint8 feature, uint8 ctype) |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2392 |
{ |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2393 |
/* Special cargo types for purchase list and stations */ |
6474
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
2394 |
if (feature == GSF_STATION && ctype == 0xFE) return CT_DEFAULT_NA; |
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
2395 |
if (ctype == 0xFF) return CT_PURCHASE; |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2396 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2397 |
if (_cur_grffile->cargo_max == 0) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2398 |
/* No cargo table, so use bitnum values */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2399 |
if (ctype >= 32) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2400 |
grfmsg(1, "TranslateCargo: Cargo bitnum %d out of range (max 31), skipping.", ctype); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2401 |
return CT_INVALID; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2402 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2403 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2404 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2405 |
const CargoSpec *cs = GetCargo(c); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2406 |
if (!cs->IsValid()) continue; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2407 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2408 |
if (cs->bitnum == ctype) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2409 |
grfmsg(6, "TranslateCargo: Cargo bitnum %d mapped to cargo type %d.", ctype, c); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2410 |
return c; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2411 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2412 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2413 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2414 |
grfmsg(5, "TranslateCargo: Cargo bitnum %d not available in this climate, skipping.", ctype); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2415 |
return CT_INVALID; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2416 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2417 |
|
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2418 |
/* Check if the cargo type is out of bounds of the cargo translation table */ |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2419 |
if (ctype >= _cur_grffile->cargo_max) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2420 |
grfmsg(1, "TranslateCargo: Cargo type %d out of range (max %d), skipping.", ctype, _cur_grffile->cargo_max - 1); |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2421 |
return CT_INVALID; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2422 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2423 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2424 |
/* Look up the cargo label from the translation table */ |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2425 |
CargoLabel cl = _cur_grffile->cargo_list[ctype]; |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2426 |
if (cl == 0) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2427 |
grfmsg(5, "TranslateCargo: Cargo type %d not available in this climate, skipping.", ctype); |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2428 |
return CT_INVALID; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2429 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2430 |
|
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2431 |
ctype = GetCargoIDByLabel(cl); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2432 |
if (ctype == CT_INVALID) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2433 |
grfmsg(5, "TranslateCargo: Cargo '%c%c%c%c' unsupported, skipping.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8)); |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2434 |
return CT_INVALID; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2435 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2436 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2437 |
grfmsg(6, "TranslateCargo: Cargo '%c%c%c%c' mapped to cargo type %d.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8), ctype); |
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2438 |
return ctype; |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2439 |
} |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2440 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2441 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2442 |
static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8 cidcount, bool wagover) |
0 | 2443 |
{ |
2444 |
static byte *last_engines; |
|
2445 |
static int last_engines_count; |
|
2446 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2447 |
if (!wagover) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2448 |
if (last_engines_count != idcount) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2449 |
last_engines = ReallocT(last_engines, idcount); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2450 |
last_engines_count = idcount; |
403
bfb365c74e80
(svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky).
darkvater
parents:
401
diff
changeset
|
2451 |
} |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2452 |
} else { |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2453 |
if (last_engines_count == 0) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2454 |
grfmsg(0, "VehicleMapSpriteGroup: WagonOverride: No engine to do override with"); |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2455 |
return; |
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2456 |
} |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2457 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2458 |
grfmsg(6, "VehicleMapSpriteGroup: WagonOverride: %u engines, %u wagons", |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2459 |
last_engines_count, idcount); |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2460 |
} |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
2461 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2462 |
for (uint i = 0; i < idcount; i++) { |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2463 |
uint8 engine_id = buf[3 + i]; |
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2464 |
uint8 engine = engine_id + _vehshifts[feature]; |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2465 |
byte *bp = &buf[4 + idcount]; |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2466 |
|
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2467 |
if (engine_id > _vehcounts[feature]) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2468 |
grfmsg(0, "Id %u for feature 0x%02X is out of bounds", engine_id, feature); |
372
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2469 |
return; |
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2470 |
} |
1cc9354e2362
(svn r560) -newgrf: General cleanup of the code (pasky & octo)
celestar
parents:
369
diff
changeset
|
2471 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2472 |
grfmsg(7, "VehicleMapSpriteGroup: [%d] Engine %d...", i, engine); |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2473 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2474 |
for (uint c = 0; c < cidcount; c++) { |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2475 |
uint8 ctype = grf_load_byte(&bp); |
369
ab2266938fa8
(svn r557) -newgrf: Rename all 'superset' tokens to 'group' and some other small renamings (pasky and octo).
darkvater
parents:
368
diff
changeset
|
2476 |
uint16 groupid = grf_load_word(&bp); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2477 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2478 |
grfmsg(8, "VehicleMapSpriteGroup: * [%d] Cargo type 0x%X, group id 0x%02X", c, ctype, groupid); |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2479 |
|
2516
b11f1229cefd
(svn r3045) -NewGRF, Codechange: Don't attempt to map and empty sprite group to a vehicle.
peter1138
parents:
2515
diff
changeset
|
2480 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2481 |
grfmsg(1, "VehicleMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", groupid, _cur_grffile->spritegroups_count); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2482 |
continue; |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2483 |
} |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2484 |
|
6469
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2485 |
ctype = TranslateCargo(feature, ctype); |
05a2e97144ec
(svn r8886) -Codechange: (NewGRF) Add (partial) cargo translation table support, applied to action 3s only.
peter1138
parents:
6468
diff
changeset
|
2486 |
if (ctype == CT_INVALID) continue; |
5338
5b48218d8bd2
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5334
diff
changeset
|
2487 |
|
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2488 |
if (wagover) { |
4869
cded5f3a83c9
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4818
diff
changeset
|
2489 |
SetWagonOverrideSprites(engine, ctype, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2490 |
} else { |
2444
e618726432a4
(svn r2970) - Newgrf: Allocate spritegroups dynamically; this allows a cargo ID to reference the previous definition of the same cargo ID, instead of causing loops.
peter1138
parents:
2442
diff
changeset
|
2491 |
SetCustomEngineSprites(engine, ctype, _cur_grffile->spritegroups[groupid]); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2492 |
last_engines[i] = engine; |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2493 |
} |
0 | 2494 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2495 |
} |
0 | 2496 |
|
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2497 |
{ |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2498 |
byte *bp = &buf[4 + idcount + cidcount * 3]; |
369
ab2266938fa8
(svn r557) -newgrf: Rename all 'superset' tokens to 'group' and some other small renamings (pasky and octo).
darkvater
parents:
368
diff
changeset
|
2499 |
uint16 groupid = grf_load_word(&bp); |
0 | 2500 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2501 |
grfmsg(8, "-- Default group id 0x%04X", groupid); |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2502 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2503 |
for (uint i = 0; i < idcount; i++) { |
0 | 2504 |
uint8 engine = buf[3 + i] + _vehshifts[feature]; |
2505 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2506 |
/* Don't tell me you don't love duplicated code! */ |
2516
b11f1229cefd
(svn r3045) -NewGRF, Codechange: Don't attempt to map and empty sprite group to a vehicle.
peter1138
parents:
2515
diff
changeset
|
2507 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2508 |
grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2509 |
groupid, _cur_grffile->spritegroups_count); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2510 |
continue; |
0 | 2511 |
} |
2512 |
||
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2513 |
if (wagover) { |
3695
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
2514 |
/* If the ID for this action 3 is the same as the vehicle ID, |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2515 |
* this indicates we have a helicopter rotor override. */ |
3695
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
2516 |
if (feature == GSF_AIRCRAFT && engine == last_engines[i]) { |
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
2517 |
SetRotorOverrideSprites(engine, _cur_grffile->spritegroups[groupid]); |
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
2518 |
} else { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2519 |
/* TODO: No multiple cargo types per vehicle yet. --pasky */ |
6474
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
2520 |
SetWagonOverrideSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count); |
3695
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
2521 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2522 |
} else { |
6474
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
2523 |
SetCustomEngineSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid]); |
3924
de86db4fbd1e
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3895
diff
changeset
|
2524 |
SetEngineGRF(engine, _cur_grffile); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2525 |
last_engines[i] = engine; |
0 | 2526 |
} |
2527 |
} |
|
2528 |
} |
|
2529 |
} |
|
2530 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2531 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2532 |
static void CanalMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2533 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2534 |
byte *bp = &buf[4 + idcount + cidcount * 3]; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2535 |
uint16 groupid = grf_load_word(&bp); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2536 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2537 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2538 |
grfmsg(1, "CanalMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.", |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2539 |
groupid, _cur_grffile->spritegroups_count); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2540 |
return; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2541 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2542 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2543 |
for (uint i = 0; i < idcount; i++) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2544 |
CanalFeature cf = (CanalFeature)buf[3 + i]; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2545 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2546 |
if (cf >= CF_END) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2547 |
grfmsg(1, "CanalMapSpriteGroup: Canal subset %d out of range, skipping", cf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2548 |
continue; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2549 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2550 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2551 |
_canal_sg[cf] = _cur_grffile->spritegroups[groupid]; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2552 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2553 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2554 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2555 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2556 |
static void StationMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2557 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2558 |
for (uint i = 0; i < idcount; i++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2559 |
uint8 stid = buf[3 + i]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2560 |
StationSpec *statspec = _cur_grffile->stations[stid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2561 |
byte *bp = &buf[4 + idcount]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2562 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2563 |
for (uint c = 0; c < cidcount; c++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2564 |
uint8 ctype = grf_load_byte(&bp); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2565 |
uint16 groupid = grf_load_word(&bp); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2566 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2567 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2568 |
grfmsg(1, "StationMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2569 |
groupid, _cur_grffile->spritegroups_count); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2570 |
continue; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2571 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2572 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2573 |
ctype = TranslateCargo(GSF_STATION, ctype); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2574 |
if (ctype == CT_INVALID) continue; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2575 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2576 |
statspec->spritegroup[ctype] = _cur_grffile->spritegroups[groupid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2577 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2578 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2579 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2580 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2581 |
byte *bp = &buf[4 + idcount + cidcount * 3]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2582 |
uint16 groupid = grf_load_word(&bp); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2583 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2584 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2585 |
grfmsg(1, "StationMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2586 |
groupid, _cur_grffile->spritegroups_count); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2587 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2588 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2589 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2590 |
for (uint i = 0; i < idcount; i++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2591 |
uint8 stid = buf[3 + i]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2592 |
StationSpec *statspec = _cur_grffile->stations[stid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2593 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2594 |
statspec->spritegroup[CT_DEFAULT] = _cur_grffile->spritegroups[groupid]; |
9908
0fa543611bbe
(svn r10112) [gamebalance] -Sync: r9520:9620 from trunk
celestar
parents:
9907
diff
changeset
|
2595 |
statspec->grffile = _cur_grffile; |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2596 |
statspec->localidx = stid; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2597 |
SetCustomStationSpec(statspec); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2598 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2599 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2600 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2601 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2602 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2603 |
static void TownHouseMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2604 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2605 |
byte *bp = &buf[4 + idcount + cidcount * 3]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2606 |
uint16 groupid = grf_load_word(&bp); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2607 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2608 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2609 |
grfmsg(1, "TownHouseMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.", |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2610 |
groupid, _cur_grffile->spritegroups_count); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2611 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2612 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2613 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2614 |
for (uint i = 0; i < idcount; i++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2615 |
uint8 hid = buf[3 + i]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2616 |
HouseSpec *hs = _cur_grffile->housespec[hid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2617 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2618 |
if (hs == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2619 |
grfmsg(1, "TownHouseMapSpriteGroup: Too many houses defined, skipping"); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2620 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2621 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2622 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2623 |
hs->spritegroup = _cur_grffile->spritegroups[groupid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2624 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2625 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2626 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2627 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2628 |
static void CargoMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2629 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2630 |
byte *bp = &buf[4 + idcount + cidcount * 3]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2631 |
uint16 groupid = grf_load_word(&bp); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2632 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2633 |
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2634 |
grfmsg(1, "CargoMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.", |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2635 |
groupid, _cur_grffile->spritegroups_count); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2636 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2637 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2638 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2639 |
for (uint i = 0; i < idcount; i++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2640 |
CargoID cid = buf[3 + i]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2641 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2642 |
if (cid >= NUM_CARGO) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2643 |
grfmsg(1, "CargoMapSpriteGroup: Cargo ID %d out of range, skipping"); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2644 |
continue; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2645 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2646 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2647 |
CargoSpec *cs = &_cargo[cid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2648 |
cs->grfid = _cur_grffile->grfid; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2649 |
cs->group = _cur_grffile->spritegroups[groupid]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2650 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2651 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2652 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2653 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2654 |
/* Action 0x03 */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2655 |
static void FeatureMapSpriteGroup(byte *buf, int len) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2656 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2657 |
/* <03> <feature> <n-id> <ids>... <num-cid> [<cargo-type> <cid>]... <def-cid> |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2658 |
* id-list := [<id>] [id-list] |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2659 |
* cargo-list := <cargo-type> <cid> [cargo-list] |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2660 |
* |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2661 |
* B feature see action 0 |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2662 |
* B n-id bits 0-6: how many IDs this definition applies to |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2663 |
* bit 7: if set, this is a wagon override definition (see below) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2664 |
* B ids the IDs for which this definition applies |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2665 |
* B num-cid number of cargo IDs (sprite group IDs) in this definition |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2666 |
* can be zero, in that case the def-cid is used always |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2667 |
* B cargo-type type of this cargo type (e.g. mail=2, wood=7, see below) |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2668 |
* W cid cargo ID (sprite group ID) for this type of cargo |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2669 |
* W def-cid default cargo ID (sprite group ID) */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2670 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2671 |
if (!check_length(len, 6, "FeatureMapSpriteGroup")) return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2672 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2673 |
uint8 feature = buf[1]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2674 |
uint8 idcount = buf[2] & 0x7F; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2675 |
bool wagover = (buf[2] & 0x80) == 0x80; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2676 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2677 |
if (!check_length(len, 3 + idcount, "FeatureMapSpriteGroup")) return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2678 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2679 |
/* If idcount is zero, this is a feature callback */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2680 |
if (idcount == 0) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2681 |
grfmsg(2, "FeatureMapSpriteGroup: Feature callbacks not implemented yet"); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2682 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2683 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2684 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2685 |
uint8 cidcount = buf[3 + idcount]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2686 |
if (!check_length(len, 4 + idcount + cidcount * 3, "FeatureMapSpriteGroup")) return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2687 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2688 |
grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids, %d cids, wagon override %d", |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2689 |
feature, idcount, cidcount, wagover); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2690 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2691 |
if (_cur_grffile->spriteset_start == 0 || _cur_grffile->spritegroups == 0) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2692 |
grfmsg(1, "FeatureMapSpriteGroup: No sprite set to work on! Skipping"); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2693 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2694 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2695 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2696 |
switch (feature) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2697 |
case GSF_TRAIN: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2698 |
case GSF_ROAD: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2699 |
case GSF_SHIP: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2700 |
case GSF_AIRCRAFT: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2701 |
VehicleMapSpriteGroup(buf, feature, idcount, cidcount, wagover); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2702 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2703 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2704 |
case GSF_CANAL: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2705 |
CanalMapSpriteGroup(buf, idcount, cidcount); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2706 |
return; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2707 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2708 |
case GSF_STATION: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2709 |
StationMapSpriteGroup(buf, idcount, cidcount); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2710 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2711 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2712 |
case GSF_TOWNHOUSE: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2713 |
TownHouseMapSpriteGroup(buf, idcount, cidcount); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2714 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2715 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2716 |
case GSF_CARGOS: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2717 |
CargoMapSpriteGroup(buf, idcount, cidcount); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2718 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2719 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2720 |
default: |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2721 |
grfmsg(1, "FeatureMapSpriteGroup: Unsupported feature %d, skipping", feature); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2722 |
return; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2723 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2724 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2725 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2726 |
/* Action 0x04 */ |
3879
3e9cd6403d73
(svn r4928) CodeChange : Rename functions referring to "Vehicle" for "Feature".
belugas
parents:
3875
diff
changeset
|
2727 |
static void FeatureNewName(byte *buf, int len) |
0 | 2728 |
{ |
2729 |
/* <04> <veh-type> <language-id> <num-veh> <offset> <data...> |
|
2730 |
* |
|
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2731 |
* B veh-type see action 0 (as 00..07, + 0A |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2732 |
* But IF veh-type = 48, then generic text |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2733 |
* B language-id If bit 6 is set, This is the extended language scheme, |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2734 |
with up to 64 language. |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2735 |
Otherwise, it is a mapping where set bits have meaning |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2736 |
0 = american, 1 = english, 2 = german, 3 = french, 4 = spanish |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2737 |
Bit 7 set means this is a generic text, not a vehicle one (or else) |
0 | 2738 |
* B num-veh number of vehicles which are getting a new name |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2739 |
* B/W offset number of the first vehicle that gets a new name |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2740 |
* Byte : ID of vehicle to change |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2741 |
* Word : ID of string to change/add |
0 | 2742 |
* S data new texts, each of them zero-terminated, after |
2743 |
* which the next name begins. */ |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2744 |
|
3643
5d1f3fe61036
(svn r4552) - NewGRF: fix braino... in r4550, new_scheme should true when the version is 7 or higher, not less than 7...
peter1138
parents:
3642
diff
changeset
|
2745 |
bool new_scheme = _cur_grffile->grf_version >= 7; |
0 | 2746 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2747 |
if (!check_length(len, 6, "FeatureNewName")) return; |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2748 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2749 |
uint8 feature = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2750 |
uint8 lang = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2751 |
uint8 num = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2752 |
bool generic = HASBIT(lang, 7); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2753 |
uint16 id = generic ? grf_load_word(&buf) : grf_load_byte(&buf); |
4992
6d0a80c5c654
(svn r6995) - Codechange: NewGRF; strip bit 7 of the language ID earlier and handle handle a language ID of 0x7F as the preferred default language.
peter1138
parents:
4964
diff
changeset
|
2754 |
|
6d0a80c5c654
(svn r6995) - Codechange: NewGRF; strip bit 7 of the language ID earlier and handle handle a language ID of 0x7F as the preferred default language.
peter1138
parents:
4964
diff
changeset
|
2755 |
CLRBIT(lang, 7); |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2756 |
|
3760
10a6f762e754
(svn r4751) - NewGRF: when assigning new texts, ignore the feature byte as some sets use generic feature always. Also, don't add vehicle id shifts if the vehicle id is out of range.
peter1138
parents:
3750
diff
changeset
|
2757 |
if (feature <= GSF_AIRCRAFT && id < _vehcounts[feature]) { |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2758 |
id += _vehshifts[feature]; |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2759 |
} |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2760 |
uint16 endid = id + num; |
0 | 2761 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2762 |
grfmsg(6, "FeatureNewName: About to rename engines %d..%d (feature %d) in language 0x%02X", |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2763 |
id, endid, feature, lang); |
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2764 |
|
4992
6d0a80c5c654
(svn r6995) - Codechange: NewGRF; strip bit 7 of the language ID earlier and handle handle a language ID of 0x7F as the preferred default language.
peter1138
parents:
4964
diff
changeset
|
2765 |
len -= generic ? 6 : 5; |
6d0a80c5c654
(svn r6995) - Codechange: NewGRF; strip bit 7 of the language ID earlier and handle handle a language ID of 0x7F as the preferred default language.
peter1138
parents:
4964
diff
changeset
|
2766 |
|
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
2767 |
for (; id < endid && len > 0; id++) { |
6416
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
2768 |
const char *name = grf_load_string(&buf, len); |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
2769 |
size_t name_length = strlen(name) + 1; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
2770 |
|
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
2771 |
len -= (int)name_length; |
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
2772 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2773 |
grfmsg(8, "FeatureNewName: 0x%04X <- %s", id, name); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2774 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2775 |
switch (feature) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2776 |
case GSF_TRAIN: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2777 |
case GSF_ROAD: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2778 |
case GSF_SHIP: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2779 |
case GSF_AIRCRAFT: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2780 |
if (id < TOTAL_NUM_ENGINES) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2781 |
StringID string = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_8000_KIRBY_PAUL_TANK_STEAM + id); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2782 |
SetCustomEngineName(id, string); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2783 |
} else { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2784 |
AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, id); |
3614 | 2785 |
} |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2786 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2787 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2788 |
case GSF_TOWNHOUSE: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2789 |
default: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2790 |
switch (GB(id, 8, 8)) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2791 |
case 0xC4: // Station class name |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2792 |
if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2793 |
grfmsg(1, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring", GB(id, 0, 8)); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2794 |
} else { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2795 |
StationClassID sclass = _cur_grffile->stations[GB(id, 0, 8)]->sclass; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2796 |
SetStationClassName(sclass, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED)); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
2797 |
} |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2798 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2799 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2800 |
case 0xC5: // Station name |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2801 |
if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2802 |
grfmsg(1, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring", GB(id, 0, 8)); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2803 |
} else { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2804 |
_cur_grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2805 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2806 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2807 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2808 |
case 0xC9: // House name |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2809 |
if (_cur_grffile->housespec == NULL || _cur_grffile->housespec[GB(id, 0, 8)] == NULL) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2810 |
grfmsg(1, "FeatureNewName: Attempt to name undefined house 0x%X, ignoring.", GB(id, 0, 8)); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2811 |
} else { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2812 |
_cur_grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2813 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2814 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2815 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2816 |
case 0xD0: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2817 |
case 0xDC: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2818 |
AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2819 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2820 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2821 |
default: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2822 |
grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2823 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2824 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2825 |
break; |
3642
a247e07fafdf
(svn r4551) - NewGRF: add string handling for newstations.
peter1138
parents:
3641
diff
changeset
|
2826 |
|
a247e07fafdf
(svn r4551) - NewGRF: add string handling for newstations.
peter1138
parents:
3641
diff
changeset
|
2827 |
#if 0 |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2828 |
case GSF_CANAL : |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2829 |
case GSF_BRIDGE : |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2830 |
AddGRFString(_cur_spriteid, id, lang, name); |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
2831 |
switch (GB(id, 8, 8)) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2832 |
case 0xC9: // House name |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2833 |
default: |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2834 |
grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id); |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2835 |
} |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2836 |
break; |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2837 |
|
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2838 |
case GSF_INDUSTRIES : |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2839 |
case 0x48 : // for generic strings |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2840 |
AddGRFString(_cur_spriteid, id, lang, name); |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2841 |
break; |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2842 |
default : |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2843 |
grfmsg(7, "FeatureNewName: Unsupported feature (0x%02X)", feature); |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2844 |
break; |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
2845 |
#endif |
379
4605aa187b18
(svn r568) -newgrf: Make @wagover bool, simplifying stuff. (pasky)
celestar
parents:
378
diff
changeset
|
2846 |
} |
0 | 2847 |
} |
2848 |
} |
|
2849 |
||
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2850 |
/* Action 0x05 */ |
0 | 2851 |
static void GraphicsNew(byte *buf, int len) |
2852 |
{ |
|
2853 |
/* <05> <graphics-type> <num-sprites> <other data...> |
|
2854 |
* |
|
2855 |
* B graphics-type What set of graphics the sprites define. |
|
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2856 |
* E num-sprites How many sprites are in this set? |
0 | 2857 |
* V other data Graphics type specific data. Currently unused. */ |
2858 |
/* TODO */ |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2859 |
|
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2860 |
SpriteID replace = 0; |
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2861 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
2862 |
if (!check_length(len, 2, "GraphicsNew")) return; |
2346
7e88b66abdbd
(svn r2872) -Feature: [NewGRF] Add support for "extended bytes"
tron
parents:
2345
diff
changeset
|
2863 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2864 |
uint8 type = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
2865 |
uint16 num = grf_load_extended(&buf); |
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
2866 |
|
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2867 |
switch (type) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2868 |
case 0x04: // Signal graphics |
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2869 |
if (num != 112 && num != 240) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2870 |
grfmsg(1, "GraphicsNew: Signal graphics sprite count must be 112 or 240, skipping"); |
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2871 |
return; |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2872 |
} |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2873 |
_signal_base = _cur_spriteid; |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2874 |
break; |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2875 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2876 |
case 0x05: // Catenary graphics |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2877 |
if (num != 48) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2878 |
grfmsg(1, "GraphicsNew: Catenary graphics sprite count must be 48, skipping"); |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2879 |
return; |
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2880 |
} |
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2881 |
replace = SPR_ELRAIL_BASE + 3; |
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2882 |
break; |
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2883 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2884 |
case 0x06: // Foundations |
3709
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2885 |
if (num != 74) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2886 |
grfmsg(1, "GraphicsNew: Foundation graphics sprite count must be 74, skipping"); |
3709
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2887 |
return; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2888 |
} |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2889 |
replace = SPR_SLOPES_BASE; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2890 |
break; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2891 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2892 |
case 0x08: // Canal graphics |
3709
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2893 |
if (num != 65) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2894 |
grfmsg(1, "GraphicsNew: Canal graphics sprite count must be 65, skipping"); |
3709
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2895 |
return; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2896 |
} |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2897 |
replace = SPR_CANALS_BASE + 5; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2898 |
break; |
be60bcc248bc
(svn r4652) - NewGRF: support loading of foundation and canal graphics from NewGRF files via action 5
peter1138
parents:
3708
diff
changeset
|
2899 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2900 |
case 0x0A: // 2CC colour maps |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2901 |
if (num != 256) { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2902 |
grfmsg(1, "GraphicsNew: 2CC colour maps sprite count must be 256, skipping"); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2903 |
return; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2904 |
} |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2905 |
replace = SPR_2CCMAP_BASE; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2906 |
break; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2907 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2908 |
case 0x0D: // Coast graphics |
5210
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2909 |
if (num != 16) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2910 |
grfmsg(1, "GraphicsNew: Coast graphics sprite count must be 16, skipping"); |
5210
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2911 |
return; |
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2912 |
} |
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2913 |
_coast_base = _cur_spriteid; |
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2914 |
break; |
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
2915 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2916 |
case 0x10: // New airport sprites |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2917 |
if (num != 15) { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2918 |
grfmsg(1, "GraphicsNew: Airport graphics sprite count must be 15, skipping"); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2919 |
return; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2920 |
} |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2921 |
replace = SPR_AIRPORTX_BASE; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2922 |
break; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2923 |
|
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2924 |
case 0x11: // Road stop sprites |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2925 |
if (num != 8) { |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2926 |
grfmsg(1, "GraphicsNew: Road stop graphics sprite count must be 8, skipping"); |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2927 |
return; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2928 |
} |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2929 |
replace = SPR_ROADSTOP_BASE; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2930 |
break; |
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
2931 |
|
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2932 |
default: |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2933 |
grfmsg(2, "GraphicsNew: Custom graphics (type 0x%02X) sprite block of length %u (unimplemented, ignoring)", |
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2934 |
type, num); |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2935 |
return; |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2936 |
} |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2937 |
|
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2938 |
if (replace == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2939 |
grfmsg(2, "GraphicsNew: Loading %u sprites of type 0x%02X at SpriteID 0x%04X", num, type, _cur_spriteid); |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2940 |
} else { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
2941 |
grfmsg(2, "GraphicsNew: Replacing %u sprites of type 0x%02X at SpriteID 0x%04X", num, type, replace); |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2942 |
} |
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2943 |
|
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2944 |
for (; num > 0; num--) { |
3708
1c548218151c
(svn r4651) - NewGRF: support loading of catenary sprites from NewGRF files. This actually works by replacing our hardcoded sprites.
peter1138
parents:
3707
diff
changeset
|
2945 |
LoadNextSprite(replace == 0 ? _cur_spriteid++ : replace++, _file_index); |
3638
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2946 |
_nfo_line++; |
6e0b43d905d4
(svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
peter1138
parents:
3635
diff
changeset
|
2947 |
} |
0 | 2948 |
} |
2949 |
||
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2950 |
/* Action 0x05 (SKIP) */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2951 |
static void SkipAct5(byte *buf, int len) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2952 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2953 |
if (!check_length(len, 2, "SkipAct5")) return; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2954 |
buf++; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2955 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2956 |
/* Ignore type byte */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2957 |
grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2958 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2959 |
/* Skip the sprites of this action */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2960 |
_skip_sprites = grf_load_extended(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2961 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2962 |
grfmsg(3, "SkipAct5: Skipping %d sprites", _skip_sprites); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2963 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2964 |
|
3806 | 2965 |
static uint32 GetParamVal(byte param, uint32 *cond_val) |
2966 |
{ |
|
2967 |
switch (param) { |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2968 |
case 0x81: // current year |
5340
82c981816fcb
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5338
diff
changeset
|
2969 |
return clamp(_cur_year, ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR; |
82c981816fcb
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5338
diff
changeset
|
2970 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2971 |
case 0x83: // current climate, 0=temp, 1=arctic, 2=trop, 3=toyland |
3806 | 2972 |
return _opt.landscape; |
2973 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2974 |
case 0x84: // GRF loading stage |
5161
a064564a4a70
(svn r7266) -Codechange: Make the NewGRF loading stage look like ttdpatch to NewGRFs
peter1138
parents:
5115
diff
changeset
|
2975 |
return (_cur_stage > GLS_INIT) | ((_cur_stage == GLS_ACTIVATION) << 9); |
3806 | 2976 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2977 |
case 0x85: // TTDPatch flags, only for bit tests |
3811
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2978 |
if (cond_val == NULL) { |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2979 |
/* Supported in Action 0x07 and 0x09, not 0x0D */ |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2980 |
return 0; |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2981 |
} else { |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2982 |
uint32 param_val = _ttdpatch_flags[*cond_val / 0x20]; |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2983 |
*cond_val %= 0x20; |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2984 |
return param_val; |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
2985 |
} |
3806 | 2986 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2987 |
case 0x86: // road traffic side, bit 4 clear=left, set=right |
3806 | 2988 |
return _opt.road_side << 4; |
2989 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2990 |
case 0x88: // GRF ID check |
3806 | 2991 |
return 0; |
2992 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
2993 |
case 0x8B: { // TTDPatch version |
3806 | 2994 |
uint major = 2; |
4993
7d84a318e3a4
(svn r6996) - Codechange: Pretend to be the current version of TTDPatch. This value doesn't anything to us as we don't follow TTDPatch's development timeline...
peter1138
parents:
4992
diff
changeset
|
2995 |
uint minor = 6; |
7d84a318e3a4
(svn r6996) - Codechange: Pretend to be the current version of TTDPatch. This value doesn't anything to us as we don't follow TTDPatch's development timeline...
peter1138
parents:
4992
diff
changeset
|
2996 |
uint revision = 0; // special case: 2.0.1 is 2.0.10 |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
2997 |
uint build = 1210; |
4993
7d84a318e3a4
(svn r6996) - Codechange: Pretend to be the current version of TTDPatch. This value doesn't anything to us as we don't follow TTDPatch's development timeline...
peter1138
parents:
4992
diff
changeset
|
2998 |
return (major << 24) | (minor << 20) | (revision << 16) | build; |
3806 | 2999 |
} |
3000 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3001 |
case 0x8D: // TTD Version, 00=DOS, 01=Windows |
3806 | 3002 |
return !_use_dos_palette; |
3003 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3004 |
case 0x8E: // Y-offset for train sprites |
3806 | 3005 |
return _traininfo_vehicle_pitch; |
3006 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3007 |
case 0x92: // Game mode |
3806 | 3008 |
return _game_mode; |
3009 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3010 |
case 0x9A: // Always -1 |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
3011 |
return UINT_MAX; |
5287
94a6c3c924b2
(svn r7436) -Codechange: Add action7/9/D variable 0x9A (-1)
peter1138
parents:
5234
diff
changeset
|
3012 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3013 |
case 0x9D: // TTD Platform, 00=TTDPatch, 01=OpenTTD |
3806 | 3014 |
return 1; |
3015 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3016 |
case 0x9E: // Miscellaneous GRF features |
3814
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
3017 |
return _misc_grf_features; |
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
3018 |
|
3806 | 3019 |
default: |
3020 |
/* GRF Parameter */ |
|
3021 |
if (param < 0x80) return _cur_grffile->param[param]; |
|
3022 |
||
3023 |
/* In-game variable. */ |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3024 |
grfmsg(1, "Unsupported in-game variable 0x%02X", param); |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
3025 |
return UINT_MAX; |
3806 | 3026 |
} |
3027 |
} |
|
3028 |
||
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3029 |
/* Action 0x06 */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3030 |
static void CfgApply(byte *buf, int len) |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3031 |
{ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3032 |
/* <06> <param-num> <param-size> <offset> ... <FF> |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3033 |
* |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3034 |
* B param-num Number of parameter to substitute (First = "zero") |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3035 |
* Ignored if that parameter was not specified in newgrf.cfg |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3036 |
* B param-size How many bytes to replace. If larger than 4, the |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3037 |
* bytes of the following parameter are used. In that |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3038 |
* case, nothing is applied unless *all* parameters |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3039 |
* were specified. |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3040 |
* B offset Offset into data from beginning of next sprite |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3041 |
* to place where parameter is to be stored. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3042 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3043 |
/* Preload the next sprite */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3044 |
uint32 pos = FioGetPos(); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3045 |
uint16 num = FioReadWord(); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3046 |
uint8 type = FioReadByte(); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3047 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3048 |
/* Check if the sprite is a pseudo sprite. We can't operate on real sprites. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3049 |
if (type == 0xFF) { |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
3050 |
_preload_sprite = MallocT<byte>(num); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3051 |
FioReadBlock(_preload_sprite, num); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3052 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3053 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3054 |
/* Reset the file position to the start of the next sprite */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3055 |
FioSeekTo(pos, SEEK_SET); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3056 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3057 |
if (type != 0xFF) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3058 |
grfmsg(2, "CfgApply: Ignoring (next sprite is real, unsupported)"); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3059 |
return; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3060 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3061 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3062 |
/* Now perform the Action 0x06 on our data. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3063 |
buf++; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3064 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3065 |
for (;;) { |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3066 |
uint i; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3067 |
uint param_num; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3068 |
uint param_size; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3069 |
uint offset; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3070 |
bool add_value; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3071 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3072 |
/* Read the parameter to apply. 0xFF indicates no more data to change. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3073 |
param_num = grf_load_byte(&buf); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3074 |
if (param_num == 0xFF) break; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3075 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3076 |
/* Get the size of the parameter to use. If the size covers multiple |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3077 |
* double words, sequential parameter values are used. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3078 |
param_size = grf_load_byte(&buf); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3079 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3080 |
/* Bit 7 of param_size indicates we should add to the original value |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3081 |
* instead of replacing it. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3082 |
add_value = HASBIT(param_size, 7); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3083 |
param_size = GB(param_size, 0, 7); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3084 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3085 |
/* Where to apply the data to within the pseudo sprite data. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3086 |
offset = grf_load_extended(&buf); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3087 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3088 |
/* If the parameter is a GRF parameter (not an internal variable) check |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3089 |
* if it (and all further sequential parameters) has been defined. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3090 |
if (param_num < 0x80 && (param_num + (param_size - 1) / 4) >= _cur_grffile->param_end) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3091 |
grfmsg(2, "CfgApply: Ignoring (param %d not set)", (param_num + (param_size - 1) / 4)); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3092 |
break; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3093 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3094 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3095 |
grfmsg(8, "CfgApply: Applying %u bytes from parameter 0x%02X at offset 0x%04X", param_size, param_num, offset); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3096 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3097 |
bool carry = false; |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3098 |
for (i = 0; i < param_size; i++) { |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3099 |
uint32 value = GetParamVal(param_num + i / 4, NULL); |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3100 |
/* Reset carry flag for each iteration of the variable (only really |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3101 |
* matters if param_size is greater than 4) */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3102 |
if (i == 0) carry = false; |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3103 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3104 |
if (add_value) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3105 |
uint new_value = _preload_sprite[offset + i] + GB(value, (i % 4) * 8, 8) + (carry ? 1 : 0); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3106 |
_preload_sprite[offset + i] = GB(new_value, 0, 8); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3107 |
/* Check if the addition overflowed */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3108 |
carry = new_value >= 256; |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3109 |
} else { |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3110 |
_preload_sprite[offset + i] = GB(value, (i % 4) * 8, 8); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3111 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3112 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3113 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3114 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
3115 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
3116 |
/* Action 0x07 */ |
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
3117 |
/* Action 0x09 */ |
0 | 3118 |
static void SkipIf(byte *buf, int len) |
3119 |
{ |
|
3120 |
/* <07/09> <param-num> <param-size> <condition-type> <value> <num-sprites> |
|
3121 |
* |
|
3122 |
* B param-num |
|
3123 |
* B param-size |
|
3124 |
* B condition-type |
|
3125 |
* V value |
|
3126 |
* B num-sprites */ |
|
3127 |
/* TODO: More params. More condition types. */ |
|
2336
48ace1344af0
(svn r2862) Return a proper version number, when testing the TTDPatch version in the SkipIf action. Pretend to be version 2.0.1 alpha 49 for now.
tron
parents:
2324
diff
changeset
|
3128 |
uint32 cond_val = 0; |
3806 | 3129 |
uint32 mask = 0; |
360
ff657281ae48
(svn r548) -newgrf: minor style changes, and application of boolean type
darkvater
parents:
359
diff
changeset
|
3130 |
bool result; |
0 | 3131 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
3132 |
if (!check_length(len, 6, "SkipIf")) return; |
3714
402f02b01241
(svn r4657) - NewGRF: use grf_load_byte() in favour of array accesses
peter1138
parents:
3712
diff
changeset
|
3133 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3134 |
uint8 param = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3135 |
uint8 paramsize = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3136 |
uint8 condtype = grf_load_byte(&buf); |
0 | 3137 |
|
359
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3138 |
if (condtype < 2) { |
1611 | 3139 |
/* Always 1 for bit tests, the given value should be ignored. */ |
359
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3140 |
paramsize = 1; |
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3141 |
} |
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3142 |
|
1611 | 3143 |
switch (paramsize) { |
3806 | 3144 |
case 4: cond_val = grf_load_dword(&buf); mask = 0xFFFFFFFF; break; |
3145 |
case 2: cond_val = grf_load_word(&buf); mask = 0x0000FFFF; break; |
|
3146 |
case 1: cond_val = grf_load_byte(&buf); mask = 0x000000FF; break; |
|
1611 | 3147 |
default: break; |
3148 |
} |
|
359
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3149 |
|
3806 | 3150 |
if (param < 0x80 && _cur_grffile->param_end <= param) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3151 |
grfmsg(7, "SkipIf: Param %d undefined, skipping test", param); |
3806 | 3152 |
return; |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3153 |
} |
0 | 3154 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3155 |
uint32 param_val = GetParamVal(param, &cond_val); |
3806 | 3156 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3157 |
grfmsg(7, "SkipIf: Test condtype %d, param 0x%08X, condval 0x%08X", condtype, param_val, cond_val); |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3158 |
|
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3159 |
if (param == 0x88) { |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3160 |
/* GRF ID checks */ |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3161 |
|
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3162 |
const GRFConfig *c = GetGRFConfig(cond_val); |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3163 |
|
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3164 |
if (condtype != 10 && c == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3165 |
grfmsg(7, "SkipIf: GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val)); |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3166 |
return; |
5234
91b7def5e4b2
(svn r7354) -Codechange: Remove grffile->flags and use grfconfig->flags exclusively. Update action 7/9 now that we know if GRFs are disabled.
peter1138
parents:
5228
diff
changeset
|
3167 |
} |
91b7def5e4b2
(svn r7354) -Codechange: Remove grffile->flags and use grfconfig->flags exclusively. Update action 7/9 now that we know if GRFs are disabled.
peter1138
parents:
5228
diff
changeset
|
3168 |
|
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3169 |
switch (condtype) { |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3170 |
/* Tests 6 to 10 are only for param 0x88, GRFID checks */ |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3171 |
case 6: // Is GRFID active? |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3172 |
result = c->status == GCS_ACTIVATED; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3173 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3174 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3175 |
case 7: // Is GRFID non-active? |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3176 |
result = c->status != GCS_ACTIVATED; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3177 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3178 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3179 |
case 8: // GRFID is not but will be active? |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3180 |
result = c->status == GCS_INITIALISED; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3181 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3182 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3183 |
case 9: // GRFID is or will be active? |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3184 |
result = c->status == GCS_ACTIVATED || c->status == GCS_INITIALISED; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3185 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3186 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3187 |
case 10: // GRFID is not nor will be active |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3188 |
/* This is the only condtype that doesn't get ignored if the GRFID is not found */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3189 |
result = c == NULL || c->flags == GCS_DISABLED || c->status == GCS_NOT_FOUND; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3190 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3191 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3192 |
default: grfmsg(1, "SkipIf: Unsupported GRF test %d. Ignoring", condtype); return; |
5234
91b7def5e4b2
(svn r7354) -Codechange: Remove grffile->flags and use grfconfig->flags exclusively. Update action 7/9 now that we know if GRFs are disabled.
peter1138
parents:
5228
diff
changeset
|
3193 |
} |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3194 |
} else { |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3195 |
/* Parameter or variable tests */ |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3196 |
switch (condtype) { |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3197 |
case 0: result = !!(param_val & (1 << cond_val)); |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3198 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3199 |
case 1: result = !(param_val & (1 << cond_val)); |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3200 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3201 |
case 2: result = (param_val & mask) == cond_val; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3202 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3203 |
case 3: result = (param_val & mask) != cond_val; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3204 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3205 |
case 4: result = (param_val & mask) < cond_val; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3206 |
break; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3207 |
case 5: result = (param_val & mask) > cond_val; |
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3208 |
break; |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3209 |
case 11: result = GetCargoIDByLabel(BSWAP32(cond_val)) == CT_INVALID; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3210 |
break; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3211 |
case 12: result = GetCargoIDByLabel(BSWAP32(cond_val)) != CT_INVALID; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3212 |
break; |
5703
3f848403a814
(svn r7711) -Fix (r7354): NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs. Also separate GRF ID conditions
peter1138
parents:
5681
diff
changeset
|
3213 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3214 |
default: grfmsg(1, "SkipIf: Unsupported test %d. Ignoring", condtype); return; |
5234
91b7def5e4b2
(svn r7354) -Codechange: Remove grffile->flags and use grfconfig->flags exclusively. Update action 7/9 now that we know if GRFs are disabled.
peter1138
parents:
5228
diff
changeset
|
3215 |
} |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3216 |
} |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3217 |
|
1607
320079c7ac28
(svn r2111) So, result is bool therefore no need for this horrible == 0 thing.
pasky
parents:
1606
diff
changeset
|
3218 |
if (!result) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3219 |
grfmsg(2, "SkipIf: Not skipping sprites, test was false"); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3220 |
return; |
359
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3221 |
} |
f0ee94d705ed
(svn r547) -newgrf: Enhanced support for action 0x7 and 0x9 (skips). Killer mixture mixed from octo's patch and pasky's old patch (pasky & octo).
darkvater
parents:
357
diff
changeset
|
3222 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3223 |
uint8 numsprites = grf_load_byte(&buf); |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3224 |
|
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3225 |
/* numsprites can be a GOTO label if it has been defined in the GRF |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3226 |
* file. The jump will always be the first matching label that follows |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3227 |
* the current nfo_line. If no matching label is found, the first matching |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3228 |
* label in the file is used. */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3229 |
GRFLabel *choice = NULL; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3230 |
for (GRFLabel *label = _cur_grffile->label; label != NULL; label = label->next) { |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3231 |
if (label->label != numsprites) continue; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3232 |
|
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3233 |
/* Remember a goto before the current line */ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3234 |
if (choice == NULL) choice = label; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3235 |
/* If we find a label here, this is definitely good */ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3236 |
if (label->nfo_line > _nfo_line) { |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3237 |
choice = label; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3238 |
break; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3239 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3240 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3241 |
|
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3242 |
if (choice != NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3243 |
grfmsg(2, "SkipIf: Jumping to label 0x%0X at line %d, test was true", choice->label, choice->nfo_line); |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3244 |
FioSeekTo(choice->pos, SEEK_SET); |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3245 |
_nfo_line = choice->nfo_line; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3246 |
return; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3247 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3248 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3249 |
grfmsg(2, "SkipIf: Skipping %d sprites, test was true", numsprites); |
357
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3250 |
_skip_sprites = numsprites; |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3251 |
if (_skip_sprites == 0) { |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3252 |
/* Zero means there are no sprites to skip, so |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3253 |
* we use -1 to indicate that all further |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3254 |
* sprites should be skipped. */ |
912b71f33867
(svn r545) -newgrf: repaired indendation (pasky & octo)
celestar
parents:
356
diff
changeset
|
3255 |
_skip_sprites = -1; |
6422
14794ebde68e
(svn r8831) -Feature: If an action 7/9 leads to skipping the rest of the file, disable the
maedhros
parents:
6421
diff
changeset
|
3256 |
|
14794ebde68e
(svn r8831) -Feature: If an action 7/9 leads to skipping the rest of the file, disable the
maedhros
parents:
6421
diff
changeset
|
3257 |
/* If an action 8 hasn't been encountered yet, disable the grf. */ |
9907
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
3258 |
if (_cur_stage != GLS_RESERVE && _cur_grfconfig->status != GCS_ACTIVATED) _cur_grfconfig->status = GCS_DISABLED; |
0 | 3259 |
} |
3260 |
} |
|
3261 |
||
5317
e235a3a573e3
(svn r7475) -Fix (r7348): sanity check NewGRF action 8 strings for null terminator
peter1138
parents:
5306
diff
changeset
|
3262 |
|
5753
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3263 |
/* Action 0x08 (GLS_FILESCAN) */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3264 |
static void ScanInfo(byte *buf, int len) |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3265 |
{ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3266 |
if (!check_length(len, 8, "Info")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3267 |
buf++; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3268 |
grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3269 |
uint32 grfid = grf_load_dword(&buf); |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3270 |
|
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3271 |
_cur_grfconfig->grfid = grfid; |
5317
e235a3a573e3
(svn r7475) -Fix (r7348): sanity check NewGRF action 8 strings for null terminator
peter1138
parents:
5306
diff
changeset
|
3272 |
|
5329
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
3273 |
/* GRF IDs starting with 0xFF are reserved for internal TTDPatch use */ |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
3274 |
if (GB(grfid, 24, 8) == 0xFF) SETBIT(_cur_grfconfig->flags, GCF_SYSTEM); |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
3275 |
|
5317
e235a3a573e3
(svn r7475) -Fix (r7348): sanity check NewGRF action 8 strings for null terminator
peter1138
parents:
5306
diff
changeset
|
3276 |
len -= 6; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3277 |
const char *name = grf_load_string(&buf, len); |
6512
8625c30bd63d
(svn r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.
rubidium
parents:
6474
diff
changeset
|
3278 |
_cur_grfconfig->name = TranslateTTDPatchCodes(name); |
8625c30bd63d
(svn r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.
rubidium
parents:
6474
diff
changeset
|
3279 |
|
8625c30bd63d
(svn r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.
rubidium
parents:
6474
diff
changeset
|
3280 |
len -= strlen(name) + 1; |
8625c30bd63d
(svn r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.
rubidium
parents:
6474
diff
changeset
|
3281 |
if (len > 0) { |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3282 |
const char *info = grf_load_string(&buf, len); |
6512
8625c30bd63d
(svn r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.
rubidium
parents:
6474
diff
changeset
|
3283 |
_cur_grfconfig->info = TranslateTTDPatchCodes(info); |
5317
e235a3a573e3
(svn r7475) -Fix (r7348): sanity check NewGRF action 8 strings for null terminator
peter1138
parents:
5306
diff
changeset
|
3284 |
} |
5329
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
3285 |
|
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
3286 |
/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */ |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3287 |
_skip_sprites = -1; |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3288 |
} |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
3289 |
|
3640
b73687dd2b62
(svn r4549) - NewGRF: store the grf version from Action 0x08.
peter1138
parents:
3638
diff
changeset
|
3290 |
/* Action 0x08 */ |
0 | 3291 |
static void GRFInfo(byte *buf, int len) |
3292 |
{ |
|
3293 |
/* <08> <version> <grf-id> <name> <info> |
|
3294 |
* |
|
3295 |
* B version newgrf version, currently 06 |
|
3296 |
* 4*B grf-id globally unique ID of this .grf file |
|
3297 |
* S name name of this .grf set |
|
3298 |
* S info string describing the set, and e.g. author and copyright */ |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3299 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3300 |
if (!check_length(len, 8, "GRFInfo")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3301 |
buf++; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3302 |
uint8 version = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3303 |
uint32 grfid = grf_load_dword(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3304 |
const char *name = grf_load_string(&buf, len - 6); |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
3305 |
|
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
3306 |
_cur_grffile->grfid = grfid; |
3640
b73687dd2b62
(svn r4549) - NewGRF: store the grf version from Action 0x08.
peter1138
parents:
3638
diff
changeset
|
3307 |
_cur_grffile->grf_version = version; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3308 |
_cur_grfconfig->status = _cur_stage < GLS_ACTIVATION ? GCS_INITIALISED : GCS_ACTIVATED; |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
3309 |
|
3711
4a0d1c635b56
(svn r4654) - Fix [NewGRF]: Properly read in the GRFID. This fixes GRFID checking and activation/deactivation. Do swap the GRFID for displaying purposes.
Darkvater
parents:
3709
diff
changeset
|
3310 |
/* Do swap the GRFID for displaying purposes since people expect that */ |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3311 |
DEBUG(grf, 1, "GRFInfo: Loaded GRFv%d set %08lX - %s", version, BSWAP32(grfid), name); |
0 | 3312 |
} |
3313 |
||
3640
b73687dd2b62
(svn r4549) - NewGRF: store the grf version from Action 0x08.
peter1138
parents:
3638
diff
changeset
|
3314 |
/* Action 0x0A */ |
0 | 3315 |
static void SpriteReplace(byte *buf, int len) |
3316 |
{ |
|
3317 |
/* <0A> <num-sets> <set1> [<set2> ...] |
|
3318 |
* <set>: <num-sprites> <first-sprite> |
|
3319 |
* |
|
3320 |
* B num-sets How many sets of sprites to replace. |
|
3321 |
* Each set: |
|
3322 |
* B num-sprites How many sprites are in this set |
|
3323 |
* W first-sprite First sprite number to replace */ |
|
361
ad7a042ee0eb
(svn r549) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
360
diff
changeset
|
3324 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3325 |
buf++; // skip action byte |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3326 |
uint8 num_sets = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3327 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3328 |
for (uint i = 0; i < num_sets; i++) { |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
3329 |
uint8 num_sprites = grf_load_byte(&buf); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
3330 |
uint16 first_sprite = grf_load_word(&buf); |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
3331 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3332 |
grfmsg(2, "SpriteReplace: [Set %d] Changing %d sprites, beginning with %d", |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
3333 |
i, num_sprites, first_sprite |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
3334 |
); |
361
ad7a042ee0eb
(svn r549) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
360
diff
changeset
|
3335 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3336 |
for (uint j = 0; j < num_sprites; j++) { |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
3337 |
LoadNextSprite(first_sprite + j, _file_index); // XXX |
3557
5d12a78ce141
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
peter1138
parents:
3555
diff
changeset
|
3338 |
_nfo_line++; |
361
ad7a042ee0eb
(svn r549) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
360
diff
changeset
|
3339 |
} |
ad7a042ee0eb
(svn r549) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
360
diff
changeset
|
3340 |
} |
0 | 3341 |
} |
3342 |
||
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3343 |
/* Action 0x0A (SKIP) */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3344 |
static void SkipActA(byte *buf, int len) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3345 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3346 |
buf++; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3347 |
uint8 num_sets = grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3348 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3349 |
for (uint i = 0; i < num_sets; i++) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3350 |
/* Skip the sprites this replaces */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3351 |
_skip_sprites += grf_load_byte(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3352 |
/* But ignore where they go */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3353 |
grf_load_word(&buf); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3354 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3355 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3356 |
grfmsg(3, "SkipActA: Skipping %d sprites", _skip_sprites); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3357 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3358 |
|
3715
dd9807bf5927
(svn r4658) - NewGRF: add Action 0xNN comments before each action handler. This mainly aids code navigation...
peter1138
parents:
3714
diff
changeset
|
3359 |
/* Action 0x0B */ |
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3360 |
static void GRFLoadError(byte *buf, int len) |
0 | 3361 |
{ |
3362 |
/* <0B> <severity> <language-id> <message-id> [<message...> 00] [<data...>] 00 [<parnum>] |
|
3363 |
* |
|
3364 |
* B severity 00: notice, contine loading grf file |
|
3365 |
* 01: warning, continue loading grf file |
|
3366 |
* 02: error, but continue loading grf file, and attempt |
|
3367 |
* loading grf again when loading or starting next game |
|
3368 |
* 03: error, abort loading and prevent loading again in |
|
3369 |
* the future (only when restarting the patch) |
|
3370 |
* B language-id see action 4, use 1F for built-in error messages |
|
3371 |
* B message-id message to show, see below |
|
3372 |
* S message for custom messages (message-id FF), text of the message |
|
3373 |
* not present for built-in messages. |
|
3374 |
* V data additional data for built-in (or custom) messages |
|
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3375 |
* B parnum parameter numbers to be shown in the message (maximum of 2) */ |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3376 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3377 |
static const StringID msgstr[] = { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3378 |
STR_NEWGRF_ERROR_VERSION_NUMBER, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3379 |
STR_NEWGRF_ERROR_DOS_OR_WINDOWS, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3380 |
STR_NEWGRF_ERROR_UNSET_SWITCH, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3381 |
STR_NEWGRF_ERROR_INVALID_PARAMETER, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3382 |
STR_NEWGRF_ERROR_LOAD_BEFORE, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3383 |
STR_NEWGRF_ERROR_LOAD_AFTER |
0 | 3384 |
}; |
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
3385 |
|
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3386 |
static const StringID sevstr[] = { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3387 |
STR_NEWGRF_ERROR_MSG_INFO, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3388 |
STR_NEWGRF_ERROR_MSG_WARNING, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3389 |
STR_NEWGRF_ERROR_MSG_ERROR, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3390 |
STR_NEWGRF_ERROR_MSG_FATAL |
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
3391 |
}; |
0 | 3392 |
|
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3393 |
/* AddGRFString expects the string to be referred to by an id in the newgrf |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3394 |
* file. Errors messages are never referred to however, so invent ids that |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3395 |
* are unlikely to be reached in a newgrf file so they don't overwrite |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3396 |
* anything else. */ |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3397 |
enum { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3398 |
MESSAGE_STRING_ID = MAX_UVALUE(StringID) - 1, |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3399 |
MESSAGE_DATA_ID = MAX_UVALUE(StringID) |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3400 |
}; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3401 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3402 |
if (!check_length(len, 6, "GRFLoadError")) return; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3403 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3404 |
/* For now we can only show one message per newgrf file. */ |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3405 |
if (_cur_grfconfig->error != NULL) return; |
6416
be4399248c60
(svn r8825) -Fix: Make sure strings read from newgrf files are 0 terminated and 0
maedhros
parents:
6388
diff
changeset
|
3406 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3407 |
buf++; // Skip the action byte. |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3408 |
byte severity = grf_load_byte(&buf); |
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3409 |
byte lang = grf_load_byte(&buf); |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3410 |
byte message_id = grf_load_byte(&buf); |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3411 |
len -= 4; |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3412 |
|
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3413 |
/* Skip the error until the activation stage unless bit 7 of the severity |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3414 |
* is set. */ |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3415 |
if (!HASBIT(severity, 7) && _cur_stage < GLS_ACTIVATION) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3416 |
grfmsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage 1"); |
441
892cb9999501
(svn r650) Pasky fix #4. (Misc fixes to get USSet going)
miham
parents:
440
diff
changeset
|
3417 |
return; |
3588
a1adf8a40756
(svn r4474) - NewGRF: Skip non-fatal errors when not in stage 2.
peter1138
parents:
3577
diff
changeset
|
3418 |
} |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3419 |
CLRBIT(severity, 7); |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3420 |
|
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3421 |
if (severity >= lengthof(sevstr)) { |
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3422 |
grfmsg(7, "GRFLoadError: Invalid severity id %d. Setting to 2 (non-fatal error).", severity); |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3423 |
severity = 2; |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3424 |
} else if (severity == 3) { |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3425 |
/* This is a fatal error, so make sure the GRF is deactivated and no |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3426 |
* more of it gets loaded. */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3427 |
_cur_grfconfig->status = GCS_DISABLED; |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3428 |
|
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3429 |
_skip_sprites = -1; |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3430 |
} |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3431 |
|
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3432 |
if (message_id >= lengthof(msgstr) && message_id != 0xFF) { |
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3433 |
grfmsg(7, "GRFLoadError: Invalid message id."); |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3434 |
return; |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3435 |
} |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3436 |
|
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3437 |
if (len <= 1) { |
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3438 |
grfmsg(7, "GRFLoadError: No message data supplied."); |
6421
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3439 |
return; |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3440 |
} |
48a6f5c43920
(svn r8830) -Feature: Stop loading and disable the current newgrf if a fatal error message
maedhros
parents:
6417
diff
changeset
|
3441 |
|
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3442 |
bool new_scheme = _cur_grffile->grf_version >= 7; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3443 |
GRFError *error = CallocT<GRFError>(1); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3444 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3445 |
error->severity = sevstr[severity]; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3446 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3447 |
if (message_id == 0xFF) { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3448 |
/* This is a custom error message. */ |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3449 |
const char *message = grf_load_string(&buf, len); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3450 |
len -= (strlen(message) + 1); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3451 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3452 |
error->message = AddGRFString(_cur_grffile->grfid, MESSAGE_STRING_ID, lang, new_scheme, message, STR_UNDEFINED); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3453 |
} else { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3454 |
error->message = msgstr[message_id]; |
6429
02c062eb2c74
(svn r8838) -Feature: Show newgrf error messages loaded in Action B in the newgrf gui
maedhros
parents:
6422
diff
changeset
|
3455 |
} |
02c062eb2c74
(svn r8838) -Feature: Show newgrf error messages loaded in Action B in the newgrf gui
maedhros
parents:
6422
diff
changeset
|
3456 |
|
6465
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3457 |
if (len > 0) { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3458 |
const char *data = grf_load_string(&buf, len); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3459 |
len -= (strlen(data) + 1); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3460 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3461 |
error->data = AddGRFString(_cur_grffile->grfid, MESSAGE_DATA_ID, lang, new_scheme, data, STR_UNDEFINED); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3462 |
} |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3463 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3464 |
/* Only two parameter numbers can be used in the string. */ |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3465 |
uint i = 0; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3466 |
for (; i < 2 && len > 0; i++) { |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3467 |
error->param_number[i] = grf_load_byte(&buf); |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3468 |
len--; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3469 |
} |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3470 |
error->num_params = i; |
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3471 |
|
dddb39b41ee0
(svn r8881) -Feature: Allow built-in newgrf error messages to be translated, and load custom error messages properly.
maedhros
parents:
6454
diff
changeset
|
3472 |
_cur_grfconfig->error = error; |
0 | 3473 |
} |
3474 |
||
3715
dd9807bf5927
(svn r4658) - NewGRF: add Action 0xNN comments before each action handler. This mainly aids code navigation...
peter1138
parents:
3714
diff
changeset
|
3475 |
/* Action 0x0C */ |
0 | 3476 |
static void GRFComment(byte *buf, int len) |
3477 |
{ |
|
3478 |
/* <0C> [<ignored...>] |
|
3479 |
* |
|
3480 |
* V ignored Anything following the 0C is ignored */ |
|
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3481 |
|
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3482 |
if (len == 1) return; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3483 |
|
6433 | 3484 |
int text_len = len - 1; |
3485 |
const char *text = (const char*)(buf + 1); |
|
3486 |
grfmsg(2, "GRFComment: %.*s", text_len, text); |
|
0 | 3487 |
} |
3488 |
||
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3489 |
/* Action 0x0D (GLS_SAFETYSCAN) */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3490 |
static void SafeParamSet(byte *buf, int len) |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3491 |
{ |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
3492 |
if (!check_length(len, 5, "SafeParamSet")) return; |
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3493 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3494 |
uint8 target = grf_load_byte(&buf); |
5776
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3495 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3496 |
/* Only writing GRF parameters is considered safe */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3497 |
if (target < 0x80) return; |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3498 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3499 |
/* GRM could be unsafe, but as here it can only happen after other GRFs |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3500 |
* are loaded, it should be okay. If the GRF tried to use the slots it |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3501 |
* reserved, it would be marked unsafe anyway. GRM for (e.g. bridge) |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3502 |
* sprites is considered safe. */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3503 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3504 |
SETBIT(_cur_grfconfig->flags, GCF_UNSAFE); |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3505 |
|
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3506 |
/* Skip remainder of GRF */ |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3507 |
_skip_sprites = -1; |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3508 |
} |
d80e79a2e71b
(svn r7831) -Codechange: [NewGRF] Do not mark as unsafe those NewGRFs that set their own parameters (via action D) and/or change only bridge sprite table layouts (action 0, property D).
peter1138
parents:
5753
diff
changeset
|
3509 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3510 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3511 |
static uint32 GetPatchVariable(uint8 param) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3512 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3513 |
switch (param) { |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3514 |
/* start year - 1920 */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3515 |
case 0x0B: return max(_patches.starting_year, ORIGINAL_BASE_YEAR) - ORIGINAL_BASE_YEAR; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3516 |
/* freight trains weight factor */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3517 |
case 0x0E: return _patches.freight_trains; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3518 |
/* empty wagon speed increase */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3519 |
case 0x0F: return 0; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3520 |
/* plane speed factor */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3521 |
case 0x10: return 4; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3522 |
/* 2CC colormap base sprite */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3523 |
case 0x11: return SPR_2CCMAP_BASE; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3524 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3525 |
default: |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3526 |
grfmsg(2, "ParamSet: Unknown Patch variable 0x%02X.", param); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3527 |
return 0; |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3528 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3529 |
} |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3530 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3531 |
|
356
e3721e481b38
(svn r544) -newgrf: codechange for better handling (pasky and octo__)
celestar
parents:
193
diff
changeset
|
3532 |
/* Action 0x0D */ |
0 | 3533 |
static void ParamSet(byte *buf, int len) |
3534 |
{ |
|
3535 |
/* <0D> <target> <operation> <source1> <source2> [<data>] |
|
3536 |
* |
|
3537 |
* B target parameter number where result is stored |
|
3538 |
* B operation operation to perform, see below |
|
3539 |
* B source1 first source operand |
|
3540 |
* B source2 second source operand |
|
3541 |
* D data data to use in the calculation, not necessary |
|
3542 |
* if both source1 and source2 refer to actual parameters |
|
3543 |
* |
|
3544 |
* Operations |
|
3545 |
* 00 Set parameter equal to source1 |
|
3546 |
* 01 Addition, source1 + source2 |
|
3547 |
* 02 Subtraction, source1 - source2 |
|
3548 |
* 03 Unsigned multiplication, source1 * source2 (both unsigned) |
|
3549 |
* 04 Signed multiplication, source1 * source2 (both signed) |
|
3550 |
* 05 Unsigned bit shift, source1 by source2 (source2 taken to be a |
|
3551 |
* signed quantity; left shift if positive and right shift if |
|
3552 |
* negative, source1 is unsigned) |
|
3553 |
* 06 Signed bit shift, source1 by source2 |
|
3554 |
* (source2 like in 05, and source1 as well) |
|
3555 |
*/ |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3556 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
3557 |
if (!check_length(len, 5, "ParamSet")) return; |
418
67457dd7e5bc
(svn r615) Fix the same bug in ParamSet action loading, pointer out by Bjarni too. (pasky)
bjarni
parents:
416
diff
changeset
|
3558 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3559 |
uint8 target = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3560 |
uint8 oper = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3561 |
uint32 src1 = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3562 |
uint32 src2 = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3563 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3564 |
uint32 data = 0; |
2345 | 3565 |
if (len >= 8) data = grf_load_dword(&buf); |
398
20f8a2faf809
(svn r590) -newgrf: Instead of a bunch of statinfo arrays, use station-array of struct StationSpec-s (pasky).
darkvater
parents:
397
diff
changeset
|
3566 |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3567 |
/* You can add 80 to the operation to make it apply only if the target |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3568 |
* is not defined yet. In this respect, a parameter is taken to be |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3569 |
* defined if any of the following applies: |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3570 |
* - it has been set to any value in the newgrf(w).cfg parameter list |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3571 |
* - it OR A PARAMETER WITH HIGHER NUMBER has been set to any value by |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3572 |
* an earlier action D */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3573 |
if (HASBIT(oper, 7)) { |
3807
927ac7827a28
(svn r4817) - NewGRF: allow partial support for parameter retrieval in action D.
peter1138
parents:
3806
diff
changeset
|
3574 |
if (target < 0x80 && target < _cur_grffile->param_end) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3575 |
grfmsg(7, "ParamSet: Param %u already defined, skipping", target); |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3576 |
return; |
3807
927ac7827a28
(svn r4817) - NewGRF: allow partial support for parameter retrieval in action D.
peter1138
parents:
3806
diff
changeset
|
3577 |
} |
927ac7827a28
(svn r4817) - NewGRF: allow partial support for parameter retrieval in action D.
peter1138
parents:
3806
diff
changeset
|
3578 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3579 |
oper = GB(oper, 0, 7); |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3580 |
} |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3581 |
|
3808
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3582 |
if (src2 == 0xFE) { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3583 |
if (GB(data, 0, 8) == 0xFF) { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3584 |
if (data == 0x0000FFFF) { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3585 |
/* Patch variables */ |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3586 |
src1 = GetPatchVariable(src1); |
3808
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3587 |
} else { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3588 |
/* GRF Resource Management */ |
5225
52ddcedcc6f7
(svn r7345) -Codechange: enumification of NewGRF loading stage, and move enum definition to header for future use.
peter1138
parents:
5211
diff
changeset
|
3589 |
if (_cur_stage != GLS_ACTIVATION) { |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3590 |
/* Ignore GRM during initialization */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3591 |
src1 = 0; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3592 |
} else { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3593 |
uint8 op = src1; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3594 |
uint8 feature = GB(data, 8, 8); |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3595 |
uint16 count = GB(data, 16, 16); |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3596 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3597 |
switch (feature) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3598 |
case 0x00: // Trains |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3599 |
case 0x01: // Road Vehicles |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3600 |
case 0x02: // Ships |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3601 |
case 0x03: // Aircraft |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3602 |
{ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3603 |
uint start = 0; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3604 |
uint size = 0; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3605 |
uint shift = _vehshifts[feature]; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3606 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3607 |
if (op == 6) { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3608 |
/* Return GRFID of set that reserved ID */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3609 |
src1 = _grm_engines[shift + _cur_grffile->param[target]]; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3610 |
break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3611 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3612 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3613 |
/* With an operation of 2 or 3, we want to reserve a specific block of IDs */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3614 |
if (op == 2 || op == 3) start = _cur_grffile->param[target]; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3615 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3616 |
for (uint i = start; i < _vehcounts[feature]; i++) { |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3617 |
if (_grm_engines[shift + i] == 0) { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3618 |
size++; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3619 |
} else { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3620 |
if (op == 2 || op == 3) break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3621 |
start = i + 1; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3622 |
size = 0; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3623 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3624 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3625 |
if (size == count) break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3626 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3627 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3628 |
if (size == count) { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3629 |
/* Got the slot... */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3630 |
if (op == 0 || op == 3) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3631 |
grfmsg(2, "ParamSet: GRM: Reserving %d vehicles at %d", count, start); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3632 |
for (uint i = 0; i < count; i++) _grm_engines[shift + start + i] = _cur_grffile->grfid; |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3633 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3634 |
src1 = start; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3635 |
} else { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3636 |
/* Unable to allocate */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3637 |
if (op != 4 && op != 5) { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3638 |
/* Deactivate GRF */ |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3639 |
grfmsg(0, "ParamSet: GRM: Unable to allocate %d vehicles, deactivating", count); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3640 |
_cur_grfconfig->status = GCS_DISABLED; |
5011
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
3641 |
|
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
3642 |
_skip_sprites = -1; |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3643 |
return; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3644 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3645 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3646 |
grfmsg(1, "ParamSet: GRM: Unable to allocate %d vehicles", count); |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
3647 |
src1 = UINT_MAX; |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3648 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3649 |
break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3650 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3651 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3652 |
case 0x08: // General sprites |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3653 |
switch (op) { |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3654 |
case 0: |
6140
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3655 |
/* Check if the allocated sprites will fit below the original sprite limit */ |
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3656 |
if (_cur_spriteid + count >= 16384) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3657 |
grfmsg(0, "ParamSet: GRM: Unable to allocate %d sprites; try changing NewGRF order", count); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3658 |
_cur_grfconfig->status = GCS_DISABLED; |
6140
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3659 |
|
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3660 |
_skip_sprites = -1; |
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3661 |
return; |
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3662 |
} |
22c9279c3bbd
(svn r8505) -Codechange: Ensure GRM allocated sprites will be below the original 16384 sprite limit. If not, fail and disable the NewGRF.
peter1138
parents:
6126
diff
changeset
|
3663 |
|
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3664 |
/* 'Reserve' space at the current sprite ID */ |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3665 |
src1 = _cur_spriteid; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3666 |
_cur_spriteid += count; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3667 |
break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3668 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3669 |
case 1: |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3670 |
src1 = _cur_spriteid; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3671 |
break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3672 |
|
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3673 |
default: |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3674 |
grfmsg(1, "ParamSet: GRM: Unsupported operation %d for general sprites", op); |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3675 |
return; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3676 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3677 |
break; |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3678 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
3679 |
default: grfmsg(1, "ParamSet: GRM: Unsupported feature 0x%X", feature); return; |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3680 |
} |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
3681 |
} |
3808
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3682 |
} |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3683 |
} else { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3684 |
/* Read another GRF File's parameter */ |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3685 |
const GRFFile *file = GetFileByGRFID(data); |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3686 |
if (file == NULL || src1 >= file->param_end) { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3687 |
src1 = 0; |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3688 |
} else { |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3689 |
src1 = file->param[src1]; |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3690 |
} |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3691 |
} |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3692 |
} else { |
3808
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3693 |
/* The source1 and source2 operands refer to the grf parameter number |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3694 |
* like in action 6 and 7. In addition, they can refer to the special |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3695 |
* variables available in action 7, or they can be FF to use the value |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3696 |
* of <data>. If referring to parameters that are undefined, a value |
332b9b202afb
(svn r4818) - NewGRF: add support for reading another GRF file's parameters, and warn if GRF Resource Management is tried.
peter1138
parents:
3807
diff
changeset
|
3697 |
* of 0 is used instead. */ |
3811
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
3698 |
src1 = (src1 == 0xFF) ? data : GetParamVal(src1, NULL); |
7324eb563ae0
(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D
peter1138
parents:
3808
diff
changeset
|
3699 |
src2 = (src2 == 0xFF) ? data : GetParamVal(src2, NULL); |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3700 |
} |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3701 |
|
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3702 |
/* TODO: You can access the parameters of another GRF file by using |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3703 |
* source2=FE, source1=the other GRF's parameter number and data=GRF |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3704 |
* ID. This is only valid with operation 00 (set). If the GRF ID |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3705 |
* cannot be found, a value of 0 is used for the parameter value |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3706 |
* instead. */ |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3707 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3708 |
uint32 res; |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3709 |
switch (oper) { |
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3710 |
case 0x00: |
2345 | 3711 |
res = src1; |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3712 |
break; |
2345 | 3713 |
|
3714 |
case 0x01: |
|
3715 |
res = src1 + src2; |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3716 |
break; |
2345 | 3717 |
|
3718 |
case 0x02: |
|
3719 |
res = src1 - src2; |
|
3720 |
break; |
|
3721 |
||
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3722 |
case 0x03: |
2345 | 3723 |
res = src1 * src2; |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3724 |
break; |
2345 | 3725 |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3726 |
case 0x04: |
2345 | 3727 |
res = (int32)src1 * (int32)src2; |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3728 |
break; |
2345 | 3729 |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3730 |
case 0x05: |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3731 |
if ((int32)src2 < 0) { |
2345 | 3732 |
res = src1 >> -(int32)src2; |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3733 |
} else { |
2345 | 3734 |
res = src1 << src2; |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3735 |
} |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3736 |
break; |
2345 | 3737 |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3738 |
case 0x06: |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3739 |
if ((int32)src2 < 0) { |
2345 | 3740 |
res = (int32)src1 >> -(int32)src2; |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3741 |
} else { |
2345 | 3742 |
res = (int32)src1 << src2; |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3997
diff
changeset
|
3743 |
} |
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3744 |
break; |
2345 | 3745 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3746 |
case 0x07: // Bitwise AND |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3747 |
res = src1 & src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3748 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3749 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3750 |
case 0x08: // Bitwise OR |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3751 |
res = src1 | src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3752 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3753 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3754 |
case 0x09: // Unsigned division |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3755 |
if (src2 == 0) { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3756 |
res = src1; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3757 |
} else { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3758 |
res = src1 / src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3759 |
} |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3760 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3761 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3762 |
case 0x0A: // Signed divison |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3763 |
if (src2 == 0) { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3764 |
res = src1; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3765 |
} else { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3766 |
res = (int32)src1 / (int32)src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3767 |
} |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3768 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3769 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3770 |
case 0x0B: // Unsigned modulo |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3771 |
if (src2 == 0) { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3772 |
res = src1; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3773 |
} else { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3774 |
res = src1 % src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3775 |
} |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3776 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3777 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3778 |
case 0x0C: // Signed modulo |
2442
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3779 |
if (src2 == 0) { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3780 |
res = src1; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3781 |
} else { |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3782 |
res = (int32)src1 % (int32)src2; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3783 |
} |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3784 |
break; |
da9a2075c747
(svn r2968) -Newgrf: Implement current set of action D (ParamSet) operations.
peter1138
parents:
2440
diff
changeset
|
3785 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3786 |
default: grfmsg(0, "ParamSet: Unknown operation %d, skipping", oper); return; |
2345 | 3787 |
} |
3788 |
||
3789 |
switch (target) { |
|
3790 |
case 0x8E: // Y-Offset for train sprites |
|
3791 |
_traininfo_vehicle_pitch = res; |
|
3792 |
break; |
|
3793 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3794 |
/* @todo implement */ |
2345 | 3795 |
case 0x8F: // Rail track type cost factors |
3796 |
case 0x93: // Tile refresh offset to left |
|
3797 |
case 0x94: // Tile refresh offset to right |
|
3798 |
case 0x95: // Tile refresh offset upwards |
|
3799 |
case 0x96: // Tile refresh offset downwards |
|
3800 |
case 0x97: // Snow line height |
|
3801 |
case 0x99: // Global ID offset |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3802 |
grfmsg(7, "ParamSet: Skipping unimplemented target 0x%02X", target); |
2345 | 3803 |
break; |
3804 |
||
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3805 |
case 0x9E: // Miscellaneous GRF features |
3814
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
3806 |
_misc_grf_features = res; |
3845
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
3807 |
/* Set train list engine width */ |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
3808 |
_traininfo_vehicle_width = HasGrfMiscBit(GMB_TRAIN_WIDTH_32_PIXELS) ? 32 : 29; |
3814
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
3809 |
break; |
d0b901dfc313
(svn r4824) - NewGRF: add support for getting/setting miscellaneous grf flags (param 0x9E)
peter1138
parents:
3811
diff
changeset
|
3810 |
|
2345 | 3811 |
default: |
3812 |
if (target < 0x80) { |
|
3813 |
_cur_grffile->param[target] = res; |
|
3814 |
if (target + 1U > _cur_grffile->param_end) _cur_grffile->param_end = target + 1; |
|
3815 |
} else { |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3816 |
grfmsg(7, "ParamSet: Skipping unknown target 0x%02X", target); |
2345 | 3817 |
} |
3818 |
break; |
|
362
bd9bc9c072ba
(svn r550) -newgrf: Support for action 0xd (change a parameter (sorta variable for the GRF scripts)). Based on patch by octo, heavy changes by pasky.
darkvater
parents:
361
diff
changeset
|
3819 |
} |
0 | 3820 |
} |
3821 |
||
5753
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3822 |
/* Action 0x0E (GLS_SAFETYSCAN) */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3823 |
static void SafeGRFInhibit(byte *buf, int len) |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3824 |
{ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3825 |
/* <0E> <num> <grfids...> |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3826 |
* |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3827 |
* B num Number of GRFIDs that follow |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3828 |
* D grfids GRFIDs of the files to deactivate */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3829 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3830 |
if (!check_length(len, 2, "GRFInhibit")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3831 |
buf++; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3832 |
uint8 num = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3833 |
if (!check_length(len, 2 + 4 * num, "GRFInhibit")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3834 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3835 |
for (uint i = 0; i < num; i++) { |
5753
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3836 |
uint32 grfid = grf_load_dword(&buf); |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3837 |
|
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3838 |
/* GRF is unsafe it if tries to deactivate other GRFs */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3839 |
if (grfid != _cur_grfconfig->grfid) { |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3840 |
SETBIT(_cur_grfconfig->flags, GCF_UNSAFE); |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3841 |
|
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3842 |
/* Skip remainder of GRF */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3843 |
_skip_sprites = -1; |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3844 |
|
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3845 |
return; |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3846 |
} |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3847 |
} |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3848 |
} |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
3849 |
|
3715
dd9807bf5927
(svn r4658) - NewGRF: add Action 0xNN comments before each action handler. This mainly aids code navigation...
peter1138
parents:
3714
diff
changeset
|
3850 |
/* Action 0x0E */ |
0 | 3851 |
static void GRFInhibit(byte *buf, int len) |
3852 |
{ |
|
3853 |
/* <0E> <num> <grfids...> |
|
3854 |
* |
|
3855 |
* B num Number of GRFIDs that follow |
|
3856 |
* D grfids GRFIDs of the files to deactivate */ |
|
367
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3857 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3858 |
if (!check_length(len, 2, "GRFInhibit")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3859 |
buf++; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3860 |
uint8 num = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3861 |
if (!check_length(len, 2 + 4 * num, "GRFInhibit")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3862 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3863 |
for (uint i = 0; i < num; i++) { |
367
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3864 |
uint32 grfid = grf_load_dword(&buf); |
5333
8e7d68b06399
(svn r7495) -Fix (r7354): [NewGRF] Deactivate the target GRF, not the current GRF.
peter1138
parents:
5329
diff
changeset
|
3865 |
GRFConfig *file = GetGRFConfig(grfid); |
367
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3866 |
|
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3867 |
/* Unset activation flag */ |
5557
dc2402eb851b
(svn r7554) -Fix (r7496): In Action 0xE, don't deactivate the current GRF (to be ported to 0.5)
peter1138
parents:
5340
diff
changeset
|
3868 |
if (file != NULL && file != _cur_grfconfig) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3869 |
grfmsg(2, "GRFInhibit: Deactivating file '%s'", file->filename); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3870 |
file->status = GCS_DISABLED; |
367
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3871 |
} |
d0d895bd4972
(svn r555) -newgrf: Preliminary support for action 0xE. Inhibit another GRF file by ID. It won't really work until we get stages support (pasky & octo).
darkvater
parents:
366
diff
changeset
|
3872 |
} |
0 | 3873 |
} |
3874 |
||
3715
dd9807bf5927
(svn r4658) - NewGRF: add Action 0xNN comments before each action handler. This mainly aids code navigation...
peter1138
parents:
3714
diff
changeset
|
3875 |
/* Action 0x10 */ |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3876 |
static void DefineGotoLabel(byte *buf, int len) |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3877 |
{ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3878 |
/* <10> <label> [<comment>] |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3879 |
* |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3880 |
* B label The label to define |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3881 |
* V comment Optional comment - ignored */ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3882 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
3883 |
if (!check_length(len, 1, "DefineGotoLabel")) return; |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3884 |
buf++; len--; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3885 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3886 |
GRFLabel *label = MallocT<GRFLabel>(1); |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3887 |
label->label = grf_load_byte(&buf); |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3888 |
label->nfo_line = _nfo_line; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3889 |
label->pos = FioGetPos(); |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3890 |
label->next = NULL; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3891 |
|
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3892 |
/* Set up a linked list of goto targets which we will search in an Action 0x7/0x9 */ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3893 |
if (_cur_grffile->label == NULL) { |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3894 |
_cur_grffile->label = label; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3895 |
} else { |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3896 |
/* Attach the label to the end of the list */ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3897 |
GRFLabel *l; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3898 |
for (l = _cur_grffile->label; l->next != NULL; l = l->next); |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3899 |
l->next = label; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3900 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3901 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3902 |
grfmsg(2, "DefineGotoLabel: GOTO target with label 0x%02X", label->label); |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
3903 |
} |
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
3904 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3905 |
/* Action 0x11 */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3906 |
static void GRFSound(byte *buf, int len) |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3907 |
{ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3908 |
/* <11> <num> |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3909 |
* |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3910 |
* W num Number of sound files that follow */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3911 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
3912 |
if (!check_length(len, 1, "GRFSound")) return; |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3913 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3914 |
uint16 num = grf_load_word(&buf); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3915 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3916 |
_grf_data_blocks = num; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3917 |
_grf_data_type = GDT_SOUND; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3918 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3919 |
if (_cur_grffile->sound_offset == 0) _cur_grffile->sound_offset = GetNumSounds(); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3920 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3921 |
|
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3922 |
static void ImportGRFSound(byte *buf, int len) |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3923 |
{ |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3924 |
const GRFFile *file; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3925 |
FileEntry *se = AllocateFileEntry(); |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3926 |
uint32 grfid = grf_load_dword(&buf); |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3927 |
uint16 sound = grf_load_word(&buf); |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3928 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3929 |
file = GetFileByGRFID(grfid); |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3930 |
if (file == NULL || file->sound_offset == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3931 |
grfmsg(1, "ImportGRFSound: Source file not available"); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3932 |
return; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3933 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3934 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3935 |
if (file->sound_offset + sound >= GetNumSounds()) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3936 |
grfmsg(1, "ImportGRFSound: Sound effect %d is invalid", sound); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3937 |
return; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3938 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3939 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3940 |
grfmsg(2, "ImportGRFSound: Copying sound %d (%d) from file %X", sound, file->sound_offset + sound, grfid); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3941 |
|
5024
f13f2f2d43f9
(svn r7065) Use simple assignment instead of memcpy()
tron
parents:
5011
diff
changeset
|
3942 |
*se = *GetSound(file->sound_offset + sound); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3943 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3944 |
/* Reset volume and priority, which TTDPatch doesn't copy */ |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3945 |
se->volume = 128; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3946 |
se->priority = 0; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3947 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3948 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3949 |
/* 'Action 0xFE' */ |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3950 |
static void GRFImportBlock(byte *buf, int len) |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3951 |
{ |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3952 |
if (_grf_data_blocks == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3953 |
grfmsg(2, "GRFImportBlock: Unexpected import block, skipping"); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3954 |
return; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3955 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3956 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3957 |
buf++; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3958 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3959 |
_grf_data_blocks--; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3960 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3961 |
/* XXX 'Action 0xFE' isn't really specified. It is only mentioned for |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3962 |
* importing sounds, so this is probably all wrong... */ |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3963 |
if (grf_load_byte(&buf) != _grf_data_type) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3964 |
grfmsg(1, "GRFImportBlock: Import type mismatch"); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3965 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3966 |
|
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3967 |
switch (_grf_data_type) { |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3968 |
case GDT_SOUND: ImportGRFSound(buf, len - 1); break; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3969 |
default: NOT_REACHED(); break; |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3970 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3971 |
} |
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
3972 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3973 |
static void LoadGRFSound(byte *buf, int len) |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3974 |
{ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3975 |
byte *buf_start = buf; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3976 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3977 |
/* Allocate a sound entry. This is done even if the data is not loaded |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3978 |
* so that the indices used elsewhere are still correct. */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
3979 |
FileEntry *se = AllocateFileEntry(); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3980 |
|
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
3981 |
if (grf_load_dword(&buf) != BSWAP32('RIFF')) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3982 |
grfmsg(1, "LoadGRFSound: Missing RIFF header"); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3983 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3984 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3985 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3986 |
/* Size of file -- we ignore this */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3987 |
grf_load_dword(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3988 |
|
5567
2af6b4aa2833
(svn r7564) -Codechange: Some newgrf changes. FFIR/EVAW endian-swapping, functionalize
Darkvater
parents:
5557
diff
changeset
|
3989 |
if (grf_load_dword(&buf) != BSWAP32('WAVE')) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
3990 |
grfmsg(1, "LoadGRFSound: Invalid RIFF type"); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3991 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3992 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3993 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3994 |
for (;;) { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3995 |
uint32 tag = grf_load_dword(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3996 |
uint32 size = grf_load_dword(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3997 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
3998 |
switch (tag) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
3999 |
case ' tmf': // 'fmt ' |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4000 |
/* Audio format, must be 1 (PCM) */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4001 |
if (grf_load_word(&buf) != 1) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4002 |
grfmsg(1, "LoadGRFSound: Invalid audio format"); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4003 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4004 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4005 |
se->channels = grf_load_word(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4006 |
se->rate = grf_load_dword(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4007 |
grf_load_dword(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4008 |
grf_load_word(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4009 |
se->bits_per_sample = grf_load_word(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4010 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4011 |
/* Consume any extra bytes */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4012 |
for (; size > 16; size--) grf_load_byte(&buf); |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4013 |
break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4014 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4015 |
case 'atad': // 'data' |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4016 |
se->file_size = size; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4017 |
se->file_offset = FioGetPos() - (len - (buf - buf_start)) + 1; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4018 |
se->file_offset |= _file_index << 24; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4019 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4020 |
/* Set default volume and priority */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4021 |
se->volume = 0x80; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4022 |
se->priority = 0; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4023 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4024 |
grfmsg(2, "LoadGRFSound: channels %u, sample rate %u, bits per sample %u, length %u", se->channels, se->rate, se->bits_per_sample, size); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4025 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4026 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4027 |
default: |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4028 |
se->file_size = 0; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4029 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4030 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4031 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4032 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4033 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4034 |
/* Action 0x12 */ |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4035 |
static void LoadFontGlyph(byte *buf, int len) |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4036 |
{ |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4037 |
/* <12> <num_def> <font_size> <num_char> <base_char> |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4038 |
* |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4039 |
* B num_def Number of definitions |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4040 |
* B font_size Size of font (0 = normal, 1 = small, 2 = large) |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4041 |
* B num_char Number of consecutive glyphs |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4042 |
* W base_char First character index */ |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4043 |
|
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4044 |
buf++; len--; |
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
4045 |
if (!check_length(len, 1, "LoadFontGlyph")) return; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4046 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4047 |
uint8 num_def = grf_load_byte(&buf); |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4048 |
|
5841
b36d6b560aaa
(svn r8041) -Regression (r7564): [NewGRF] check_length should skip further processing if a length is too short, so give the function a return value
peter1138
parents:
5838
diff
changeset
|
4049 |
if (!check_length(len, 1 + num_def * 4, "LoadFontGlyph")) return; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4050 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4051 |
for (uint i = 0; i < num_def; i++) { |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
4052 |
FontSize size = (FontSize)grf_load_byte(&buf); |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4053 |
uint8 num_char = grf_load_byte(&buf); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4054 |
uint16 base_char = grf_load_word(&buf); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4055 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4056 |
grfmsg(7, "LoadFontGlyph: Loading %u glyph(s) at 0x%04X for size %u", num_char, base_char, size); |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4057 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4058 |
for (uint c = 0; c < num_char; c++) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4059 |
SetUnicodeGlyph(size, base_char + c, _cur_spriteid); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4060 |
LoadNextSprite(_cur_spriteid++, _file_index); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4061 |
_nfo_line++; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4062 |
} |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4063 |
} |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4064 |
} |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5061
diff
changeset
|
4065 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4066 |
/* Action 0x13 */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4067 |
static void TranslateGRFStrings(byte *buf, int len) |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4068 |
{ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4069 |
/* <13> <grfid> <num-ent> <offset> <text...> |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4070 |
* |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4071 |
* 4*B grfid The GRFID of the file whose texts are to be translated |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4072 |
* B num-ent Number of strings |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4073 |
* W offset First text ID |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4074 |
* S text... Zero-terminated strings */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4075 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4076 |
buf++; len--; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4077 |
if (!check_length(len, 7, "TranslateGRFString")) return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4078 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4079 |
uint32 grfid = grf_load_dword(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4080 |
const GRFConfig *c = GetGRFConfig(grfid); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4081 |
if (c == NULL || (c->status != GCS_INITIALISED && c->status != GCS_ACTIVATED)) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4082 |
grfmsg(7, "TranslateGRFStrings: GRFID 0x%08x unknown, skipping action 13", BSWAP32(grfid)); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4083 |
return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4084 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4085 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4086 |
if (c->status == GCS_INITIALISED) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4087 |
/* If the file is not active but will be activated later, give an error |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4088 |
* and disable this file. */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4089 |
GRFError *error = CallocT<GRFError>(1); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4090 |
error->message = STR_NEWGRF_ERROR_LOAD_AFTER; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4091 |
error->data = STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4092 |
error->severity = STR_NEWGRF_ERROR_MSG_FATAL; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4093 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4094 |
if (_cur_grfconfig->error != NULL) free(_cur_grfconfig->error); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4095 |
_cur_grfconfig->error = error; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4096 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4097 |
_cur_grfconfig->status = GCS_DISABLED; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4098 |
_skip_sprites = -1; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4099 |
return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4100 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4101 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4102 |
byte num_strings = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4103 |
uint16 first_id = grf_load_word(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4104 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4105 |
if (!((first_id >= 0xD000 && first_id + num_strings <= 0xD3FF) || (first_id >= 0xDC00 && first_id + num_strings <= 0xDCFF))) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4106 |
grfmsg(7, "TranslateGRFStrings: Attempting to set out-of-range string IDs in action 13 (first: 0x%4X, number: 0x%2X)", first_id, num_strings); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4107 |
return; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4108 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4109 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4110 |
len -= 7; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4111 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4112 |
for (uint i = 0; i < num_strings && len > 0; i++) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4113 |
const char *string = grf_load_string(&buf, len); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4114 |
size_t string_length = strlen(string) + 1; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4115 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4116 |
len -= (int)string_length; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4117 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4118 |
if (string_length == 1) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4119 |
grfmsg(7, "TranslateGRFString: Ignoring empty string."); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4120 |
continue; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4121 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4122 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4123 |
/* Since no language id is supplied this string has to be added as a |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4124 |
* generic string, thus the language id of 0x7F. For this to work |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4125 |
* new_scheme has to be true as well. A language id of 0x7F will be |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4126 |
* overridden by a non-generic id, so this will not change anything if |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4127 |
* a string has been provided specifically for this language. */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4128 |
AddGRFString(grfid, first_id + i, 0x7F, true, string, STR_UNDEFINED); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4129 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4130 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4131 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4132 |
/* 'Action 0xFF' */ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4133 |
static void GRFDataBlock(byte *buf, int len) |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4134 |
{ |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4135 |
if (_grf_data_blocks == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4136 |
grfmsg(2, "GRFDataBlock: unexpected data block, skipping"); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4137 |
return; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4138 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4139 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4140 |
buf++; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4141 |
uint8 name_len = grf_load_byte(&buf); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4142 |
const char *name = (const char *)buf; |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4143 |
buf += name_len + 1; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4144 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4145 |
grfmsg(2, "GRFDataBlock: block name '%s'...", name); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4146 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4147 |
_grf_data_blocks--; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4148 |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4149 |
switch (_grf_data_type) { |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4150 |
case GDT_SOUND: LoadGRFSound(buf, len - name_len - 2); break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4151 |
default: NOT_REACHED(); break; |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4152 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4153 |
} |
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4154 |
|
5329
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4155 |
|
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4156 |
/* Used during safety scan on unsafe actions */ |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4157 |
static void GRFUnsafe(byte *buf, int len) |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4158 |
{ |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4159 |
SETBIT(_cur_grfconfig->flags, GCF_UNSAFE); |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4160 |
|
5753
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
4161 |
/* Skip remainder of GRF */ |
788f8d55eb54
(svn r7795) -Codechange: [NewGRF] When safety checking, allow an Action E that force activates the GRF. Unfortunately this requires knowing the GRF ID in advance (before the Action 8) so the static GRFs are now scanned twice on start up, once for the GRF ID, and then for the safety check. (This fix allows unifont.grf to be used.)
peter1138
parents:
5727
diff
changeset
|
4162 |
_skip_sprites = -1; |
5329
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4163 |
} |
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4164 |
|
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4165 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4166 |
static void InitializeGRFSpecial() |
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
4167 |
{ |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4168 |
_ttdpatch_flags[0] = ((_patches.always_small_airport ? 1 : 0) << 0x0C) // keepsmallairport |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4169 |
| (1 << 0x0D) // newairports |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4170 |
| (1 << 0x0E) // largestations |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4171 |
| ((_patches.longbridges ? 1 : 0) << 0x0F) // longbridges |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4172 |
| (0 << 0x10) // loadtime |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4173 |
| (1 << 0x12) // presignals |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4174 |
| (1 << 0x13) // extpresignals |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4175 |
| ((_patches.never_expire_vehicles ? 1 : 0) << 0x16) // enginespersist |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4176 |
| (1 << 0x1B) // multihead |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4177 |
| (1 << 0x1D) // lowmemory |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4178 |
| (1 << 0x1E); // generalfixes |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4179 |
|
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4180 |
_ttdpatch_flags[1] = (0 << 0x07) // moreairports - based on units of noise |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4181 |
| ((_patches.mammoth_trains ? 1 : 0) << 0x08) // mammothtrains |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4182 |
| (1 << 0x09) // trainrefit |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4183 |
| (0 << 0x0B) // subsidiaries |
5801
7d14e62bc9f3
(svn r7930) -Fix: [FS#520] Wrong GRF flag set for gradual loading (mart3p)
Darkvater
parents:
5776
diff
changeset
|
4184 |
| ((_patches.gradual_loading ? 1 : 0) << 0x0C) // gradualloading |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4185 |
| (1 << 0x12) // unifiedmaglevmode - set bit 0 mode. Not revelant to OTTD |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4186 |
| (1 << 0x13) // unifiedmaglevmode - set bit 1 mode |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4187 |
| (1 << 0x14) // bridgespeedlimits |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4188 |
| (1 << 0x16) // eternalgame |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4189 |
| (1 << 0x17) // newtrains |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4190 |
| (1 << 0x18) // newrvs |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4191 |
| (1 << 0x19) // newships |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4192 |
| (1 << 0x1A) // newplanes |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4193 |
| ((_patches.signal_side ? 1 : 0) << 0x1B) // signalsontrafficside |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4194 |
| (1 << 0x1C); // electrifiedrailway |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4195 |
|
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4196 |
_ttdpatch_flags[2] = (1 << 0x01) // loadallgraphics - obsolote |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4197 |
| (1 << 0x03) // semaphores |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4198 |
| (0 << 0x0B) // enhancedgui |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4199 |
| (0 << 0x0C) // newagerating |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4200 |
| ((_patches.build_on_slopes ? 1 : 0) << 0x0D) // buildonslopes |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
4201 |
| ((_patches.full_load_any ? 1 : 0) << 0x0E) // fullloadany |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4202 |
| (0 << 0x0F) // planespeed |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4203 |
| (0 << 0x10) // moreindustriesperclimate - obsolete |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4204 |
| (0 << 0x11) // moretoylandfeatures |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4205 |
| (1 << 0x12) // newstations |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4206 |
| (0 << 0x13) // tracktypecostdiff |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
4207 |
| (1 << 0x14) // manualconvert |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4208 |
| ((_patches.build_on_slopes ? 1 : 0) << 0x15) // buildoncoasts |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4209 |
| (1 << 0x16) // canals |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4210 |
| (1 << 0x17) // newstartyear |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
4211 |
| ((_patches.freight_trains > 1 ? 1 : 0) << 0x18) // freighttrains |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4212 |
| (1 << 0x19) // newhouses |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4213 |
| (1 << 0x1A) // newbridges |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4214 |
| (0 << 0x1B) // newtownnames |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4215 |
| (0 << 0x1C) // moreanimations |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4216 |
| ((_patches.wagon_speed_limits ? 1 : 0) << 0x1D) // wagonspeedlimits |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4217 |
| (1 << 0x1E) // newshistory |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4218 |
| (0 << 0x1F); // custombridgeheads |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4219 |
|
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4220 |
_ttdpatch_flags[3] = (0 << 0x00) // newcargodistribution |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4221 |
| (1 << 0x01) // windowsnap |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4222 |
| (0 << 0x02) // townbuildnoroad |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4223 |
| (0 << 0x03) // pathbasedsignalling. To enable if ever pbs is back |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4224 |
| (0 << 0x04) // aichoosechance |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4225 |
| (1 << 0x05) // resolutionwidth |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4226 |
| (1 << 0x06) // resolutionheight |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4227 |
| (0 << 0x07) // newindustries |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4228 |
| ((_patches.improved_load ? 1 : 0) << 0x08) // fifoloading |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4229 |
| (0 << 0x09) // townroadbranchprob |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4230 |
| (0 << 0x0A) // tempsnowline |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4231 |
| (1 << 0x0B) // newcargo |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4232 |
| (1 << 0x0C) // enhancemultiplayer |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4233 |
| (1 << 0x0D) // onewayroads |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4234 |
| ((_patches.nonuniform_stations ? 1 : 0) << 0x0E) // irregularstations |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4235 |
| (1 << 0x0F) // statistics |
4657
188335e8d316
(svn r6533) - Fix (r6532): Somebody forgot to add newsounds to the ttdpatch flags...
peter1138
parents:
4656
diff
changeset
|
4236 |
| (1 << 0x10) // newsounds |
4381
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4237 |
| (1 << 0x11) // autoreplace |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4238 |
| (1 << 0x12) // autoslope |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4239 |
| (0 << 0x13) // followvehicle |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4240 |
| (0 << 0x14) // trams |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4241 |
| (0 << 0x15) // enhancetunnels |
c1af6c934040
(svn r6131) -Codechange : Complete all missing _ttdpatch_flags entries
belugas
parents:
4377
diff
changeset
|
4242 |
| (0 << 0x16) // shortrvs |
9910
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
4243 |
| (0 << 0x17) // articulatedrvs |
0b2aebc8283e
(svn r10134) [gamebalance] -Sync: r9670:9700 from trunk
celestar
parents:
9909
diff
changeset
|
4244 |
| (1 << 0x1E); // variablerunningcosts |
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
4245 |
} |
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
4246 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4247 |
static void ResetCustomStations() |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4248 |
{ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4249 |
for (GRFFile *file = _first_grffile; file != NULL; file = file->next) { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
4250 |
if (file->stations == NULL) continue; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4251 |
for (uint i = 0; i < MAX_STATIONS; i++) { |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
4252 |
if (file->stations[i] == NULL) continue; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4253 |
StationSpec *statspec = file->stations[i]; |
3740
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4254 |
|
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4255 |
/* Release renderdata, if it wasn't copied from another custom station spec */ |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4256 |
if (!statspec->copied_renderdata) { |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4257 |
for (uint t = 0; t < statspec->tiles; t++) { |
3740
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4258 |
free((void*)statspec->renderdata[t].seq); |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4259 |
} |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4260 |
free(statspec->renderdata); |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4261 |
} |
00a9594628b1
(svn r4722) - Newstations: release station sprite layout data when uninitializing NewGRF data.
peter1138
parents:
3738
diff
changeset
|
4262 |
|
5061
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4263 |
/* Release platforms and layouts */ |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4264 |
if (!statspec->copied_layouts) { |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4265 |
for (uint l = 0; l < statspec->lengths; l++) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4266 |
for (uint p = 0; p < statspec->platforms[l]; p++) { |
5061
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4267 |
free(statspec->layouts[l][p]); |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4268 |
} |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4269 |
free(statspec->layouts[l]); |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4270 |
} |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4271 |
free(statspec->layouts); |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4272 |
free(statspec->platforms); |
cb097749d18f
(svn r7114) -Codechange: [NewStations] Free up custom station layouts
peter1138
parents:
5060
diff
changeset
|
4273 |
} |
3768
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
4274 |
|
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
4275 |
/* Release this station */ |
46d328178509
(svn r4760) - Newstations: change the way custom stations are allocated when loading from GRF, as the current way was flawed (reallocing memory which is referenced elsewhere)
peter1138
parents:
3761
diff
changeset
|
4276 |
free(statspec); |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4277 |
} |
3501
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
4278 |
|
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
4279 |
/* Free and reset the station data */ |
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
4280 |
free(file->stations); |
cf7d2c33e7fc
(svn r4352) - NewGRF Codechange: dynamically allocate the memory used to store custom station data. This saves us approximately 40KB per GRF file, if there are no stations defined.
peter1138
parents:
3488
diff
changeset
|
4281 |
file->stations = NULL; |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4282 |
} |
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4283 |
} |
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4284 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4285 |
static void ResetCustomHouses() |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4286 |
{ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4287 |
GRFFile *file; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4288 |
uint i; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4289 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4290 |
for (file = _first_grffile; file != NULL; file = file->next) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4291 |
if (file->housespec == NULL) continue; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4292 |
for (i = 0; i < HOUSE_MAX; i++) free(file->housespec[i]); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4293 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4294 |
free(file->housespec); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4295 |
file->housespec = NULL; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4296 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4297 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4298 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4299 |
static void ResetNewGRF() |
4953
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4300 |
{ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4301 |
GRFFile *next; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4302 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4303 |
for (GRFFile *f = _first_grffile; f != NULL; f = next) { |
4953
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4304 |
next = f->next; |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4305 |
|
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4306 |
free(f->filename); |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4307 |
free(f); |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4308 |
} |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4309 |
|
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4310 |
_first_grffile = NULL; |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4311 |
_cur_grffile = NULL; |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4312 |
} |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4313 |
|
2491
dfe9542f783e
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
4314 |
/** |
2463
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4315 |
* Reset all NewGRF loaded data |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4316 |
* TODO |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4317 |
*/ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4318 |
static void ResetNewGRFData() |
2463
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4319 |
{ |
3601
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
4320 |
CleanUpStrings(); |
ac6df06db648
(svn r4493) Newgrf : Action 04. Beginning of implementation.
belugas
parents:
3595
diff
changeset
|
4321 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4322 |
/* Copy/reset original engine info data */ |
2463
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4323 |
memcpy(&_engine_info, &orig_engine_info, sizeof(orig_engine_info)); |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4324 |
memcpy(&_rail_vehicle_info, &orig_rail_vehicle_info, sizeof(orig_rail_vehicle_info)); |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4325 |
memcpy(&_ship_vehicle_info, &orig_ship_vehicle_info, sizeof(orig_ship_vehicle_info)); |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4326 |
memcpy(&_aircraft_vehicle_info, &orig_aircraft_vehicle_info, sizeof(orig_aircraft_vehicle_info)); |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4327 |
memcpy(&_road_vehicle_info, &orig_road_vehicle_info, sizeof(orig_road_vehicle_info)); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4328 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4329 |
/* Copy/reset original bridge info data |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4330 |
* First, free sprite table data */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4331 |
for (uint i = 0; i < MAX_BRIDGES; i++) { |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4332 |
if (_bridge[i].sprite_table != NULL) { |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4333 |
for (uint j = 0; j < 7; j++) free(_bridge[i].sprite_table[j]); |
2478
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4334 |
free(_bridge[i].sprite_table); |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4335 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4336 |
} |
16b05f1de6bb
(svn r3004) -Feature, NewGRF: Support loading of bridge attributes and tables from GRF. Currently drawing tall pillars uses old data.
peter1138
parents:
2476
diff
changeset
|
4337 |
memcpy(&_bridge, &orig_bridge, sizeof(_bridge)); |
2491
dfe9542f783e
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
4338 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4339 |
/* Reset refit/cargo class data */ |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4340 |
memset(&cargo_allowed, 0, sizeof(cargo_allowed)); |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4341 |
memset(&cargo_disallowed, 0, sizeof(cargo_disallowed)); |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4342 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4343 |
/* Reset GRM reservations */ |
4961
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
4344 |
memset(&_grm_engines, 0, sizeof(_grm_engines)); |
0ba3cfeaff61
(svn r6960) - Feature: NewGRF: Implement some support for GRF Resource Management (GRM)
peter1138
parents:
4953
diff
changeset
|
4345 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4346 |
/* Unload sprite group data */ |
2491
dfe9542f783e
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
4347 |
UnloadWagonOverrides(); |
3695
aae28fa7190e
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3694
diff
changeset
|
4348 |
UnloadRotorOverrideSprites(); |
2491
dfe9542f783e
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
4349 |
UnloadCustomEngineSprites(); |
2769
acea0abd2195
(svn r3316) - NewGRF: Unload engine names before loading grf files. This fixes names in climates where the engines don't get loaded. Renamed function to reflect its purpose.
peter1138
parents:
2766
diff
changeset
|
4350 |
UnloadCustomEngineNames(); |
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
4351 |
ResetEngineListOrder(); |
2506
777ac2d9a98a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2491
diff
changeset
|
4352 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4353 |
/* Reset price base data */ |
9903
dc85aaa556ae
(svn r9534) [gamebalance] -Codechange: Made the prices a member of the Economy and removed all global variables concerning prices (INCOMPLETE).
celestar
parents:
9896
diff
changeset
|
4354 |
// ResetPriceBaseMultipliers(); |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4355 |
|
4377
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
4356 |
/* Reset the curencies array */ |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
4357 |
ResetCurrencies(); |
0fb9077b8173
(svn r6108) -NewGRF Feature: Implement currencies replacment via grf file.
belugas
parents:
4322
diff
changeset
|
4358 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4359 |
/* Reset the house array */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4360 |
ResetCustomHouses(); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4361 |
ResetHouses(); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4362 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4363 |
/* Reset station classes */ |
2625
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4364 |
ResetStationClasses(); |
66b3d632dcd2
(svn r3167) - NewGRF: Start moving custom station code to separate files.
peter1138
parents:
2624
diff
changeset
|
4365 |
ResetCustomStations(); |
2812
f250489941f9
(svn r3360) Fix initialization of engines for precalculation of default refit mask.
peter1138
parents:
2769
diff
changeset
|
4366 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4367 |
/* Reset canal sprite groups */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4368 |
memset(_canal_sg, 0, sizeof(_canal_sg)); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4369 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4370 |
/* Reset the snowline table. */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4371 |
ClearSnowLine(); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4372 |
|
4953
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4373 |
/* Reset NewGRF files */ |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4374 |
ResetNewGRF(); |
6c40b2b16164
(svn r6948) - Codechange: Clear out all NewGRF file data before loading files again
peter1138
parents:
4952
diff
changeset
|
4375 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4376 |
/* Add engine type to engine data. This is needed for the refit precalculation. */ |
2812
f250489941f9
(svn r3360) Fix initialization of engines for precalculation of default refit mask.
peter1138
parents:
2769
diff
changeset
|
4377 |
AddTypeToEngines(); |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4378 |
|
6417
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6416
diff
changeset
|
4379 |
/* Set up the default cargo types */ |
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6416
diff
changeset
|
4380 |
SetupCargoForClimate(_opt.landscape); |
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6416
diff
changeset
|
4381 |
|
3845
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
4382 |
/* Reset misc GRF features and train list display variables */ |
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
4383 |
_misc_grf_features = 0; |
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
4384 |
_traininfo_vehicle_pitch = 0; |
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
4385 |
_traininfo_vehicle_width = 29; |
4742
d5a2d3da5002
(svn r6654) - Codechange: If no 2cc vehicles are available, hide the secondary colour choice.
peter1138
parents:
4711
diff
changeset
|
4386 |
_have_2cc = false; |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4387 |
_have_newhouses = false; |
5209
fa3ad39e2fa7
(svn r7324) -Codechange: reset newgrf signal location data
peter1138
parents:
5161
diff
changeset
|
4388 |
_signal_base = 0; |
5210
dc52acfad05c
(svn r7325) -Feature: Add support for action 5 type 0x0D, coast sprites.
peter1138
parents:
5209
diff
changeset
|
4389 |
_coast_base = 0; |
3845
c3cd4b825c2f
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3825
diff
changeset
|
4390 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4391 |
InitializeSoundPool(); |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4392 |
InitializeSpriteGroupPool(); |
2463
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4393 |
} |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4394 |
|
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4395 |
/** Reset all NewGRFData that was used only while processing data */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4396 |
static void ClearTemporaryNewGRFData() |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4397 |
{ |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4398 |
/* Clear the GOTO labels used for GRF processing */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4399 |
for (GRFLabel *l = _cur_grffile->label; l != NULL;) { |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4400 |
GRFLabel *l2 = l->next; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4401 |
free(l); |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4402 |
l = l2; |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4403 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4404 |
_cur_grffile->label = NULL; |
3595
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4405 |
|
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4406 |
/* Clear the list of spritegroups */ |
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4407 |
free(_cur_grffile->spritegroups); |
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4408 |
_cur_grffile->spritegroups = NULL; |
20621831cd46
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3593
diff
changeset
|
4409 |
_cur_grffile->spritegroups_count = 0; |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4410 |
} |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4411 |
|
6473
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4412 |
static void BuildCargoTranslationMap() |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4413 |
{ |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4414 |
memset(_cur_grffile->cargo_map, 0xFF, sizeof(_cur_grffile->cargo_map)); |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4415 |
|
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4416 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4417 |
const CargoSpec *cs = GetCargo(c); |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4418 |
if (!cs->IsValid()) continue; |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4419 |
|
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4420 |
if (_cur_grffile->cargo_max == 0) { |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4421 |
/* Default translation table, so just a straight mapping to bitnum */ |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4422 |
_cur_grffile->cargo_map[c] = cs->bitnum; |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4423 |
} else { |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4424 |
/* Check the translation table for this cargo's label */ |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4425 |
for (uint i = 0; i < _cur_grffile->cargo_max; i++) { |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4426 |
if (cs->label == _cur_grffile->cargo_list[i]) { |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4427 |
_cur_grffile->cargo_map[c] = i; |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4428 |
break; |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4429 |
} |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4430 |
} |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4431 |
} |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4432 |
} |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4433 |
} |
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4434 |
|
3628
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4435 |
static void InitNewGRFFile(const GRFConfig *config, int sprite_offset) |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4436 |
{ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4437 |
GRFFile *newfile = GetFileByFilename(config->filename); |
490
83455cd1cc55
(svn r772) Whoops, I know. Do not consider pointer to be a boolean value. Sorry 'bout that, sirs.
pasky
parents:
489
diff
changeset
|
4438 |
if (newfile != NULL) { |
489
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4439 |
/* We already loaded it once. */ |
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4440 |
newfile->sprite_offset = sprite_offset; |
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4441 |
_cur_grffile = newfile; |
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4442 |
return; |
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4443 |
} |
9c8e1806935e
(svn r771) Do not give a file new {struct GRFFile} if it was already loaded once. Eliminates those double entries in the newgrf manager and also some possible memory leaks.
pasky
parents:
478
diff
changeset
|
4444 |
|
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
4445 |
newfile = CallocT<GRFFile>(1); |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4446 |
|
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4447 |
if (newfile == NULL) error ("Out of memory"); |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4448 |
|
9908
0fa543611bbe
(svn r10112) [gamebalance] -Sync: r9520:9620 from trunk
celestar
parents:
9907
diff
changeset
|
4449 |
newfile->filename = strdup(config->full_path); |
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4450 |
newfile->sprite_offset = sprite_offset; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4451 |
|
3628
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4452 |
/* Copy the initial parameter list */ |
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4453 |
assert(lengthof(newfile->param) == lengthof(config->param) && lengthof(config->param) == 0x80); |
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4454 |
newfile->param_end = config->num_params; |
5681
7b237b4958d6
(svn r7636) -Cleanup: Remove unused window classes (sorry WC-mess) and use sizeof(array) instead
Darkvater
parents:
5664
diff
changeset
|
4455 |
memcpy(newfile->param, config->param, sizeof(newfile->param)); |
3628
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4456 |
|
366
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4457 |
if (_first_grffile == NULL) { |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4458 |
_cur_grffile = newfile; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4459 |
_first_grffile = newfile; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4460 |
} else { |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4461 |
_cur_grffile->next = newfile; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4462 |
_cur_grffile = newfile; |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4463 |
} |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4464 |
} |
9d2630b8b4de
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
363
diff
changeset
|
4465 |
|
5037
7d956200ee71
(svn r7079) -Codechange: Move an array to the only place it is used.
peter1138
parents:
5024
diff
changeset
|
4466 |
|
6471
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4467 |
/** List of what cargo labels are refittable for the given the vehicle-type. |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4468 |
* Only currently active labels are applied. */ |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4469 |
static const CargoLabel _default_refitmasks_rail[] = { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4470 |
'PASS', 'COAL', 'MAIL', 'LVST', 'GOOD', 'GRAI', 'WHEA', 'MAIZ', 'WOOD', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4471 |
'IORE', 'STEL', 'VALU', 'GOLD', 'DIAM', 'PAPR', 'FOOD', 'FRUT', 'CORE', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4472 |
'WATR', 'SUGR', 'TOYS', 'BATT', 'SWET', 'TOFF', 'COLA', 'CTCD', 'BUBL', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4473 |
'PLST', 'FZDR', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4474 |
0 }; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4475 |
|
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4476 |
static const CargoLabel _default_refitmasks_road[] = { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4477 |
0 }; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4478 |
|
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4479 |
static const CargoLabel _default_refitmasks_ships[] = { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4480 |
'COAL', 'MAIL', 'LVST', 'GOOD', 'GRAI', 'WHEA', 'MAIZ', 'WOOD', 'IORE', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4481 |
'STEL', 'VALU', 'GOLD', 'DIAM', 'PAPR', 'FOOD', 'FRUT', 'CORE', 'WATR', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4482 |
'RUBR', 'SUGR', 'TOYS', 'BATT', 'SWET', 'TOFF', 'COLA', 'CTCD', 'BUBL', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4483 |
'PLST', 'FZDR', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4484 |
0 }; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4485 |
|
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4486 |
static const CargoLabel _default_refitmasks_aircraft[] = { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4487 |
'PASS', 'MAIL', 'GOOD', 'VALU', 'GOLD', 'DIAM', 'FOOD', 'FRUT', 'SUGR', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4488 |
'TOYS', 'BATT', 'SWET', 'TOFF', 'COLA', 'CTCD', 'BUBL', 'PLST', 'FZDR', |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4489 |
0 }; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4490 |
|
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4491 |
static const CargoLabel *_default_refitmasks[] = { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4492 |
_default_refitmasks_rail, |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4493 |
_default_refitmasks_road, |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4494 |
_default_refitmasks_ships, |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4495 |
_default_refitmasks_aircraft, |
5037
7d956200ee71
(svn r7079) -Codechange: Move an array to the only place it is used.
peter1138
parents:
5024
diff
changeset
|
4496 |
}; |
7d956200ee71
(svn r7079) -Codechange: Move an array to the only place it is used.
peter1138
parents:
5024
diff
changeset
|
4497 |
|
7d956200ee71
(svn r7079) -Codechange: Move an array to the only place it is used.
peter1138
parents:
5024
diff
changeset
|
4498 |
|
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4499 |
/** |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4500 |
* Precalculate refit masks from cargo classes for all vehicles. |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4501 |
*/ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4502 |
static void CalculateRefitMasks() |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4503 |
{ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4504 |
for (EngineID engine = 0; engine < TOTAL_NUM_ENGINES; engine++) { |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4505 |
uint32 mask = 0; |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4506 |
uint32 not_mask = 0; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4507 |
uint32 xor_mask = 0; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4508 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4509 |
if (_engine_info[engine].refit_mask != 0) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4510 |
const GRFFile *file = GetEngineGRF(engine); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4511 |
if (file != NULL && file->cargo_max != 0) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4512 |
/* Apply cargo translation table to the refit mask */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4513 |
uint num_cargo = min(32, file->cargo_max); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4514 |
for (uint i = 0; i < num_cargo; i++) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4515 |
if (!HASBIT(_engine_info[engine].refit_mask, i)) continue; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4516 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4517 |
CargoID c = GetCargoIDByLabel(file->cargo_list[i]); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4518 |
if (c == CT_INVALID) continue; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4519 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4520 |
SETBIT(xor_mask, c); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4521 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4522 |
} else { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4523 |
/* No cargo table, so use the cargo bitnum values */ |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4524 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4525 |
const CargoSpec *cs = GetCargo(c); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4526 |
if (!cs->IsValid()) continue; |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4527 |
|
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4528 |
if (HASBIT(_engine_info[engine].refit_mask, cs->bitnum)) SETBIT(xor_mask, c); |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4529 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4530 |
} |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4531 |
} |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4532 |
|
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4533 |
if (cargo_allowed[engine] != 0) { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4534 |
/* Build up the list of cargo types from the set cargo classes. */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4535 |
for (CargoID i = 0; i < NUM_CARGO; i++) { |
6439
99a5807852b1
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6433
diff
changeset
|
4536 |
const CargoSpec *cs = GetCargo(i); |
6474
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
4537 |
if (cargo_allowed[engine] & cs->classes) SETBIT(mask, i); |
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
4538 |
if (cargo_disallowed[engine] & cs->classes) SETBIT(not_mask, i); |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4539 |
} |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4540 |
} else { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4541 |
/* Don't apply default refit mask to wagons or engines with no capacity */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4542 |
if (xor_mask == 0 && ( |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4543 |
GetEngine(engine)->type != VEH_TRAIN || ( |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4544 |
RailVehInfo(engine)->capacity != 0 && |
6119
b47985557d1e
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
6106
diff
changeset
|
4545 |
RailVehInfo(engine)->railveh_type != RAILVEH_WAGON |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4546 |
) |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4547 |
)) { |
6471
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4548 |
const CargoLabel *cl = _default_refitmasks[GetEngine(engine)->type]; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4549 |
for (uint i = 0;; i++) { |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4550 |
if (cl[i] == 0) break; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4551 |
|
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4552 |
CargoID cargo = GetCargoIDByLabel(cl[i]); |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4553 |
if (cargo == CT_INVALID) continue; |
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4554 |
|
6474
24e7ceeb25f5
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6473
diff
changeset
|
4555 |
SETBIT(xor_mask, cargo); |
6471
d0e79064c324
(svn r8888) -Codechange: Replace hardcoded default cargo bitmasks with a list of cargo labels.
peter1138
parents:
6469
diff
changeset
|
4556 |
} |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3026
diff
changeset
|
4557 |
} |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4558 |
} |
6439
99a5807852b1
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6433
diff
changeset
|
4559 |
_engine_info[engine].refit_mask = ((mask & ~not_mask) ^ xor_mask) & _cargo_mask; |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4560 |
|
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4561 |
/* Check if this engine's cargo type is valid. If not, set to the first refittable |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4562 |
* cargo type. Apparently cargo_type isn't a common property... */ |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4563 |
switch (GetEngine(engine)->type) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4564 |
default: NOT_REACHED(); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4565 |
case VEH_AIRCRAFT: break; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4566 |
case VEH_TRAIN: { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4567 |
RailVehicleInfo *rvi = &_rail_vehicle_info[engine]; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4568 |
if (rvi->cargo_type == CT_INVALID) rvi->cargo_type = FindFirstRefittableCargo(engine); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4569 |
if (rvi->cargo_type == CT_INVALID) _engine_info[engine].climates = 0; |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4570 |
break; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4571 |
} |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4572 |
case VEH_ROAD: { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4573 |
RoadVehicleInfo *rvi = &_road_vehicle_info[engine - ROAD_ENGINES_INDEX]; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4574 |
if (rvi->cargo_type == CT_INVALID) rvi->cargo_type = FindFirstRefittableCargo(engine); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4575 |
if (rvi->cargo_type == CT_INVALID) _engine_info[engine].climates = 0; |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4576 |
break; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4577 |
} |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4578 |
case VEH_SHIP: { |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4579 |
ShipVehicleInfo *svi = &_ship_vehicle_info[engine - SHIP_ENGINES_INDEX]; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4580 |
if (svi->cargo_type == CT_INVALID) svi->cargo_type = FindFirstRefittableCargo(engine); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4581 |
if (svi->cargo_type == CT_INVALID) _engine_info[engine].climates = 0; |
6468
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4582 |
break; |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4583 |
} |
29a9bd549d0b
(svn r8885) -Codechange: (NewGRF) If a default cargo type property is out of range then choose the cargo type from its refit list.
peter1138
parents:
6465
diff
changeset
|
4584 |
} |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4585 |
} |
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4586 |
} |
363
cf3cee5f33b4
(svn r551) -newgrf: Preliminary support for TTDPatch flags checking (we just pretend that a bunch of things are on and the rest is off and that's it). Patch by octo, small cleanup by pasky.
darkvater
parents:
362
diff
changeset
|
4587 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4588 |
/** Add all new houses to the house array. House properties can be set at any |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4589 |
* time in the GRF file, so we can only add a house spec to the house array |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4590 |
* after the file has finished loading. We also need to check the dates, due to |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4591 |
* the TTDPatch behaviour described below that we need to emulate. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4592 |
static void FinaliseHouseArray() |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4593 |
{ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4594 |
/* If there are no houses with start dates before 1930, then all houses |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4595 |
* with start dates of 1930 have them reset to 0. This is in order to be |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4596 |
* compatible with TTDPatch, where if no houses have start dates before |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4597 |
* 1930 and the date is before 1930, the game pretends that this is 1930. |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4598 |
* If there have been any houses defined with start dates before 1930 then |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4599 |
* the dates are left alone. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4600 |
bool reset_dates = true; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4601 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4602 |
for (GRFFile *file = _first_grffile; file != NULL; file = file->next) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4603 |
if (file->housespec == NULL) continue; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4604 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4605 |
for (int i = 0; i < HOUSE_MAX; i++) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4606 |
HouseSpec *hs = file->housespec[i]; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4607 |
if (hs != NULL) { |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4608 |
_house_mngr.SetEntitySpec(hs); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4609 |
if (hs->min_date < 1930) reset_dates = false; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4610 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4611 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4612 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4613 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4614 |
if (reset_dates) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4615 |
for (int i = NEW_HOUSE_OFFSET; i < HOUSE_MAX; i++) { |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4616 |
HouseSpec *hs = GetHouseSpecs(i); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4617 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4618 |
if (hs->enabled && hs->min_date == 1930) hs->min_date = 0; |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4619 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4620 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4621 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4622 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4623 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4624 |
/** Each cargo string needs to be mapped from TTDPatch to OpenTTD string IDs. |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4625 |
* This is done after loading so that strings from Action 4 will be mapped |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4626 |
* properly. */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4627 |
static void MapNewCargoStrings() |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4628 |
{ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4629 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4630 |
CargoSpec *cs = &_cargo[c]; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4631 |
/* Don't map if the cargo is unavailable or not from NewGRF */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4632 |
if (!cs->IsValid() || cs->grfid == 0) continue; |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4633 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4634 |
cs->name = MapGRFStringID(cs->grfid, cs->name); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4635 |
cs->name_plural = MapGRFStringID(cs->grfid, cs->name_plural); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4636 |
cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4637 |
cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4638 |
cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev); |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4639 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4640 |
} |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4641 |
|
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4642 |
|
0 | 4643 |
/* Here we perform initial decoding of some special sprites (as are they |
4644 |
* described at http://www.ttdpatch.net/src/newgrf.txt, but this is only a very |
|
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4645 |
* partial implementation yet). */ |
0 | 4646 |
/* XXX: We consider GRF files trusted. It would be trivial to exploit OTTD by |
4647 |
* a crafted invalid GRF file. We should tell that to the user somehow, or |
|
4648 |
* better make this more robust in the future. */ |
|
5008
f95f0bd55c34
(svn r7027) - Codechange: Replace NewGRF loading stage masks with separate function lists. This will allow us to call different handlers depending on the current stage. Also enum-ize the stage.
peter1138
parents:
4993
diff
changeset
|
4649 |
static void DecodeSpecialSprite(uint num, GrfLoadingStage stage) |
0 | 4650 |
{ |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4651 |
/* XXX: There is a difference between staged loading in TTDPatch and |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4652 |
* here. In TTDPatch, for some reason actions 1 and 2 are carried out |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4653 |
* during stage 1, whilst action 3 is carried out during stage 2 (to |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4654 |
* "resolve" cargo IDs... wtf). This is a little problem, because cargo |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4655 |
* IDs are valid only within a given set (action 1) block, and may be |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4656 |
* overwritten after action 3 associates them. But overwriting happens |
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4657 |
* in an earlier stage than associating, so... We just process actions |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4658 |
* 1 and 2 in stage 2 now, let's hope that won't get us into problems. |
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
381
diff
changeset
|
4659 |
* --pasky */ |
3561
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4660 |
/* We need a pre-stage to set up GOTO labels of Action 0x10 because the grf |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4661 |
* is not in memory and scanning the file every time would be too expensive. |
29c95ab685c0
(svn r4439) - NewGRF: Add support for Action 0x10. This also required an extra pre-stage (before initialize and activation) to scan the GRF file for GOTO labels. Big thanks for peter1138 for the guidance and answers, as well as parts of the code.
Darkvater
parents:
3557
diff
changeset
|
4662 |
* In other stages we skip action 0x10 since it's already dealt with. */ |
5008
f95f0bd55c34
(svn r7027) - Codechange: Replace NewGRF loading stage masks with separate function lists. This will allow us to call different handlers depending on the current stage. Also enum-ize the stage.
peter1138
parents:
4993
diff
changeset
|
4663 |
static const SpecialSpriteHandler handlers[][GLS_END] = { |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4664 |
/* 0x00 */ { NULL, SafeChangeInfo, NULL, InitChangeInfo, ReserveChangeInfo, FeatureChangeInfo, }, |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4665 |
/* 0x01 */ { SkipAct1, SkipAct1, SkipAct1, SkipAct1, SkipAct1, NewSpriteSet, }, |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4666 |
/* 0x02 */ { NULL, NULL, NULL, NULL, NULL, NewSpriteGroup, }, |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4667 |
/* 0x03 */ { NULL, GRFUnsafe, NULL, NULL, NULL, FeatureMapSpriteGroup, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4668 |
/* 0x04 */ { NULL, NULL, NULL, NULL, NULL, FeatureNewName, }, |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4669 |
/* 0x05 */ { SkipAct5, SkipAct5, SkipAct5, SkipAct5, SkipAct5, GraphicsNew, }, |
9907
3b068c3a1c74
(svn r9675) [gamebalance] -Sync: r9420:9520 from trunk
celestar
parents:
9906
diff
changeset
|
4670 |
/* 0x06 */ { NULL, NULL, NULL, CfgApply, CfgApply, CfgApply, }, |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4671 |
/* 0x07 */ { NULL, NULL, NULL, NULL, SkipIf, SkipIf, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4672 |
/* 0x08 */ { ScanInfo, NULL, NULL, GRFInfo, NULL, GRFInfo, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4673 |
/* 0x09 */ { NULL, NULL, NULL, SkipIf, SkipIf, SkipIf, }, |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4674 |
/* 0x0A */ { SkipActA, SkipActA, SkipActA, SkipActA, SkipActA, SpriteReplace, }, |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4675 |
/* 0x0B */ { NULL, NULL, NULL, GRFLoadError, GRFLoadError, GRFLoadError, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4676 |
/* 0x0C */ { NULL, NULL, NULL, GRFComment, NULL, GRFComment, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4677 |
/* 0x0D */ { NULL, SafeParamSet, NULL, ParamSet, ParamSet, ParamSet, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4678 |
/* 0x0E */ { NULL, SafeGRFInhibit, NULL, GRFInhibit, GRFInhibit, GRFInhibit, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4679 |
/* 0x0F */ { NULL, NULL, NULL, NULL, NULL, NULL, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4680 |
/* 0x10 */ { NULL, NULL, DefineGotoLabel, NULL, NULL, NULL, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4681 |
/* 0x11 */ { NULL, GRFUnsafe, NULL, NULL, NULL, GRFSound, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4682 |
/* 0x12 */ { NULL, NULL, NULL, NULL, NULL, LoadFontGlyph, }, |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4683 |
/* 0x13 */ { NULL, NULL, NULL, NULL, NULL, TranslateGRFStrings, }, |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4684 |
}; |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4685 |
|
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4686 |
byte* buf; |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4687 |
|
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4688 |
if (_preload_sprite == NULL) { |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4689 |
/* No preloaded sprite to work with; allocate and read the |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4690 |
* pseudo sprite content. */ |
5860
7fdc9b423ba1
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5844
diff
changeset
|
4691 |
buf = MallocT<byte>(num); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4692 |
if (buf == NULL) error("DecodeSpecialSprite: Could not allocate memory"); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4693 |
FioReadBlock(buf, num); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4694 |
} else { |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4695 |
/* Use the preloaded sprite data. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4696 |
buf = _preload_sprite; |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4697 |
_preload_sprite = NULL; |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4698 |
grfmsg(7, "DecodeSpecialSprite: Using preloaded pseudo sprite data"); |
3895
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4699 |
|
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4700 |
/* Skip the real (original) content of this action. */ |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4701 |
FioSeekTo(num, SEEK_CUR); |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4702 |
} |
a67d4451a1df
(svn r4965) - NewGRF: add support for action 0x06 (modify sprite data) for pseudo sprites
peter1138
parents:
3879
diff
changeset
|
4703 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4704 |
byte action = buf[0]; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4705 |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4706 |
if (action == 0xFF) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4707 |
grfmsg(7, "DecodeSpecialSprite: Handling data block in stage %d", stage); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4708 |
GRFDataBlock(buf, num); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
4709 |
} else if (action == 0xFE) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4710 |
grfmsg(7, "DecodeSpecialSprite: andling import block in stage %d", stage); |
4818
1625f49f708d
(svn r6742) - Newsounds: Add support for importing sounds from previously loaded GRF files.
peter1138
parents:
4817
diff
changeset
|
4711 |
GRFImportBlock(buf, num); |
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4625
diff
changeset
|
4712 |
} else if (action >= lengthof(handlers)) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4713 |
grfmsg(7, "DecodeSpecialSprite: Skipping unknown action 0x%02X", action); |
5008
f95f0bd55c34
(svn r7027) - Codechange: Replace NewGRF loading stage masks with separate function lists. This will allow us to call different handlers depending on the current stage. Also enum-ize the stage.
peter1138
parents:
4993
diff
changeset
|
4714 |
} else if (handlers[action][stage] == NULL) { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4715 |
grfmsg(7, "DecodeSpecialSprite: Skipping action 0x%02X in stage %d", action, stage); |
2645
964bd8fe3ce2
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
tron
parents:
2628
diff
changeset
|
4716 |
} else { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4717 |
grfmsg(7, "DecodeSpecialSprite: Handling action 0x%02X in stage %d", action, stage); |
5008
f95f0bd55c34
(svn r7027) - Codechange: Replace NewGRF loading stage masks with separate function lists. This will allow us to call different handlers depending on the current stage. Also enum-ize the stage.
peter1138
parents:
4993
diff
changeset
|
4718 |
handlers[action][stage](buf, num); |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4719 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4720 |
free(buf); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4721 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4722 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4723 |
|
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4724 |
void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage) |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4725 |
{ |
9908
0fa543611bbe
(svn r10112) [gamebalance] -Sync: r9520:9620 from trunk
celestar
parents:
9907
diff
changeset
|
4726 |
const char *filename = config->full_path; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4727 |
uint16 num; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4728 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4729 |
/* A .grf file is activated only if it was active when the game was |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4730 |
* started. If a game is loaded, only its active .grfs will be |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4731 |
* reactivated, unless "loadallgraphics on" is used. A .grf file is |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4732 |
* considered active if its action 8 has been processed, i.e. its |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4733 |
* action 8 hasn't been skipped using an action 7. |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4734 |
* |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4735 |
* During activation, only actions 0, 1, 2, 3, 4, 5, 7, 8, 9, 0A and 0B are |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4736 |
* carried out. All others are ignored, because they only need to be |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4737 |
* processed once at initialization. */ |
5329
2b117d8652f0
(svn r7490) -Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded. These will also be active during the intro screen, and in multiplayer games. Only "network-safe" NewGRFs are permitted, such as fonts and sprite replacement sets.
peter1138
parents:
5324
diff
changeset
|
4738 |
if (stage != GLS_FILESCAN && stage != GLS_SAFETYSCAN && stage != GLS_LABELSCAN) { |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4739 |
_cur_grffile = GetFileByFilename(filename); |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5567
diff
changeset
|
4740 |
if (_cur_grffile == NULL) error("File '%s' lost in cache.\n", filename); |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4741 |
if (stage == GLS_ACTIVATION && config->status != GCS_INITIALISED) return; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4742 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4743 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4744 |
FioOpenFile(file_index, filename); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4745 |
_file_index = file_index; // XXX |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4746 |
|
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4747 |
_cur_grfconfig = config; |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4748 |
|
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4749 |
DEBUG(grf, 2, "LoadNewGRFFile: Reading NewGRF-file '%s'", filename); |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4750 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4751 |
/* Skip the first sprite; we don't care about how many sprites this |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4752 |
* does contain; newest TTDPatches and George's longvehicles don't |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4753 |
* neither, apparently. */ |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4754 |
if (FioReadWord() == 4 && FioReadByte() == 0xFF) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4755 |
FioReadDword(); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4756 |
} else { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4757 |
DEBUG(grf, 7, "LoadNewGRFFile: Custom .grf has invalid format"); |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4758 |
return; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4759 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4760 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4761 |
_skip_sprites = 0; // XXX |
3557
5d12a78ce141
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
peter1138
parents:
3555
diff
changeset
|
4762 |
_nfo_line = 0; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4763 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4764 |
while ((num = FioReadWord()) != 0) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4765 |
byte type = FioReadByte(); |
3557
5d12a78ce141
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
peter1138
parents:
3555
diff
changeset
|
4766 |
_nfo_line++; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4767 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4768 |
if (type == 0xFF) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4769 |
if (_skip_sprites == 0) { |
2958
3f8946daf55f
(svn r3520) Remove unused parameters from some functions
tron
parents:
2935
diff
changeset
|
4770 |
DecodeSpecialSprite(num, stage); |
5011
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
4771 |
|
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
4772 |
/* Stop all processing if we are to skip the remaining sprites */ |
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
4773 |
if (_skip_sprites == -1) break; |
23f0b424a1be
(svn r7031) -Codechange: Use _skip_sprites to skip the rest of the NewGRF when disabled by GRM, and add a shortcut so that the rest of the file isn't scanned.
peter1138
parents:
5008
diff
changeset
|
4774 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4775 |
continue; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4776 |
} else { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4777 |
FioSkipBytes(num); |
1611 | 4778 |
} |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4779 |
} else { |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4780 |
if (_skip_sprites == 0) grfmsg(7, "LoadNewGRFFile: Skipping unexpected sprite"); |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4781 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4782 |
FioSkipBytes(7); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4783 |
num -= 8; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4784 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4785 |
if (type & 2) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4786 |
FioSkipBytes(num); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4787 |
} else { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4788 |
while (num > 0) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4789 |
int8 i = FioReadByte(); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4790 |
if (i >= 0) { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4791 |
num -= i; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4792 |
FioSkipBytes(i); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4793 |
} else { |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4794 |
i = -(i >> 3); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4795 |
num -= i; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4796 |
FioReadByte(); |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4797 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4798 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4799 |
} |
368
32aad6ad36e1
(svn r556) -newgrf: Some seemingly proper support for loading stages of grf files (octo & pasky).
darkvater
parents:
367
diff
changeset
|
4800 |
} |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4801 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4802 |
if (_skip_sprites > 0) _skip_sprites--; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4803 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4804 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4805 |
|
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4806 |
void InitDepotWindowBlockSizes(); |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4807 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4808 |
static void AfterLoadGRFs() |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4809 |
{ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4810 |
/* Pre-calculate all refit masks after loading GRF files. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4811 |
CalculateRefitMasks(); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4812 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4813 |
/* Set the block size in the depot windows based on vehicle sprite sizes */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4814 |
InitDepotWindowBlockSizes(); |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4815 |
|
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4816 |
/* Add all new houses to the house array. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4817 |
FinaliseHouseArray(); |
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4818 |
|
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4819 |
/* Create dynamic list of industry legends for smallmap_gui.cpp */ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4820 |
BuildIndustriesLegend(); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4821 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4822 |
/* Map cargo strings. This is a separate step because cargos are |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4823 |
* loaded before strings... */ |
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4824 |
MapNewCargoStrings(); |
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4825 |
} |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4826 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4827 |
void LoadNewGRF(uint load_index, uint file_index) |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4828 |
{ |
2930
a3bfaa5a9222
(svn r3486) - NewGRF fix: Always reinitialize the ttdpatch flags as patch settings may have changed.
peter1138
parents:
2895
diff
changeset
|
4829 |
InitializeGRFSpecial(); |
0 | 4830 |
|
2463
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4831 |
ResetNewGRFData(); |
de2605ed3758
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2458
diff
changeset
|
4832 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4833 |
/* Load newgrf sprites |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4834 |
* in each loading stage, (try to) open each file specified in the config |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4835 |
* and load information from it. */ |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4836 |
for (GrfLoadingStage stage = GLS_LABELSCAN; stage <= GLS_ACTIVATION; stage++) { |
2400
0b51bc385750
(svn r2926) -Fix: Use the same file slots in both initialisation stages when loading a patch grf
tron
parents:
2346
diff
changeset
|
4837 |
uint slot = file_index; |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4838 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4839 |
_cur_stage = stage; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4840 |
_cur_spriteid = load_index; |
9895
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4841 |
for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) { |
7bd07f43b0e3
(svn r9321) [gamebalance] -Sync: r9025:9314 from trunk
celestar
parents:
6519
diff
changeset
|
4842 |
if (c->status == GCS_DISABLED || c->status == GCS_NOT_FOUND) continue; |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4843 |
|
9906
6f41b8713b65
(svn r9674) [gamebalance] -Sync: r9322:9420 from trunk
celestar
parents:
9903
diff
changeset
|
4844 |
/* @todo usererror() */ |
9908
0fa543611bbe
(svn r10112) [gamebalance] -Sync: r9520:9620 from trunk
celestar
parents:
9907
diff
changeset
|
4845 |
if (!FileExists(c->full_path)) error("NewGRF file is missing '%s'", c->filename); |
3628
bd4a6601e5a2
(svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples.
Darkvater
parents:
3620
diff
changeset
|
4846 |
|
5008
f95f0bd55c34
(svn r7027) - Codechange: Replace NewGRF loading stage masks with separate function lists. This will allow us to call different handlers depending on the current stage. Also enum-ize the stage.
peter1138
parents:
4993
diff
changeset
|
4847 |
if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid); |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5225
diff
changeset
|
4848 |
LoadNewGRFFile(c, slot++, stage); |
5727
0fd7e97094e2
(svn r7760) -Codechange: Debug messages for newgrf showed the starting sprite, not the current sprite index. Also only output the debug message during activation, when sprites are loaded.
peter1138
parents:
5726
diff
changeset
|
4849 |
if (stage == GLS_ACTIVATION) { |
0fd7e97094e2
(svn r7760) -Codechange: Debug messages for newgrf showed the starting sprite, not the current sprite index. Also only output the debug message during activation, when sprites are loaded.
peter1138
parents:
5726
diff
changeset
|
4850 |
ClearTemporaryNewGRFData(); |
6473
03480a0f016e
(svn r8890) -Codechange: (NewGRF) add cargo translation support to engine var 47
peter1138
parents:
6471
diff
changeset
|
4851 |
BuildCargoTranslationMap(); |
9909
dce9a6923bb7
(svn r10133) [gamebalance] -Sync: r9620:9670 from trunk
celestar
parents:
9908
diff
changeset
|
4852 |
DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid); |
5727
0fd7e97094e2
(svn r7760) -Codechange: Debug messages for newgrf showed the starting sprite, not the current sprite index. Also only output the debug message during activation, when sprites are loaded.
peter1138
parents:
5726
diff
changeset
|
4853 |
} |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4854 |
} |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
4855 |
} |
2611
65b5313bc525
(svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes.
peter1138
parents:
2582
diff
changeset
|
4856 |
|
9896
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4857 |
/* Call any functions that should be run after GRFs have been loaded. */ |
2473804114de
(svn r9324) [gamebalance] -Sync: r9314:9322 from trunk (newhouses)
celestar
parents:
9895
diff
changeset
|
4858 |
AfterLoadGRFs(); |
0 | 4859 |
} |
9911
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4860 |
|
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4861 |
bool HasGrfMiscBit(GrfMiscBit bit) |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4862 |
{ |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4863 |
return HASBIT(_misc_grf_features, bit); |
0b8b245a2391
(svn r10135) [gamebalance] -Sync: r9700:9900 from trunk
celestar
parents:
9910
diff
changeset
|
4864 |
} |