mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Ted John 2015-09-10 12:37:03 +01:00
parent 85bbdde056 17e635b8af
commit f516028413
14 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/localisation/LanguagePack.cpp
View File

@ -18,7 +18,7 @@ constexpr int ScenarioOverrideMaxStringCount = 3;
LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
{
assert(path != NULL);
assert(path != nullptr);
uint32 fileLength;
utf8 *fileData;
@ -34,7 +34,7 @@ LanguagePack *LanguagePack::FromFile(int id, const utf8 *path)
fs.Dispose();
} catch (Exception ex) {
log_error("Unable to open %s: %s", path, ex.GetMessage());
return NULL;
return nullptr;
}
// Parse the memory as text
@ -51,13 +51,13 @@ LanguagePack *LanguagePack::FromText(int id, const utf8 *text)
LanguagePack::LanguagePack(int id, const utf8 *text)
{
assert(text != NULL);
assert(text != nullptr);
_id = id;
_stringData = NULL;
_currentGroup = NULL;
_currentObjectOverride = NULL;
_currentScenarioOverride = NULL;
_stringData = nullptr;
_currentGroup = nullptr;
_currentObjectOverride = nullptr;
_currentScenarioOverride = nullptr;
auto reader = UTF8StringReader(text);
while (reader.CanRead()) {
@ -73,7 +73,7 @@ LanguagePack::LanguagePack(int id, const utf8 *text)
for (size_t i = 0; i < _objectOverrides.size(); i++) {
for (int j = 0; j < ObjectOverrideMaxStringCount; j++) {
const utf8 **strPtr = &(_objectOverrides[i].strings[j]);
if (*strPtr != NULL) {
if (*strPtr != nullptr) {
*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 (int j = 0; j < ScenarioOverrideMaxStringCount; j++) {
const utf8 **strPtr = &(_scenarioOverrides[i].strings[j]);
if (*strPtr != NULL) {
if (*strPtr != nullptr) {
*strPtr = (utf8*)(stringDataBaseAddress + (size_t)*strPtr);
}
}
@ -106,7 +106,7 @@ const utf8 *LanguagePack::GetString(int stringId) const {
if (_scenarioOverrides.size() > (size_t)ooIndex) {
return _scenarioOverrides[ooIndex].strings[ooStringIndex];
} else {
return NULL;
return nullptr;
}
}else if (stringId >= ObjectOverrideBase) {
int offset = stringId - ObjectOverrideBase;
@ -116,26 +116,26 @@ const utf8 *LanguagePack::GetString(int stringId) const {
if (_objectOverrides.size() > (size_t)ooIndex) {
return _objectOverrides[ooIndex].strings[ooStringIndex];
} else {
return NULL;
return nullptr;
}
} else {
if (_strings.size() > (size_t)stringId) {
return _strings[stringId];
} else {
return NULL;
return nullptr;
}
}
}
rct_string_id LanguagePack::GetObjectOverrideStringId(const char *objectIdentifier, int index)
{
assert(objectIdentifier != NULL);
assert(objectIdentifier != nullptr);
assert(index < ObjectOverrideMaxStringCount);
int ooIndex = 0;
for (const ObjectOverride &objectOverride : _objectOverrides) {
if (strncmp(objectOverride.name, objectIdentifier, 8) == 0) {
if (objectOverride.strings[index] == NULL) {
if (objectOverride.strings[index] == nullptr) {
return STR_NONE;
}
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)
{
assert(scenarioFilename != NULL);
assert(scenarioFilename != nullptr);
assert(index < ScenarioOverrideMaxStringCount);
int ooIndex = 0;
for (const ScenarioOverride &scenarioOverride : _scenarioOverrides) {
if (_stricmp(scenarioOverride.filename, scenarioFilename) == 0) {
if (scenarioOverride.strings[index] == NULL) {
if (scenarioOverride.strings[index] == nullptr) {
return STR_NONE;
}
return ScenarioOverrideBase + (ooIndex * ScenarioOverrideMaxStringCount) + index;
@ -167,7 +167,7 @@ rct_string_id LanguagePack::GetScenarioOverrideStringId(const utf8 *scenarioFile
LanguagePack::ObjectOverride *LanguagePack::GetObjectOverride(const char *objectIdentifier)
{
assert(objectIdentifier != NULL);
assert(objectIdentifier != nullptr);
for (size_t i = 0; i < _objectOverrides.size(); i++) {
ObjectOverride *oo = &_objectOverrides[i];
@ -175,12 +175,12 @@ LanguagePack::ObjectOverride *LanguagePack::GetObjectOverride(const char *object
return oo;
}
}
return false;
return nullptr;
}
LanguagePack::ScenarioOverride *LanguagePack::GetScenarioOverride(const utf8 *scenarioIdentifier)
{
assert(scenarioIdentifier != NULL);
assert(scenarioIdentifier != nullptr);
for (size_t i = 0; i < _scenarioOverrides.size(); i++) {
ScenarioOverride *so = &_scenarioOverrides[i];
@ -188,7 +188,7 @@ LanguagePack::ScenarioOverride *LanguagePack::GetScenarioOverride(const utf8 *sc
return so;
}
}
return false;
return nullptr;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -310,8 +310,8 @@ void LanguagePack::ParseGroupObject(IStringReader *reader)
if (sb.GetLength() == 8) {
_currentGroup = sb.GetString();
_currentObjectOverride = GetObjectOverride(_currentGroup);
_currentScenarioOverride = NULL;
if (_currentObjectOverride == NULL) {
_currentScenarioOverride = nullptr;
if (_currentObjectOverride == nullptr) {
_objectOverrides.push_back(ObjectOverride());
_currentObjectOverride = &_objectOverrides[_objectOverrides.size() - 1];
memset(_currentObjectOverride, 0, sizeof(ObjectOverride));
@ -346,9 +346,9 @@ void LanguagePack::ParseGroupScenario(IStringReader *reader)
SafeFree(_currentGroup);
_currentGroup = sb.GetString();
_currentObjectOverride = NULL;
_currentObjectOverride = nullptr;
_currentScenarioOverride = GetScenarioOverride(_currentGroup);
if (_currentScenarioOverride == NULL) {
if (_currentScenarioOverride == nullptr) {
_scenarioOverrides.push_back(ScenarioOverride());
_currentScenarioOverride = &_scenarioOverrides[_scenarioOverrides.size() - 1];
memset(_currentScenarioOverride, 0, sizeof(ObjectOverride));
@ -388,7 +388,7 @@ void LanguagePack::ParseString(IStringReader *reader)
const utf8 *identifier = sb.GetBuffer();
int stringId;
if (_currentGroup == NULL) {
if (_currentGroup == nullptr) {
if (sscanf(identifier, "STR_%4d", &stringId) != 1) {
// Ignore line entirely
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)
utf8 *relativeOffset = (utf8*)_stringDataSB.GetLength();
if (_currentGroup == NULL) {
if (_currentGroup == nullptr) {
// Make sure the list is big enough to contain this string id
while (_strings.size() <= (size_t)stringId) {
_strings.push_back(NULL);
_strings.push_back(nullptr);
}
_strings[stringId] = relativeOffset;
} else {
if (_currentObjectOverride != NULL) {
if (_currentObjectOverride != nullptr) {
_currentObjectOverride->strings[stringId] = relativeOffset;
} else {
_currentScenarioOverride->strings[stringId] = relativeOffset;

48
src/localisation/language.cpp
View File

@ -48,24 +48,24 @@ enum {
};
static TTFFontSetDescriptor TTFFontMingLiu = {{
{ "msjh.ttc", 9, -1, -3, 6, NULL },
{ "mingliu.ttc", 11, 1, 1, 12, NULL },
{ "mingliu.ttc", 12, 1, 0, 12, NULL },
{ "mingliu.ttc", 13, 1, 0, 20, NULL },
{ "msjh.ttc", 9, -1, -3, 6, nullptr },
{ "mingliu.ttc", 11, 1, 1, 12, nullptr },
{ "mingliu.ttc", 12, 1, 0, 12, nullptr },
{ "mingliu.ttc", 13, 1, 0, 20, nullptr },
}};
static TTFFontSetDescriptor TTFFontSimSun = {{
{ "msyh.ttc", 9, -1, -3, 6, NULL },
{ "simsun.ttc", 11, 1, -1, 14, NULL },
{ "simsun.ttc", 12, 1, -2, 14, NULL },
{ "simsun.ttc", 13, 1, 0, 20, NULL },
{ "msyh.ttc", 9, -1, -3, 6, nullptr },
{ "simsun.ttc", 11, 1, -1, 14, nullptr },
{ "simsun.ttc", 12, 1, -2, 14, nullptr },
{ "simsun.ttc", 13, 1, 0, 20, nullptr },
}};
static TTFFontSetDescriptor TTFFontMalgun = { {
{ "malgun.ttf", 8, -1, -3, 6, NULL },
{ "malgun.ttf", 11, 1, -2, 14, NULL },
{ "malgun.ttf", 12, 1, -4, 14, NULL },
{ "malgun.ttf", 13, 1, 0, 20, NULL },
{ "malgun.ttf", 8, -1, -3, 6, nullptr },
{ "malgun.ttf", 11, 1, -2, 14, nullptr },
{ "malgun.ttf", 12, 1, -4, 14, nullptr },
{ "malgun.ttf", 13, 1, 0, 20, nullptr },
} };
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 *openrctString = NULL;
const char *openrctString = nullptr;
if (id == (rct_string_id)STR_NONE)
return NULL;
return nullptr;
if (_languageCurrent != nullptr)
openrctString = _languageCurrent->GetString(id);
if (openrctString == NULL && _languageFallback != nullptr)
if (openrctString == nullptr && _languageFallback != nullptr)
openrctString = _languageFallback->GetString(id);
if (id >= STR_OPENRCT2_BEGIN_STRING_ID) {
return openrctString != NULL ? openrctString : "(undefined string)";
return openrctString != nullptr ? openrctString : "(undefined string)";
} else {
const char *rct = _languageOriginal[id];
const char *str = (openrctString == NULL || strlen(openrctString) == 0 ? rct : openrctString);
return str == NULL ? "" : str;
const char *str = (openrctString == nullptr || strlen(openrctString) == 0 ? rct : openrctString);
return str == nullptr ? "" : str;
}
}
@ -151,13 +151,13 @@ int language_open(int id)
sprintf(filename, languagePath, gExePath, LanguagesDescriptors[id].path);
_languageCurrent = LanguagePack::FromFile(id, filename);
if (_languageCurrent != NULL) {
if (_languageCurrent != nullptr) {
gCurrentLanguage = id;
if (LanguagesDescriptors[id].font == FONT_OPENRCT2_SPRITE) {
ttf_dispose();
gUseTrueTypeFont = false;
gCurrentTTFFontSet = NULL;
gCurrentTTFFontSet = nullptr;
} else {
ttf_dispose();
gUseTrueTypeFont = true;
@ -187,7 +187,7 @@ void language_close_all()
/* rct2: 0x0098DA16 */
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)
{
@ -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*/)
{
uint8 languageId, chosenLanguageId;
char *pString = NULL;
char *pString = nullptr;
int result = 0;
bool isBlank;
@ -344,7 +344,7 @@ rct_string_id object_get_localised_text(uint8_t** pStringTable/*ebp*/, int type/
// cache UTF-8 string
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
if (*cacheString != NULL) {
if (*cacheString != nullptr) {
free(*cacheString);
}
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
int cacheStringOffset = stringid - STEX_BASE_STRING_ID;
utf8 **cacheString = &_cachedObjectStrings[cacheStringOffset];
if (*cacheString != NULL) {
if (*cacheString != nullptr) {
free(*cacheString);
}
if (rct2_language_is_multibyte_charset(chosenLanguageId)) {