File diff r12410:4bb7a12b2f71 → r12411:4ac6b3dd713f
src/strings.cpp
Show inline comments
 
@@ -852,25 +852,25 @@ static char *FormatString(char *buff, co
 
				buff = FormatGenericCurrency(buff, _currency, GetInt64(&argv), false, last);
 
				break;
 

	
 
			case SCC_WAYPOINT_NAME: { // {WAYPOINT}
 
				Waypoint *wp = Waypoint::Get(GetInt32(&argv));
 

	
 
				assert(wp != NULL);
 

	
 
				if (wp->name != NULL) {
 
					buff = strecpy(buff, wp->name, last);
 
				} else {
 
					int64 temp[2];
 
					temp[0] = wp->town_index;
 
					temp[0] = wp->town->index;
 
					temp[1] = wp->town_cn + 1;
 
					StringID str = wp->town_cn == 0 ? STR_WAYPOINTNAME_CITY : STR_WAYPOINTNAME_CITY_SERIAL;
 

	
 
					buff = GetStringWithArgs(buff, str, temp, last);
 
				}
 
				break;
 
			}
 

	
 
			case SCC_STATION_NAME: { // {STATION}
 
				StationID sid = GetInt32(&argv);
 
				const Station *st = Station::GetIfValid(sid);