mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #1915 from janisozaur/type-fixes
In C++11 use actual pointer types instead of C's defines
This commit is contained in:
commit
f516028413
|
@ -18,7 +18,7 @@ private:
|
||||||
bool _canRead;
|
bool _canRead;
|
||||||
bool _canWrite;
|
bool _canWrite;
|
||||||
bool _disposed;
|
bool _disposed;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FileStream(const utf8 *path, int fileMode) {
|
FileStream(const utf8 *path, int fileMode) {
|
||||||
const char *mode;
|
const char *mode;
|
||||||
|
|
|
@ -18,7 +18,7 @@ constexpr int ScenarioOverrideMaxStringCount = 3;
|
||||||
|
|
||||||
LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
|
LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
|
||||||
{
|
{
|
||||||
assert(path != NULL);
|
assert(path != nullptr);
|
||||||
|
|
||||||
uint32 fileLength;
|
uint32 fileLength;
|
||||||
utf8 *fileData;
|
utf8 *fileData;
|
||||||
|
@ -26,7 +26,7 @@ LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
|
||||||
// Load file directly into memory
|
// Load file directly into memory
|
||||||
try {
|
try {
|
||||||
FileStream fs = FileStream(path, FILE_MODE_OPEN);
|
FileStream fs = FileStream(path, FILE_MODE_OPEN);
|
||||||
|
|
||||||
fileLength = (uint32)fs.GetLength();
|
fileLength = (uint32)fs.GetLength();
|
||||||
fileData = Memory::Allocate<utf8>(fileLength);
|
fileData = Memory::Allocate<utf8>(fileLength);
|
||||||
fs.Read(fileData, fileLength);
|
fs.Read(fileData, fileLength);
|
||||||
|
@ -34,7 +34,7 @@ LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
|
||||||
fs.Dispose();
|
fs.Dispose();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
log_error("Unable to open %s: %s", path, ex.GetMessage());
|
log_error("Unable to open %s: %s", path, ex.GetMessage());
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the memory as text
|
// Parse the memory as text
|
||||||
|
@ -45,19 +45,19 @@ LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
|
||||||
}
|
}
|
||||||
|
|
||||||
LanguagePack *LanguagePack::FromText(int id, const utf8 *text)
|
LanguagePack *LanguagePack::FromText(int id, const utf8 *text)
|
||||||
{
|
{
|
||||||
return new LanguagePack(id, text);
|
return new LanguagePack(id, text);
|
||||||
}
|
}
|
||||||
|
|
||||||
LanguagePack::LanguagePack(int id, const utf8 *text)
|
LanguagePack::LanguagePack(int id, const utf8 *text)
|
||||||
{
|
{
|
||||||
assert(text != NULL);
|
assert(text != nullptr);
|
||||||
|
|
||||||
_id = id;
|
_id = id;
|
||||||
_stringData = NULL;
|
_stringData = nullptr;
|
||||||
_currentGroup = NULL;
|
_currentGroup = nullptr;
|
||||||
_currentObjectOverride = NULL;
|
_currentObjectOverride = nullptr;
|
||||||
_currentScenarioOverride = NULL;
|
_currentScenarioOverride = nullptr;
|
||||||
|
|
||||||
auto reader = UTF8StringReader(text);
|
auto reader = UTF8StringReader(text);
|
||||||
while (reader.CanRead()) {
|
while (reader.CanRead()) {
|
||||||
|
@ -73,7 +73,7 @@ LanguagePack::LanguagePack(int id, const utf8 *text)
|
||||||
for (size_t i = 0; i < _objectOverrides.size(); i++) {
|
for (size_t i = 0; i < _objectOverrides.size(); i++) {
|
||||||
for (int j = 0; j < ObjectOverrideMaxStringCount; j++) {
|
for (int j = 0; j < ObjectOverrideMaxStringCount; j++) {
|
||||||
const utf8 **strPtr = &(_objectOverrides[i].strings[j]);
|
const utf8 **strPtr = &(_objectOverrides[i].strings[j]);
|
||||||
if (*strPtr != NULL) {
|
if (*strPtr != nullptr) {
|
||||||
*strPtr = (utf8*)(stringDataBaseAddress + (size_t)*strPtr);
|
*strPtr = (utf8*)(stringDataBaseAddress + (size_t)*strPtr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ LanguagePack::LanguagePack(int id, const utf8 *text)
|
||||||
for (size_t i = 0; i < _scenarioOverrides.size(); i++) {
|
for (size_t i = 0; i < _scenarioOverrides.size(); i++) {
|
||||||
for (int j = 0; j < ScenarioOverrideMaxStringCount; j++) {
|
for (int j = 0; j < ScenarioOverrideMaxStringCount; j++) {
|
||||||
const utf8 **strPtr = &(_scenarioOverrides[i].strings[j]);
|
const utf8 **strPtr = &(_scenarioOverrides[i].strings[j]);
|
||||||
if (*strPtr != NULL) {
|
if (*strPtr != nullptr) {
|
||||||
*strPtr = (utf8*)(stringDataBaseAddress + (size_t)*strPtr);
|
*strPtr = (utf8*)(stringDataBaseAddress + (size_t)*strPtr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ const utf8 *LanguagePack::GetString(int stringId) const {
|
||||||
if (_scenarioOverrides.size() > (size_t)ooIndex) {
|
if (_scenarioOverrides.size() > (size_t)ooIndex) {
|
||||||
return _scenarioOverrides[ooIndex].strings[ooStringIndex];
|
return _scenarioOverrides[ooIndex].strings[ooStringIndex];
|
||||||
} else {
|
} else {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
}else if (stringId >= ObjectOverrideBase) {
|
}else if (stringId >= ObjectOverrideBase) {
|
||||||
int offset = stringId - ObjectOverrideBase;
|
int offset = stringId - ObjectOverrideBase;
|
||||||
|
@ -116,26 +116,26 @@ const utf8 *LanguagePack::GetString(int stringId) const {
|
||||||
if (_objectOverrides.size() > (size_t)ooIndex) {
|
if (_objectOverrides.size() > (size_t)ooIndex) {
|
||||||
return _objectOverrides[ooIndex].strings[ooStringIndex];
|
return _objectOverrides[ooIndex].strings[ooStringIndex];
|
||||||
} else {
|
} else {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (_strings.size() > (size_t)stringId) {
|
if (_strings.size() > (size_t)stringId) {
|
||||||
return _strings[stringId];
|
return _strings[stringId];
|
||||||
} else {
|
} else {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rct_string_id LanguagePack::GetObjectOverrideStringId(const char *objectIdentifier, int index)
|
rct_string_id LanguagePack::GetObjectOverrideStringId(const char *objectIdentifier, int index)
|
||||||
{
|
{
|
||||||
assert(objectIdentifier != NULL);
|
assert(objectIdentifier != nullptr);
|
||||||
assert(index < ObjectOverrideMaxStringCount);
|
assert(index < ObjectOverrideMaxStringCount);
|
||||||
|
|
||||||
int ooIndex = 0;
|
int ooIndex = 0;
|
||||||
for (const ObjectOverride &objectOverride : _objectOverrides) {
|
for (const ObjectOverride &objectOverride : _objectOverrides) {
|
||||||
if (strncmp(objectOverride.name, objectIdentifier, 8) == 0) {
|
if (strncmp(objectOverride.name, objectIdentifier, 8) == 0) {
|
||||||
if (objectOverride.strings[index] == NULL) {
|
if (objectOverride.strings[index] == nullptr) {
|
||||||
return STR_NONE;
|
return STR_NONE;
|
||||||
}
|
}
|
||||||
return ObjectOverrideBase + (ooIndex * ObjectOverrideMaxStringCount) + index;
|
return ObjectOverrideBase + (ooIndex * ObjectOverrideMaxStringCount) + index;
|
||||||
|
@ -148,13 +148,13 @@ rct_string_id LanguagePack::GetObjectOverrideStringId(const char *objectIdentifi
|
||||||
|
|
||||||
rct_string_id LanguagePack::GetScenarioOverrideStringId(const utf8 *scenarioFilename, int index)
|
rct_string_id LanguagePack::GetScenarioOverrideStringId(const utf8 *scenarioFilename, int index)
|
||||||
{
|
{
|
||||||
assert(scenarioFilename != NULL);
|
assert(scenarioFilename != nullptr);
|
||||||
assert(index < ScenarioOverrideMaxStringCount);
|
assert(index < ScenarioOverrideMaxStringCount);
|
||||||
|
|
||||||
int ooIndex = 0;
|
int ooIndex = 0;
|
||||||
for (const ScenarioOverride &scenarioOverride : _scenarioOverrides) {
|
for (const ScenarioOverride &scenarioOverride : _scenarioOverrides) {
|
||||||
if (_stricmp(scenarioOverride.filename, scenarioFilename) == 0) {
|
if (_stricmp(scenarioOverride.filename, scenarioFilename) == 0) {
|
||||||
if (scenarioOverride.strings[index] == NULL) {
|
if (scenarioOverride.strings[index] == nullptr) {
|
||||||
return STR_NONE;
|
return STR_NONE;
|
||||||
}
|
}
|
||||||
return ScenarioOverrideBase + (ooIndex * ScenarioOverrideMaxStringCount) + index;
|
return ScenarioOverrideBase + (ooIndex * ScenarioOverrideMaxStringCount) + index;
|
||||||
|
@ -167,7 +167,7 @@ rct_string_id LanguagePack::GetScenarioOverrideStringId(const utf8 *scenarioFile
|
||||||
|
|
||||||
LanguagePack::ObjectOverride *LanguagePack::GetObjectOverride(const char *objectIdentifier)
|
LanguagePack::ObjectOverride *LanguagePack::GetObjectOverride(const char *objectIdentifier)
|
||||||
{
|
{
|
||||||
assert(objectIdentifier != NULL);
|
assert(objectIdentifier != nullptr);
|
||||||
|
|
||||||
for (size_t i = 0; i < _objectOverrides.size(); i++) {
|
for (size_t i = 0; i < _objectOverrides.size(); i++) {
|
||||||
ObjectOverride *oo = &_objectOverrides[i];
|
ObjectOverride *oo = &_objectOverrides[i];
|
||||||
|
@ -175,12 +175,12 @@ LanguagePack::ObjectOverride *LanguagePack::GetObjectOverride(const char *object
|
||||||
return oo;
|
return oo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
LanguagePack::ScenarioOverride *LanguagePack::GetScenarioOverride(const utf8 *scenarioIdentifier)
|
LanguagePack::ScenarioOverride *LanguagePack::GetScenarioOverride(const utf8 *scenarioIdentifier)
|
||||||
{
|
{
|
||||||
assert(scenarioIdentifier != NULL);
|
assert(scenarioIdentifier != nullptr);
|
||||||
|
|
||||||
for (size_t i = 0; i < _scenarioOverrides.size(); i++) {
|
for (size_t i = 0; i < _scenarioOverrides.size(); i++) {
|
||||||
ScenarioOverride *so = &_scenarioOverrides[i];
|
ScenarioOverride *so = &_scenarioOverrides[i];
|
||||||
|
@ -188,7 +188,7 @@ LanguagePack::ScenarioOverride *LanguagePack::GetScenarioOverride(const utf8 *sc
|
||||||
return so;
|
return so;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -310,8 +310,8 @@ void LanguagePack::ParseGroupObject(IStringReader *reader)
|
||||||
if (sb.GetLength() == 8) {
|
if (sb.GetLength() == 8) {
|
||||||
_currentGroup = sb.GetString();
|
_currentGroup = sb.GetString();
|
||||||
_currentObjectOverride = GetObjectOverride(_currentGroup);
|
_currentObjectOverride = GetObjectOverride(_currentGroup);
|
||||||
_currentScenarioOverride = NULL;
|
_currentScenarioOverride = nullptr;
|
||||||
if (_currentObjectOverride == NULL) {
|
if (_currentObjectOverride == nullptr) {
|
||||||
_objectOverrides.push_back(ObjectOverride());
|
_objectOverrides.push_back(ObjectOverride());
|
||||||
_currentObjectOverride = &_objectOverrides[_objectOverrides.size() - 1];
|
_currentObjectOverride = &_objectOverrides[_objectOverrides.size() - 1];
|
||||||
memset(_currentObjectOverride, 0, sizeof(ObjectOverride));
|
memset(_currentObjectOverride, 0, sizeof(ObjectOverride));
|
||||||
|
@ -346,9 +346,9 @@ void LanguagePack::ParseGroupScenario(IStringReader *reader)
|
||||||
SafeFree(_currentGroup);
|
SafeFree(_currentGroup);
|
||||||
|
|
||||||
_currentGroup = sb.GetString();
|
_currentGroup = sb.GetString();
|
||||||
_currentObjectOverride = NULL;
|
_currentObjectOverride = nullptr;
|
||||||
_currentScenarioOverride = GetScenarioOverride(_currentGroup);
|
_currentScenarioOverride = GetScenarioOverride(_currentGroup);
|
||||||
if (_currentScenarioOverride == NULL) {
|
if (_currentScenarioOverride == nullptr) {
|
||||||
_scenarioOverrides.push_back(ScenarioOverride());
|
_scenarioOverrides.push_back(ScenarioOverride());
|
||||||
_currentScenarioOverride = &_scenarioOverrides[_scenarioOverrides.size() - 1];
|
_currentScenarioOverride = &_scenarioOverrides[_scenarioOverrides.size() - 1];
|
||||||
memset(_currentScenarioOverride, 0, sizeof(ObjectOverride));
|
memset(_currentScenarioOverride, 0, sizeof(ObjectOverride));
|
||||||
|
@ -388,7 +388,7 @@ void LanguagePack::ParseString(IStringReader *reader)
|
||||||
const utf8 *identifier = sb.GetBuffer();
|
const utf8 *identifier = sb.GetBuffer();
|
||||||
|
|
||||||
int stringId;
|
int stringId;
|
||||||
if (_currentGroup == NULL) {
|
if (_currentGroup == nullptr) {
|
||||||
if (sscanf(identifier, "STR_%4d", &stringId) != 1) {
|
if (sscanf(identifier, "STR_%4d", &stringId) != 1) {
|
||||||
// Ignore line entirely
|
// Ignore line entirely
|
||||||
return;
|
return;
|
||||||
|
@ -430,15 +430,15 @@ void LanguagePack::ParseString(IStringReader *reader)
|
||||||
// Get the relative offset to the string (add the base offset when we extract the string properly)
|
// Get the relative offset to the string (add the base offset when we extract the string properly)
|
||||||
utf8 *relativeOffset = (utf8*)_stringDataSB.GetLength();
|
utf8 *relativeOffset = (utf8*)_stringDataSB.GetLength();
|
||||||
|
|
||||||
if (_currentGroup == NULL) {
|
if (_currentGroup == nullptr) {
|
||||||
// Make sure the list is big enough to contain this string id
|
// Make sure the list is big enough to contain this string id
|
||||||
while (_strings.size() <= (size_t)stringId) {
|
while (_strings.size() <= (size_t)stringId) {
|
||||||
_strings.push_back(NULL);
|
_strings.push_back(nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
_strings[stringId] = relativeOffset;
|
_strings[stringId] = relativeOffset;
|
||||||
} else {
|
} else {
|
||||||
if (_currentObjectOverride != NULL) {
|
if (_currentObjectOverride != nullptr) {
|
||||||
_currentObjectOverride->strings[stringId] = relativeOffset;
|
_currentObjectOverride->strings[stringId] = relativeOffset;
|
||||||
} else {
|
} else {
|
||||||
_currentScenarioOverride->strings[stringId] = relativeOffset;
|
_currentScenarioOverride->strings[stringId] = relativeOffset;
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -35,7 +35,7 @@ typedef enum {
|
||||||
CURRENCY_GUILDERS, // Dutch Gilder
|
CURRENCY_GUILDERS, // Dutch Gilder
|
||||||
CURRENCY_KRONA, // Swedish Krona
|
CURRENCY_KRONA, // Swedish Krona
|
||||||
CURRENCY_EUROS, // Euro
|
CURRENCY_EUROS, // Euro
|
||||||
|
|
||||||
CURRENCY_END // Last item
|
CURRENCY_END // Last item
|
||||||
} CURRENCY_TYPE;
|
} CURRENCY_TYPE;
|
||||||
|
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -136,4 +136,4 @@ enum {
|
||||||
FORMAT_SYMBOL_FLAG = 20003,
|
FORMAT_SYMBOL_FLAG = 20003,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -48,24 +48,24 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
static TTFFontSetDescriptor TTFFontMingLiu = {{
|
static TTFFontSetDescriptor TTFFontMingLiu = {{
|
||||||
{ "msjh.ttc", 9, -1, -3, 6, NULL },
|
{ "msjh.ttc", 9, -1, -3, 6, nullptr },
|
||||||
{ "mingliu.ttc", 11, 1, 1, 12, NULL },
|
{ "mingliu.ttc", 11, 1, 1, 12, nullptr },
|
||||||
{ "mingliu.ttc", 12, 1, 0, 12, NULL },
|
{ "mingliu.ttc", 12, 1, 0, 12, nullptr },
|
||||||
{ "mingliu.ttc", 13, 1, 0, 20, NULL },
|
{ "mingliu.ttc", 13, 1, 0, 20, nullptr },
|
||||||
}};
|
}};
|
||||||
|
|
||||||
static TTFFontSetDescriptor TTFFontSimSun = {{
|
static TTFFontSetDescriptor TTFFontSimSun = {{
|
||||||
{ "msyh.ttc", 9, -1, -3, 6, NULL },
|
{ "msyh.ttc", 9, -1, -3, 6, nullptr },
|
||||||
{ "simsun.ttc", 11, 1, -1, 14, NULL },
|
{ "simsun.ttc", 11, 1, -1, 14, nullptr },
|
||||||
{ "simsun.ttc", 12, 1, -2, 14, NULL },
|
{ "simsun.ttc", 12, 1, -2, 14, nullptr },
|
||||||
{ "simsun.ttc", 13, 1, 0, 20, NULL },
|
{ "simsun.ttc", 13, 1, 0, 20, nullptr },
|
||||||
}};
|
}};
|
||||||
|
|
||||||
static TTFFontSetDescriptor TTFFontMalgun = { {
|
static TTFFontSetDescriptor TTFFontMalgun = { {
|
||||||
{ "malgun.ttf", 8, -1, -3, 6, NULL },
|
{ "malgun.ttf", 8, -1, -3, 6, nullptr },
|
||||||
{ "malgun.ttf", 11, 1, -2, 14, NULL },
|
{ "malgun.ttf", 11, 1, -2, 14, nullptr },
|
||||||
{ "malgun.ttf", 12, 1, -4, 14, NULL },
|
{ "malgun.ttf", 12, 1, -4, 14, nullptr },
|
||||||
{ "malgun.ttf", 13, 1, 0, 20, NULL },
|
{ "malgun.ttf", 13, 1, 0, 20, nullptr },
|
||||||
} };
|
} };
|
||||||
|
|
||||||
const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = {
|
const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = {
|
||||||
|
@ -116,22 +116,22 @@ void utf8_remove_format_codes(utf8 *text)
|
||||||
|
|
||||||
const char *language_get_string(rct_string_id id)
|
const char *language_get_string(rct_string_id id)
|
||||||
{
|
{
|
||||||
const char *openrctString = NULL;
|
const char *openrctString = nullptr;
|
||||||
|
|
||||||
if (id == (rct_string_id)STR_NONE)
|
if (id == (rct_string_id)STR_NONE)
|
||||||
return NULL;
|
return nullptr;
|
||||||
|
|
||||||
if (_languageCurrent != nullptr)
|
if (_languageCurrent != nullptr)
|
||||||
openrctString = _languageCurrent->GetString(id);
|
openrctString = _languageCurrent->GetString(id);
|
||||||
if (openrctString == NULL && _languageFallback != nullptr)
|
if (openrctString == nullptr && _languageFallback != nullptr)
|
||||||
openrctString = _languageFallback->GetString(id);
|
openrctString = _languageFallback->GetString(id);
|
||||||
|
|
||||||
if (id >= STR_OPENRCT2_BEGIN_STRING_ID) {
|
if (id >= STR_OPENRCT2_BEGIN_STRING_ID) {
|
||||||
return openrctString != NULL ? openrctString : "(undefined string)";
|
return openrctString != nullptr ? openrctString : "(undefined string)";
|
||||||
} else {
|
} else {
|
||||||
const char *rct = _languageOriginal[id];
|
const char *rct = _languageOriginal[id];
|
||||||
const char *str = (openrctString == NULL || strlen(openrctString) == 0 ? rct : openrctString);
|
const char *str = (openrctString == nullptr || strlen(openrctString) == 0 ? rct : openrctString);
|
||||||
return str == NULL ? "" : str;
|
return str == nullptr ? "" : str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,13 +151,13 @@ int language_open(int id)
|
||||||
|
|
||||||
sprintf(filename, languagePath, gExePath, LanguagesDescriptors[id].path);
|
sprintf(filename, languagePath, gExePath, LanguagesDescriptors[id].path);
|
||||||
_languageCurrent = LanguagePack::FromFile(id, filename);
|
_languageCurrent = LanguagePack::FromFile(id, filename);
|
||||||
if (_languageCurrent != NULL) {
|
if (_languageCurrent != nullptr) {
|
||||||
gCurrentLanguage = id;
|
gCurrentLanguage = id;
|
||||||
|
|
||||||
if (LanguagesDescriptors[id].font == FONT_OPENRCT2_SPRITE) {
|
if (LanguagesDescriptors[id].font == FONT_OPENRCT2_SPRITE) {
|
||||||
ttf_dispose();
|
ttf_dispose();
|
||||||
gUseTrueTypeFont = false;
|
gUseTrueTypeFont = false;
|
||||||
gCurrentTTFFontSet = NULL;
|
gCurrentTTFFontSet = nullptr;
|
||||||
} else {
|
} else {
|
||||||
ttf_dispose();
|
ttf_dispose();
|
||||||
gUseTrueTypeFont = true;
|
gUseTrueTypeFont = true;
|
||||||
|
@ -187,7 +187,7 @@ void language_close_all()
|
||||||
/* rct2: 0x0098DA16 */
|
/* rct2: 0x0098DA16 */
|
||||||
uint16 ObjectTypeStringTableCount[] = { 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3 };
|
uint16 ObjectTypeStringTableCount[] = { 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3 };
|
||||||
|
|
||||||
utf8 *_cachedObjectStrings[MAX_OBJECT_CACHED_STRINGS] = { NULL };
|
utf8 *_cachedObjectStrings[MAX_OBJECT_CACHED_STRINGS] = { nullptr };
|
||||||
|
|
||||||
void utf8_trim_string(utf8 *text)
|
void utf8_trim_string(utf8 *text)
|
||||||
{
|
{
|
||||||
|
@ -271,7 +271,7 @@ static bool rct2_language_is_multibyte_charset(int languageId)
|
||||||
rct_string_id object_get_localised_text(uint8_t** pStringTable/*ebp*/, int type/*ecx*/, int index/*ebx*/, int tableindex/*edx*/)
|
rct_string_id object_get_localised_text(uint8_t** pStringTable/*ebp*/, int type/*ecx*/, int index/*ebx*/, int tableindex/*edx*/)
|
||||||
{
|
{
|
||||||
uint8 languageId, chosenLanguageId;
|
uint8 languageId, chosenLanguageId;
|
||||||
char *pString = NULL;
|
char *pString = nullptr;
|
||||||
int result = 0;
|
int result = 0;
|
||||||
bool isBlank;
|
bool isBlank;
|
||||||
|
|
||||||
|
@ -344,7 +344,7 @@ rct_string_id object_get_localised_text(uint8_t** pStringTable/*ebp*/, int type/
|
||||||
// cache UTF-8 string
|
// cache UTF-8 string
|
||||||
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
|
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
|
||||||
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
|
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
|
||||||
if (*cacheString != NULL) {
|
if (*cacheString != nullptr) {
|
||||||
free(*cacheString);
|
free(*cacheString);
|
||||||
}
|
}
|
||||||
if (rct2_language_is_multibyte_charset(chosenLanguageId)) {
|
if (rct2_language_is_multibyte_charset(chosenLanguageId)) {
|
||||||
|
@ -366,7 +366,7 @@ rct_string_id object_get_localised_text(uint8_t** pStringTable/*ebp*/, int type/
|
||||||
// cache UTF-8 string
|
// cache UTF-8 string
|
||||||
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
|
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
|
||||||
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
|
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
|
||||||
if (*cacheString != NULL) {
|
if (*cacheString != nullptr) {
|
||||||
free(*cacheString);
|
free(*cacheString);
|
||||||
}
|
}
|
||||||
if (rct2_language_is_multibyte_charset(chosenLanguageId)) {
|
if (rct2_language_is_multibyte_charset(chosenLanguageId)) {
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -241,7 +241,7 @@ void format_comma_separated_integer(char **dest, long long value)
|
||||||
// Append group separator
|
// Append group separator
|
||||||
if (groupIndex == 3) {
|
if (groupIndex == 3) {
|
||||||
groupIndex = 0;
|
groupIndex = 0;
|
||||||
|
|
||||||
ch = commaMark;
|
ch = commaMark;
|
||||||
while (*ch != 0) {
|
while (*ch != 0) {
|
||||||
*dst++ = *ch++;
|
*dst++ = *ch++;
|
||||||
|
@ -309,7 +309,7 @@ void format_comma_separated_fixed_2dp(char **dest, long long value)
|
||||||
// Append group separator
|
// Append group separator
|
||||||
if (groupIndex == 3) {
|
if (groupIndex == 3) {
|
||||||
groupIndex = 0;
|
groupIndex = 0;
|
||||||
|
|
||||||
ch = commaMark;
|
ch = commaMark;
|
||||||
while (*ch != 0) {
|
while (*ch != 0) {
|
||||||
*dst++ = *ch++;
|
*dst++ = *ch++;
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -1049,4 +1049,4 @@ const char *real_names[] = {
|
||||||
"Zachary",
|
"Zachary",
|
||||||
"Zachery",
|
"Zachery",
|
||||||
"Zola"
|
"Zola"
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -160,7 +160,7 @@ enum {
|
||||||
STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS = 926,
|
STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS = 926,
|
||||||
STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE = 927,
|
STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE = 927,
|
||||||
STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP = 928,
|
STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP = 928,
|
||||||
|
|
||||||
STR_S_BEND_LEFT = 929,
|
STR_S_BEND_LEFT = 929,
|
||||||
STR_S_BEND_RIGHT = 930,
|
STR_S_BEND_RIGHT = 930,
|
||||||
STR_VERTICAL_LOOP_LEFT = 931,
|
STR_VERTICAL_LOOP_LEFT = 931,
|
||||||
|
@ -175,7 +175,7 @@ enum {
|
||||||
STR_REMOVE_BASE_LAND = 940,
|
STR_REMOVE_BASE_LAND = 940,
|
||||||
STR_REMOVE_VERTICAL_FACES = 941,
|
STR_REMOVE_VERTICAL_FACES = 941,
|
||||||
STR_SEE_THROUGH_RIDES = 942,
|
STR_SEE_THROUGH_RIDES = 942,
|
||||||
STR_SEE_THROUGH_SCENERY = 943,
|
STR_SEE_THROUGH_SCENERY = 943,
|
||||||
|
|
||||||
STR_SAVE_PROMPT_SAVE = 944,
|
STR_SAVE_PROMPT_SAVE = 944,
|
||||||
STR_SAVE_PROMPT_DONT_SAVE = 945,
|
STR_SAVE_PROMPT_DONT_SAVE = 945,
|
||||||
|
@ -592,13 +592,13 @@ enum {
|
||||||
STR_HELIX_DOWN_LARGE = 1467,
|
STR_HELIX_DOWN_LARGE = 1467,
|
||||||
|
|
||||||
STR_STAFF = 1468,
|
STR_STAFF = 1468,
|
||||||
|
|
||||||
STR_RIDE_MUST_START_AND_END_WITH_STATIONS = 1469,
|
STR_RIDE_MUST_START_AND_END_WITH_STATIONS = 1469,
|
||||||
STR_STATION_NOT_LONG_ENOUGH = 1470,
|
STR_STATION_NOT_LONG_ENOUGH = 1470,
|
||||||
|
|
||||||
STR_SPEED = 1471,
|
STR_SPEED = 1471,
|
||||||
STR_SPEED_TIP = 1472,
|
STR_SPEED_TIP = 1472,
|
||||||
|
|
||||||
STR_EXCITEMENT_RATING = 1473,
|
STR_EXCITEMENT_RATING = 1473,
|
||||||
STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE = 1474,
|
STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE = 1474,
|
||||||
STR_INTENSITY_RATING = 1475,
|
STR_INTENSITY_RATING = 1475,
|
||||||
|
@ -608,7 +608,7 @@ enum {
|
||||||
STR_NAUSEA_RATING_NOT_YET_AVAILABLE = 1479,
|
STR_NAUSEA_RATING_NOT_YET_AVAILABLE = 1479,
|
||||||
|
|
||||||
STR_THOUGHT_START = 1480,
|
STR_THOUGHT_START = 1480,
|
||||||
|
|
||||||
STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP = 1655,
|
STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP = 1655,
|
||||||
STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP = 1656,
|
STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP = 1656,
|
||||||
|
|
||||||
|
@ -719,7 +719,7 @@ enum {
|
||||||
STR_OFF = 1775,
|
STR_OFF = 1775,
|
||||||
STR_ON = 1776,
|
STR_ON = 1776,
|
||||||
STR_MUSIC = 1777,
|
STR_MUSIC = 1777,
|
||||||
|
|
||||||
STR_UNIFORM_COLOUR_TIP = 1790,
|
STR_UNIFORM_COLOUR_TIP = 1790,
|
||||||
STR_UNIFORM_COLOUR = 1791,
|
STR_UNIFORM_COLOUR = 1791,
|
||||||
STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL = 1792,
|
STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL = 1792,
|
||||||
|
@ -779,7 +779,7 @@ enum {
|
||||||
STR_GUESTS_FAVOURITE_PLURAL_LABEL = 1843,
|
STR_GUESTS_FAVOURITE_PLURAL_LABEL = 1843,
|
||||||
STR_RIDE_LIST_INFORMATION_TYPE_TIP = 1844,
|
STR_RIDE_LIST_INFORMATION_TYPE_TIP = 1844,
|
||||||
STR_NUM_GUESTS = 1846,
|
STR_NUM_GUESTS = 1846,
|
||||||
|
|
||||||
STR_PLAY_MUSIC = 1849,
|
STR_PLAY_MUSIC = 1849,
|
||||||
STR_SELECT_MUSIC_TIP = 1850,
|
STR_SELECT_MUSIC_TIP = 1850,
|
||||||
STR_RUNNING_COST_PER_HOUR = 1851,
|
STR_RUNNING_COST_PER_HOUR = 1851,
|
||||||
|
@ -821,7 +821,7 @@ enum {
|
||||||
STR_NEVER = 1885,
|
STR_NEVER = 1885,
|
||||||
|
|
||||||
STR_INSPECTING_RIDE = 1886,
|
STR_INSPECTING_RIDE = 1886,
|
||||||
|
|
||||||
STR_TIME_SINCE_LAST_INSPECTION_MINUTES = 1887,
|
STR_TIME_SINCE_LAST_INSPECTION_MINUTES = 1887,
|
||||||
STR_TIME_SINCE_LAST_INSPECTION_MORE_THAN_4_HOURS = 1888,
|
STR_TIME_SINCE_LAST_INSPECTION_MORE_THAN_4_HOURS = 1888,
|
||||||
STR_DOWN_TIME_LABEL_1889 = 1889,
|
STR_DOWN_TIME_LABEL_1889 = 1889,
|
||||||
|
@ -1572,7 +1572,7 @@ enum {
|
||||||
STR_HEDGES = 3059,
|
STR_HEDGES = 3059,
|
||||||
STR_ICE_BLOCKS = 3060,
|
STR_ICE_BLOCKS = 3060,
|
||||||
STR_WOODEN_FENCES = 3061,
|
STR_WOODEN_FENCES = 3061,
|
||||||
|
|
||||||
STR_RIDE_CONSTRUCTION_STANDARD_RC_TRACK_TIP = 3062,
|
STR_RIDE_CONSTRUCTION_STANDARD_RC_TRACK_TIP = 3062,
|
||||||
STR_RIDE_CONSTRUCTION_WATER_CHANNEL_TIP = 3063,
|
STR_RIDE_CONSTRUCTION_WATER_CHANNEL_TIP = 3063,
|
||||||
|
|
||||||
|
@ -1608,8 +1608,8 @@ enum {
|
||||||
STR_SPACE_ENTRANCE = 3089,
|
STR_SPACE_ENTRANCE = 3089,
|
||||||
|
|
||||||
STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP = 3090,
|
STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP = 3090,
|
||||||
|
|
||||||
STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION = 3091,
|
STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION = 3091,
|
||||||
STR_NOT_ALLOWED_TO_MODIFY_STATION = 3092,
|
STR_NOT_ALLOWED_TO_MODIFY_STATION = 3092,
|
||||||
|
|
||||||
STR_SELECT_LIFT_HILL_CHAIN_SPEED_TIP = 3097,
|
STR_SELECT_LIFT_HILL_CHAIN_SPEED_TIP = 3097,
|
||||||
|
@ -1774,7 +1774,7 @@ enum {
|
||||||
STR_CLIMATE_WARM = STR_CLIMATE_COOL_AND_WET + 1,
|
STR_CLIMATE_WARM = STR_CLIMATE_COOL_AND_WET + 1,
|
||||||
STR_CLIMATE_HOT_AND_DRY = STR_CLIMATE_COOL_AND_WET + 2,
|
STR_CLIMATE_HOT_AND_DRY = STR_CLIMATE_COOL_AND_WET + 2,
|
||||||
STR_CLIMATE_COLD = STR_CLIMATE_COOL_AND_WET + 3,
|
STR_CLIMATE_COLD = STR_CLIMATE_COOL_AND_WET + 3,
|
||||||
|
|
||||||
STR_CHANGE = 3294,
|
STR_CHANGE = 3294,
|
||||||
STR_CHANGE_NAME_OF_PARK_TIP = 3295,
|
STR_CHANGE_NAME_OF_PARK_TIP = 3295,
|
||||||
STR_CHANGE_NAME_OF_SCENARIO_TIP = 3296,
|
STR_CHANGE_NAME_OF_SCENARIO_TIP = 3296,
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -36,7 +36,7 @@ void user_string_clear_all()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* rct2: 0x006C421D
|
* rct2: 0x006C421D
|
||||||
*/
|
*/
|
||||||
rct_string_id user_string_allocate(int base, const utf8 *text)
|
rct_string_id user_string_allocate(int base, const utf8 *text)
|
||||||
|
@ -62,7 +62,7 @@ rct_string_id user_string_allocate(int base, const utf8 *text)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* rct2: 0x006C42AC
|
* rct2: 0x006C42AC
|
||||||
*/
|
*/
|
||||||
void user_string_free(rct_string_id id)
|
void user_string_free(rct_string_id id)
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue