File diff r4119:8371e9345f83 → r4120:a593e0a0559d
strings.c
Show inline comments
 
@@ -15,12 +15,13 @@
 
#include "screenshot.h"
 
#include "waypoint.h"
 
#include "industry.h"
 
#include "variables.h"
 
#include "newgrf_text.h"
 
#include "table/landscape_const.h"
 
#include "music.h"
 

	
 
char _userstring[128];
 

	
 
static char *StationGetSpecialString(char *buff, int x);
 
static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed);
 
static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv);
 
@@ -1012,37 +1013,12 @@ static char *GenPresidentName(char *buff
 

	
 
	buff = strecpy(buff, base[num * GB(x, 16, 8) >> 8], NULL);
 

	
 
	return buff;
 
}
 

	
 
static const char * const _song_names[] = {
 
	"Tycoon DELUXE Theme",
 
	"Easy Driver",
 
	"Little Red Diesel",
 
	"Cruise Control",
 
	"Don't Walk!",
 
	"Fell Apart On Me",
 
	"City Groove",
 
	"Funk Central",
 
	"Stoke It",
 
	"Road Hog",
 
	"Aliens Ate My Railway",
 
	"Snarl Up",
 
	"Stroll On",
 
	"Can't Get There From Here",
 
	"Sawyer's Tune",
 
	"Hold That Train!",
 
	"Movin' On",
 
	"Goss Groove",
 
	"Small Town",
 
	"Broomer's Oil Rag",
 
	"Jammit",
 
	"Hard Drivin'"
 
};
 

	
 
static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv)
 
{
 
	switch (ind) {
 
		case 1: // not used
 
			return strecpy(buff, _silly_company_names[GetInt32(&argv) & 0xFFFF], NULL);
 

	
 
@@ -1050,13 +1026,13 @@ static char *GetSpecialPlayerNameString(
 
			return GenAndCoName(buff, GetInt32(&argv));
 

	
 
		case 3: // President name
 
			return GenPresidentName(buff, GetInt32(&argv));
 

	
 
		case 4: // song names
 
			return strecpy(buff, _song_names[GetInt32(&argv) - 1], NULL);
 
			return strecpy(buff, origin_songs_specs[GetInt32(&argv) - 1].song_name, NULL);
 
	}
 

	
 
	// town name?
 
	if (IS_INT_INSIDE(ind - 6, 0, SPECSTR_TOWNNAME_LAST-SPECSTR_TOWNNAME_START + 1)) {
 
		buff = GetSpecialTownNameString(buff, ind - 6, GetInt32(&argv));
 
		return strecpy(buff, " Transport", NULL);