summaryrefslogtreecommitdiff
path: root/newgrf.c
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2006-09-20 00:34:06 +0000
committerbelugas <belugas@openttd.org>2006-09-20 00:34:06 +0000
commitb51d58a44c9f8b52db59b842e4309b5eaf4b9c81 (patch)
tree1e18ce466f13c77758a0b7649707f86edc02fb32 /newgrf.c
parent32077448ba40487241b51f84efd1db26e0448e6c (diff)
downloadopenttd-b51d58a44c9f8b52db59b842e4309b5eaf4b9c81.tar.xz
(svn r6485) -NewGRF Feature: Match the order of TTDPatch's currencies with those used in OTTD.
This will not reorder OTTD's currencies, but will make it so that currencies affected by a grf will be those aimed by the writer.
Diffstat (limited to 'newgrf.c')
-rw-r--r--newgrf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/newgrf.c b/newgrf.c
index 7fe829194..6a552066d 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -1090,8 +1090,8 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0A: // Currency display names
FOR_EACH_OBJECT {
- uint curidx = gvid + i;
- StringID newone = GetGRFStringID(_cur_grffile->grfid,grf_load_word(&buf));
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
+ StringID newone = GetGRFStringID(_cur_grffile->grfid, grf_load_word(&buf));
if ((newone != STR_UNDEFINED) && (curidx < NUM_CURRENCY)) {
_currency_specs[curidx].name = newone;
@@ -1101,7 +1101,7 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0B: // Currency multipliers
FOR_EACH_OBJECT {
- uint curidx = gvid + i;
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
uint32 rate = grf_load_dword(&buf);
if (curidx < NUM_CURRENCY) {
@@ -1117,7 +1117,7 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0C: // Currency options
FOR_EACH_OBJECT {
- uint curidx = gvid +i;
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
uint16 options = grf_load_word(&buf);
if (curidx < NUM_CURRENCY) {
@@ -1133,7 +1133,7 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0D: // Currency prefix symbol
FOR_EACH_OBJECT {
- uint curidx = gvid +i;
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
uint32 tempfix = grf_load_dword(&buf);
if (curidx < NUM_CURRENCY) {
@@ -1147,7 +1147,7 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0E: // Currency suffix symbol
FOR_EACH_OBJECT {
- uint curidx = gvid +i;
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
uint32 tempfix = grf_load_dword(&buf);
if (curidx < NUM_CURRENCY) {
@@ -1161,7 +1161,7 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
case 0x0F: // Euro introduction dates
FOR_EACH_OBJECT {
- uint curidx = gvid +i;
+ uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
Year year_euro = grf_load_word(&buf);
if (curidx < NUM_CURRENCY) {