From 1fe3ad3288fd2198f5480f75a17b707cd2a3c2af Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 5 Aug 2009 17:59:21 +0000 Subject: (svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives --- src/strings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/strings.cpp') diff --git a/src/strings.cpp b/src/strings.cpp index c4b4a7cc2..25c992e44 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -751,7 +751,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, * 8bit - cargo type * 16-bit - cargo count */ CargoID cargo = GetInt32(&argv); - StringID cargo_str = (cargo == CT_INVALID) ? STR_CARGO_N_A : CargoSpec::Get(cargo)->quantifier; + StringID cargo_str = (cargo == CT_INVALID) ? STR_QUANTITY_N_A : CargoSpec::Get(cargo)->quantifier; buff = GetStringWithArgs(buff, cargo_str, argv++, last); break; } @@ -864,7 +864,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, int64 temp[2]; temp[0] = wp->town->index; temp[1] = wp->town_cn + 1; - StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_BUOYNAME_CITY : STR_WAYPOINTNAME_CITY); + StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_FORMAT_BUOY_NAME : STR_FORMAT_WAYPOINT_NAME); if (wp->town_cn != 0) str++; buff = GetStringWithArgs(buff, str, temp, last); } @@ -995,7 +995,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, if (si->name != NULL) { buff = strecpy(buff, si->name, last); } else { - buff = GetStringWithArgs(buff, STR_SIGN_DEFAULT, NULL, last); + buff = GetStringWithArgs(buff, STR_DEFAULT_SIGN_NAME, NULL, last); } break; } -- cgit v1.2.3-54-g00ecf