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

(svn r10316) -Codechange: (consistently) use index to refer to group names. Also the group string_id is irrelevant unless it is a custom name, so don't 'waste' a savegame string id.

This commit is contained in:
peter1138 2007-06-25 07:33:40 +00:00
parent d1805ed054
commit 74e34ee729
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/group_cmd.cpp
View File

@ -103,7 +103,7 @@ CommandCost CmdCreateGroup(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (flags & DC_EXEC) {
g->owner = _current_player;
g->string_id = STR_SV_GROUP_NAME;
g->string_id = STR_EMPTY;
g->replace_protection = false;
g->vehicle_type = vt;

8
src/group_gui.cpp
View File

@ -78,13 +78,13 @@ static int CDECL GroupNameSorter(const void *a, const void *b)
if (ga != last_group[0]) {
last_group[0] = ga;
SetDParam(0, ga->index);
GetString(last_name[0], ga->string_id, lastof(last_name[0]));
GetString(last_name[0], STR_GROUP_NAME, lastof(last_name[0]));
}
if (gb != last_group[1]) {
last_group[1] = gb;
SetDParam(0, gb->index);
GetString(last_name[1], gb->string_id, lastof(last_name[1]));
GetString(last_name[1], STR_GROUP_NAME, lastof(last_name[1]));
}
r = strcmp(last_name[0], last_name[1]); // sort by name
@ -420,7 +420,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
/* draw the selected group in white, else we draw it in black */
SetDParam(0, g->index);
DrawString(10, y1, STR_SV_GROUP_NAME, (gv->group_sel == g->index) ? 12 : 16);
DrawString(10, y1, STR_GROUP_NAME, (gv->group_sel == g->index) ? 12 : 16);
/* draw the number of vehicles of the group */
SetDParam(0, g->num_vehicle);
@ -567,7 +567,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
const Group *g = GetGroup(gv->group_sel);
SetDParam(0, g->index);
ShowQueryString(g->string_id, STR_GROUP_RENAME_CAPTION, 31, 150, w, CS_ALPHANUMERAL);
ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, 31, 150, w, CS_ALPHANUMERAL);
} break;

3
src/lang/english.txt
View File

@ -2083,8 +2083,6 @@ STR_SV_STNAME_LOWER :Lower {STRING1}
STR_SV_STNAME_HELIPORT :{STRING1} Heliport
STR_SV_STNAME_FOREST :{STRING1} Forest
STR_SV_GROUP_NAME :{GROUP}
############ end of savegame specific region!
##id 0x6800
@ -3340,6 +3338,7 @@ STR_PROFIT_BAD_THIS_YEAR_GOOD_LAST_YEAR :{TINYFONT}{BLAC
STR_PROFIT_GOOD_THIS_YEAR_BAD_LAST_YEAR :{TINYFONT}{BLACK}Profit this year: {GREEN}{CURRENCY} {BLACK}(last year: {RED}{CURRENCY}{BLACK})
STR_PROFIT_BAD_THIS_YEAR_BAD_LAST_YEAR :{TINYFONT}{BLACK}Profit this year: {RED}{CURRENCY} {BLACK}(last year: {RED}{CURRENCY}{BLACK})
STR_GROUP_NAME :{GROUP}
STR_VEHICLE_NAME :{VEHICLE}
########

2
src/strings.cpp
View File

@ -857,7 +857,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
assert(IsValidGroup(g));
args[0] = g->index;
buff = GetStringWithArgs(buff, (g->string_id == STR_SV_GROUP_NAME) ? (StringID)STR_GROUP_NAME_FORMAT : g->string_id, args, last);
buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : (StringID)STR_GROUP_NAME_FORMAT, args, last);
break;
}