(svn r6930) -Codechange: Move industry name into IndustrySpec

-Codechange: member color_map is more related to random color, rename it as such
This commit is contained in:
belugas
2006-10-24 19:19:25 +00:00
parent acbdd24f2f
commit f48c419467
6 changed files with 54 additions and 14 deletions

View File

@@ -20,6 +20,7 @@
#include "table/landscape_const.h"
#include "music.h"
#include "date.h"
#include "industry.h"
#ifdef WIN32
/* for opendir/readdir/closedir */
@@ -697,7 +698,7 @@ static char* FormatString(char* buff, const char* str, const int32* argv, uint c
// First print the town name and the industry type name
// The string STR_INDUSTRY_PATTERN controls the formatting
args[0] = i->town->index;
args[1] = i->type + STR_4802_COAL_MINE;
args[1] = GetIndustrySpec(i->type)->name;
buff = FormatString(buff, GetStringPtr(STR_INDUSTRY_FORMAT), args, modifier >> 24, last);
modifier = 0;
break;