dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/company_sl.cpp
This commit is contained in:
Jonathan G Rennison
2017-02-28 00:15:45 +00:00
parent 8cf0f354d9 9071d5f07f
commit a6168dd2f0
81 changed files with 331 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf_text.cpp
View File

@@ -36,9 +36,6 @@
#include "safeguards.h"
#define GRFTAB 28
#define TABSIZE 11
/**
* Explains the newgrf shift bit positioning.
* the grf base will not be used in order to find the string, but rather for
@@ -160,7 +157,7 @@ struct GRFTextEntry {
static uint _num_grf_texts = 0;
static GRFTextEntry _grf_text[(1 << TABSIZE) * 3];
static GRFTextEntry _grf_text[TAB_SIZE_NEWGRF];
static byte _currentLangID = GRFLX_ENGLISH; ///< by default, english is used.
/**
@@ -700,7 +697,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
grfmsg(3, "Added 0x%X: grfid %08X string 0x%X lang 0x%X string '%s'", id, grfid, stringid, newtext->langid, newtext->text);
return (GRFTAB << TABSIZE) + id;
return MakeStringID(TEXT_TAB_NEWGRF_START, id);
}
/**
@@ -710,7 +707,7 @@ StringID GetGRFStringID(uint32 grfid, uint16 stringid)
{
for (uint id = 0; id < _num_grf_texts; id++) {
if (_grf_text[id].grfid == grfid && _grf_text[id].stringid == stringid) {
return (GRFTAB << TABSIZE) + id;
return MakeStringID(TEXT_TAB_NEWGRF_START, id);
}
}