diff options
| author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
| commit | a7d0cdf95fd8847ab76b35446e1c9b77f8ef1cb7 (patch) | |
| tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/strings.cpp | |
| parent | ce75f6549dd379b506c9f1e9383bd881aa7cf5c7 (diff) | |
| download | openttd-a7d0cdf95fd8847ab76b35446e1c9b77f8ef1cb7.tar.xz | |
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index d94674193..86a6709fc 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -22,6 +22,7 @@ #include "music.h" #include "date.h" #include "industry.h" +#include "helpers.hpp" #ifdef WIN32 /* for opendir/readdir/closedir */ @@ -751,7 +752,7 @@ static char* FormatString(char* buff, const char* str, const int32* argv, uint c // 8bit - cargo type // 16-bit - cargo count CargoID cargo = GetInt32(&argv); - StringID cargo_str = (cargo == CT_INVALID) ? STR_8838_N_A : _cargoc.names_long[cargo]; + StringID cargo_str = (cargo == CT_INVALID) ? (StringID)STR_8838_N_A : _cargoc.names_long[cargo]; buff = GetStringWithArgs(buff, cargo_str, argv++, last); break; } @@ -1139,7 +1140,7 @@ bool ReadLanguagePack(int lang_index) { char *lang = str_fmt("%s%s", _paths.lang_dir, _dynlang.ent[lang_index].file); - lang_pack = ReadFileToMem(lang, &len, 200000); + lang_pack = (LanguagePack*)ReadFileToMem(lang, &len, 200000); free(lang); } if (lang_pack == NULL) return false; @@ -1165,7 +1166,7 @@ bool ReadLanguagePack(int lang_index) } // Allocate offsets - langpack_offs = malloc(tot_count * sizeof(*langpack_offs)); + MallocT(&langpack_offs, tot_count); // Fill offsets s = lang_pack->data; @@ -1229,7 +1230,7 @@ static int GetLanguageList(char **languages, int max) if (dir != NULL) { while ((dirent = readdir(dir)) != NULL) { const char *d_name = FS2OTTD(dirent->d_name); - char *t = strrchr(d_name, '.'); + const char *t = strrchr(d_name, '.'); if (t != NULL && strcmp(t, ".lng") == 0) { languages[num++] = strdup(d_name); |