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

(svn r1832) Next byte -> char iteration: custom names

This commit is contained in:
tron 2005-02-06 20:53:31 +00:00
parent cc8fc19d4a
commit 27dc506a03
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine.c
View File

@ -816,7 +816,7 @@ int32 CmdRenameEngine(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{ {
StringID str; StringID str;
str = AllocateNameUnique((byte*)_decode_parameters, 0); str = AllocateNameUnique((const char*)_decode_parameters, 0);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;

4
functions.h
View File

@ -159,13 +159,13 @@ void InitializeLandscapeVariables(bool only_constants);
/* misc.c */ /* misc.c */
void DeleteName(StringID id); void DeleteName(StringID id);
byte *GetName(int id, byte *buff); char *GetName(int id, char *buff);
// AllocateNameUnique also tests if the name used is not used anywere else // AllocateNameUnique also tests if the name used is not used anywere else
// and if it is used, it returns an error. // and if it is used, it returns an error.
#define AllocateNameUnique(name, skip) RealAllocateName(name, skip, true) #define AllocateNameUnique(name, skip) RealAllocateName(name, skip, true)
#define AllocateName(name, skip) RealAllocateName(name, skip, false) #define AllocateName(name, skip) RealAllocateName(name, skip, false)
StringID RealAllocateName(const byte *name, byte skip, bool check_double); StringID RealAllocateName(const char *name, byte skip, bool check_double);
void ConvertDayToYMD(YearMonthDay *ymd, uint16 date); void ConvertDayToYMD(YearMonthDay *ymd, uint16 date);
uint ConvertYMDToDay(uint year, uint month, uint day); uint ConvertYMDToDay(uint year, uint month, uint day);
uint ConvertIntDate(uint date); uint ConvertIntDate(uint date);

14
misc.c
View File

@ -15,7 +15,7 @@
extern void StartupEconomy(void); extern void StartupEconomy(void);
extern void InitNewsItemStructs(void); extern void InitNewsItemStructs(void);
byte _name_array[512][32]; char _name_array[512][32];
static inline uint32 ROR(uint32 x, int n) static inline uint32 ROR(uint32 x, int n)
{ {
@ -306,9 +306,9 @@ void DeleteName(StringID id)
} }
} }
byte *GetName(int id, byte *buff) char *GetName(int id, char *buff)
{ {
byte *b; const char *b;
if (id & 0x600) { if (id & 0x600) {
if (id & 0x200) { if (id & 0x200) {
@ -341,11 +341,11 @@ static void InitializeNameMgr(void)
memset(_name_array, 0, sizeof(_name_array)); memset(_name_array, 0, sizeof(_name_array));
} }
StringID RealAllocateName(const byte *name, byte skip, bool check_double) StringID RealAllocateName(const char *name, byte skip, bool check_double)
{ {
int free_item = -1; int free_item = -1;
const byte *names; const char *names;
byte *dst; char *dst;
int i; int i;
names = &_name_array[0][0]; names = &_name_array[0][0];
@ -744,7 +744,7 @@ void bubblesort(void *base, size_t nmemb, size_t size, int(*compar)(const void *
static void Save_NAME(void) static void Save_NAME(void)
{ {
int i; int i;
byte *b = _name_array[0]; char *b = _name_array[0];
for(i=0; i!=lengthof(_name_array); i++,b+=sizeof(_name_array[0])) { for(i=0; i!=lengthof(_name_array); i++,b+=sizeof(_name_array[0])) {
if (*b) { if (*b) {

4
misc_cmd.c
View File

@ -126,7 +126,7 @@ int32 CmdChangeCompanyName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str,old_str; StringID str,old_str;
Player *p; Player *p;
str = AllocateNameUnique((byte*)_decode_parameters, 4); str = AllocateNameUnique((const char*)_decode_parameters, 4);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;
@ -148,7 +148,7 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str,old_str; StringID str,old_str;
Player *p; Player *p;
str = AllocateNameUnique((byte*)_decode_parameters, 4); str = AllocateNameUnique((const char*)_decode_parameters, 4);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;

10
network_gui.c
View File

@ -275,22 +275,22 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
DeleteName(_str_server_version); DeleteName(_str_server_version);
DeleteName(_str_server_address); DeleteName(_str_server_address);
if (_selected_item->info.server_name[0] != '\0') if (_selected_item->info.server_name[0] != '\0')
_str_game_name = AllocateName((byte*) _selected_item->info.server_name, 0); _str_game_name = AllocateName(_selected_item->info.server_name, 0);
else else
_str_game_name = STR_EMPTY; _str_game_name = STR_EMPTY;
if (_selected_item->info.map_name[0] != '\0') if (_selected_item->info.map_name[0] != '\0')
_str_map_name = AllocateName((byte*) _selected_item->info.map_name, 0); _str_map_name = AllocateName(_selected_item->info.map_name, 0);
else else
_str_map_name = STR_EMPTY; _str_map_name = STR_EMPTY;
if (_selected_item->info.server_revision[0] != '\0') if (_selected_item->info.server_revision[0] != '\0')
_str_server_version = AllocateName((byte*) _selected_item->info.server_revision, 0); _str_server_version = AllocateName(_selected_item->info.server_revision, 0);
else else
_str_server_version = STR_EMPTY; _str_server_version = STR_EMPTY;
if (_selected_item->info.hostname[0] != '\0') if (_selected_item->info.hostname[0] != '\0')
_str_server_address = AllocateName((byte*) _selected_item->info.hostname, 0); _str_server_address = AllocateName(_selected_item->info.hostname, 0);
else else
_str_server_address = STR_EMPTY; _str_server_address = STR_EMPTY;
} }
@ -303,7 +303,7 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
} }
break; break;
case 12: { // Add a server case 12: { // Add a server
StringID str = AllocateName((byte*)_network_default_ip, 0); StringID str = AllocateName(_network_default_ip, 0);
ShowQueryString( ShowQueryString(
str, str,

2
oldloader.c
View File

@ -462,7 +462,7 @@ static void FixOldVehicles(void)
#define REMAP_ORDER_IDX(x) ((x) - (0x045AB08 - 0x0458EF0)) / 2 #define REMAP_ORDER_IDX(x) ((x) - (0x045AB08 - 0x0458EF0)) / 2
extern TileIndex _animated_tile_list[256]; extern TileIndex _animated_tile_list[256];
extern byte _name_array[512][32]; extern char _name_array[512][32];
extern uint16 _custom_sprites_base; extern uint16 _custom_sprites_base;
static byte _old_vehicle_multipler; static byte _old_vehicle_multipler;

2
rail_cmd.c
View File

@ -840,7 +840,7 @@ int32 CmdRenameWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str; StringID str;
if (_decode_parameters[0] != 0) { if (_decode_parameters[0] != 0) {
str = AllocateNameUnique((byte*)_decode_parameters, 0); str = AllocateNameUnique((const char*)_decode_parameters, 0);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

2
signs.c
View File

@ -132,7 +132,7 @@ int32 CmdRenameSign(int x, int y, uint32 flags, uint32 sign_id, uint32 owner)
/* If GetDParam(0) == nothing, we delete the sign */ /* If GetDParam(0) == nothing, we delete the sign */
if (GetDParam(0) != 0 && owner != OWNER_NONE) { if (GetDParam(0) != 0 && owner != OWNER_NONE) {
/* Create the name */ /* Create the name */
str = AllocateName((byte*)_decode_parameters, 0); str = AllocateName((const char*)_decode_parameters, 0);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;

2
station_cmd.c
View File

@ -2652,7 +2652,7 @@ int32 CmdRenameStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str,old_str; StringID str,old_str;
Station *st; Station *st;
str = AllocateNameUnique((byte*)_decode_parameters, 6); str = AllocateNameUnique((const char*)_decode_parameters, 6);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;

2
town_cmd.c
View File

@ -1395,7 +1395,7 @@ int32 CmdRenameTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str; StringID str;
Town *t = GetTown(p1); Town *t = GetTown(p1);
str = AllocateNameUnique((byte*)_decode_parameters, 4); str = AllocateNameUnique((const char*)_decode_parameters, 4);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;

2
vehicle.c
View File

@ -1612,7 +1612,7 @@ int32 CmdNameVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(v->owner)) if (!CheckOwnership(v->owner))
return CMD_ERROR; return CMD_ERROR;
str = AllocateNameUnique((byte*)_decode_parameters, 2); str = AllocateNameUnique((const char*)_decode_parameters, 2);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;