Mercurial > hg > openttd
changeset 2201:f68e7c954f8d draft
(svn r2717) Move _userstring to strings.[ch]
author | tron <tron@openttd.org> |
---|---|
date | Tue, 26 Jul 2005 19:04:19 +0000 |
parents | 0a3132956869 |
children | 9a025664b288 |
files | engine.c misc_gui.c settings_gui.c strings.c variables.h |
diffstat | 5 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/engine.c +++ b/engine.c @@ -4,6 +4,8 @@ #include "openttd.h" #include "debug.h" #include "functions.h" +#include "string.h" +#include "strings.h" #include "table/strings.h" #include "engine.h" #include "table/engines.h" @@ -747,8 +749,7 @@ { if (!_engine_custom_names[engine]) return _engine_name_strings[engine]; - strncpy(_userstring, _engine_custom_names[engine], USERSTRING_LEN); - _userstring[USERSTRING_LEN - 1] = '\0'; + ttd_strlcpy(_userstring, _engine_custom_names[engine], lengthof(_userstring)); return STR_SPEC_USERSTRING; }
--- a/misc_gui.c +++ b/misc_gui.c @@ -66,7 +66,7 @@ } DrawStringCentered(140, 38, str, 0); - snprintf(_userstring, USERSTRING_LEN, "%.4X", lid->tile); + snprintf(_userstring, lengthof(_userstring), "%.4X", lid->tile); SetDParam(0, TileX(lid->tile)); SetDParam(1, TileY(lid->tile)); SetDParam(2, STR_SPEC_USERSTRING);
--- a/settings_gui.c +++ b/settings_gui.c @@ -1199,7 +1199,7 @@ // draw grf id x = DrawString(5, 209, STR_NEWGRF_GRF_ID, 0); - snprintf(_userstring, USERSTRING_LEN, "%08X", _sel_grffile->grfid); + snprintf(_userstring, lengthof(_userstring), "%08X", _sel_grffile->grfid); DrawString(x + 2, 209, STR_SPEC_USERSTRING, 0x01); } } break;
--- a/strings.c +++ b/strings.c @@ -16,6 +16,8 @@ #include "industry.h" #include "variables.h" +char _userstring[128]; + static char *StationGetSpecialString(char *buff, int x); static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed); static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv);