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

(svn r2717) Move _userstring to strings.[ch]

This commit is contained in:
tron 2005-07-26 19:04:19 +00:00
parent 7e65f44168
commit a16418266e
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine.c
View File

@ -4,6 +4,8 @@
#include "openttd.h" #include "openttd.h"
#include "debug.h" #include "debug.h"
#include "functions.h" #include "functions.h"
#include "string.h"
#include "strings.h"
#include "table/strings.h" #include "table/strings.h"
#include "engine.h" #include "engine.h"
#include "table/engines.h" #include "table/engines.h"
@ -747,8 +749,7 @@ StringID GetCustomEngineName(int engine)
{ {
if (!_engine_custom_names[engine]) if (!_engine_custom_names[engine])
return _engine_name_strings[engine]; return _engine_name_strings[engine];
strncpy(_userstring, _engine_custom_names[engine], USERSTRING_LEN); ttd_strlcpy(_userstring, _engine_custom_names[engine], lengthof(_userstring));
_userstring[USERSTRING_LEN - 1] = '\0';
return STR_SPEC_USERSTRING; return STR_SPEC_USERSTRING;
} }

2
misc_gui.c
View File

@ -66,7 +66,7 @@ static void LandInfoWndProc(Window *w, WindowEvent *e)
} }
DrawStringCentered(140, 38, str, 0); 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(0, TileX(lid->tile));
SetDParam(1, TileY(lid->tile)); SetDParam(1, TileY(lid->tile));
SetDParam(2, STR_SPEC_USERSTRING); SetDParam(2, STR_SPEC_USERSTRING);

2
settings_gui.c
View File

@ -1199,7 +1199,7 @@ static void NewgrfWndProc(Window *w, WindowEvent *e)
// draw grf id // draw grf id
x = DrawString(5, 209, STR_NEWGRF_GRF_ID, 0); 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); DrawString(x + 2, 209, STR_SPEC_USERSTRING, 0x01);
} }
} break; } break;

2
strings.c
View File

@ -16,6 +16,8 @@
#include "industry.h" #include "industry.h"
#include "variables.h" #include "variables.h"
char _userstring[128];
static char *StationGetSpecialString(char *buff, int x); static char *StationGetSpecialString(char *buff, int x);
static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed); static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed);
static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv); static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv);

2
variables.h
View File

@ -440,8 +440,6 @@ extern const byte _airport_size_y[];
/* misc */ /* misc */
VARDEF char _screenshot_name[128]; VARDEF char _screenshot_name[128];
#define USERSTRING_LEN 128
VARDEF char _userstring[USERSTRING_LEN];
VARDEF byte _vehicle_design_names; VARDEF byte _vehicle_design_names;
/* tunnelbridge */ /* tunnelbridge */