summaryrefslogtreecommitdiff
path: root/src/game/game_text.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/game_text.cpp')
-rw-r--r--src/game/game_text.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index 944bf82d1..bde2a5a69 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -63,11 +63,11 @@ void NORETURN CDECL strgen_fatal(const char *s, ...)
/**
* Create a new container for language strings.
* @param language The language name.
- * @param end If not NULL, terminate \a language at this position.
+ * @param end If not nullptr, terminate \a language at this position.
*/
LanguageStrings::LanguageStrings(const char *language, const char *end)
{
- this->language = stredup(language, end != NULL ? end - 1 : NULL);
+ this->language = stredup(language, end != nullptr ? end - 1 : nullptr);
}
/** Free everything. */
@@ -79,31 +79,31 @@ LanguageStrings::~LanguageStrings()
/**
* Read all the raw language strings from the given file.
* @param file The file to read from.
- * @return The raw strings, or NULL upon error.
+ * @return The raw strings, or nullptr upon error.
*/
std::unique_ptr<LanguageStrings> ReadRawLanguageStrings(const char *file)
{
try {
size_t to_read;
FILE *fh = FioFOpenFile(file, "rb", GAME_DIR, &to_read);
- if (fh == NULL) return NULL;
+ if (fh == nullptr) return nullptr;
FileCloser fhClose(fh);
const char *langname = strrchr(file, PATHSEPCHAR);
- if (langname == NULL) {
+ if (langname == nullptr) {
langname = file;
} else {
langname++;
}
/* Check for invalid empty filename */
- if (*langname == '.' || *langname == 0) return NULL;
+ if (*langname == '.' || *langname == 0) return nullptr;
std::unique_ptr<LanguageStrings> ret(new LanguageStrings(langname, strchr(langname, '.')));
char buffer[2048];
- while (to_read != 0 && fgets(buffer, sizeof(buffer), fh) != NULL) {
+ while (to_read != 0 && fgets(buffer, sizeof(buffer), fh) != nullptr) {
size_t len = strlen(buffer);
/* Remove trailing spaces/newlines from the string. */
@@ -122,7 +122,7 @@ std::unique_ptr<LanguageStrings> ReadRawLanguageStrings(const char *file)
return ret;
} catch (...) {
- return NULL;
+ return nullptr;
}
}
@@ -146,7 +146,7 @@ struct StringListReader : StringReader {
char *ReadLine(char *buffer, const char *last) override
{
- if (this->p == this->end) return NULL;
+ if (this->p == this->end) return nullptr;
strecpy(buffer, this->p->c_str(), last);
this->p++;
@@ -237,7 +237,7 @@ public:
if (strcmp(filename, exclude) == 0) return true;
auto ls = ReadRawLanguageStrings(filename);
- if (ls == NULL) return false;
+ if (ls == nullptr) return false;
gs->raw_strings.push_back(std::move(ls));
return true;
@@ -254,14 +254,14 @@ GameStrings *LoadTranslations()
char filename[512];
strecpy(filename, info->GetMainScript(), lastof(filename));
char *e = strrchr(filename, PATHSEPCHAR);
- if (e == NULL) return NULL;
+ if (e == nullptr) return nullptr;
e++; // Make 'e' point after the PATHSEPCHAR
strecpy(e, "lang" PATHSEP "english.txt", lastof(filename));
- if (!FioCheckFileExists(filename, GAME_DIR)) return NULL;
+ if (!FioCheckFileExists(filename, GAME_DIR)) return nullptr;
auto ls = ReadRawLanguageStrings(filename);
- if (ls == NULL) return NULL;
+ if (ls == nullptr) return nullptr;
GameStrings *gs = new GameStrings();
try {
@@ -274,7 +274,7 @@ GameStrings *LoadTranslations()
const char *tar_filename = info->GetTarFile();
TarList::iterator iter;
- if (tar_filename != NULL && (iter = _tar_list[GAME_DIR].find(tar_filename)) != _tar_list[GAME_DIR].end()) {
+ if (tar_filename != nullptr && (iter = _tar_list[GAME_DIR].find(tar_filename)) != _tar_list[GAME_DIR].end()) {
/* The main script is in a tar file, so find all files that
* are in the same tar and add them to the langfile scanner. */
TarFileList::iterator tar;
@@ -297,7 +297,7 @@ GameStrings *LoadTranslations()
return gs;
} catch (...) {
delete gs;
- return NULL;
+ return nullptr;
}
}
@@ -327,7 +327,7 @@ void GameStrings::Compile()
}
/** The currently loaded game strings. */
-GameStrings *_current_data = NULL;
+GameStrings *_current_data = nullptr;
/**
* Get the string pointer of a particular game string.
@@ -348,7 +348,7 @@ void RegisterGameTranslation(Squirrel *engine)
{
delete _current_data;
_current_data = LoadTranslations();
- if (_current_data == NULL) return;
+ if (_current_data == nullptr) return;
HSQUIRRELVM vm = engine->GetVM();
sq_pushroottable(vm);
@@ -373,19 +373,19 @@ void RegisterGameTranslation(Squirrel *engine)
*/
void ReconsiderGameScriptLanguage()
{
- if (_current_data == NULL) return;
+ if (_current_data == nullptr) return;
char temp[MAX_PATH];
strecpy(temp, _current_language->file, lastof(temp));
/* Remove the extension */
char *l = strrchr(temp, '.');
- assert(l != NULL);
+ assert(l != nullptr);
*l = '\0';
/* Skip the path */
char *language = strrchr(temp, PATHSEPCHAR);
- assert(language != NULL);
+ assert(language != nullptr);
language++;
for (auto &p : _current_data->compiled_strings) {