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

(svn r5512) Fix : Remove a warning on MakeItalianTownName. 

While at it, adjust the different parts of the generator.
Now, masculin is not linked to generic suffix, 
and feminin is not linked to river-name suffix
This commit is contained in:
belugas 2006-07-17 20:27:17 +00:00
parent c76b718e36
commit 507cc6146e
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
namegen.c
View File

@ -647,45 +647,42 @@ static byte MakeTurkishTownName(char *buf, uint32 seed)
return 0; return 0;
} }
static const char *mascul_femin_italian[] = {
"o",
"a",
};
static byte MakeItalianTownName(char *buf, uint32 seed) { static byte MakeItalianTownName(char *buf, uint32 seed) {
byte i;
char *c;
strcpy(buf, ""); strcpy(buf, "");
if (SeedModChance(0, 6, seed) == 0) { if (SeedModChance(0, 6, seed) == 0) { // real city names
// real city names
strcat(buf, name_italian_real[SeedModChance(4, lengthof(name_italian_real), seed)]); strcat(buf, name_italian_real[SeedModChance(4, lengthof(name_italian_real), seed)]);
} else { } else {
if (SeedModChance(0, 8, seed) == 0) { uint i;
// prefix
if (SeedModChance(0, 8, seed) == 0) { // prefix
strcat(buf, name_italian_pref[SeedModChance(11, lengthof(name_italian_pref), seed)]); strcat(buf, name_italian_pref[SeedModChance(11, lengthof(name_italian_pref), seed)]);
} }
i = SeedModChance(0, 2, seed); i = SeedChance(0, 2, seed);
if (i == 0) { // masculine form if (i == 0) { // masculine form
strcat(buf, name_italian_1m[SeedModChance(4, lengthof(name_italian_1m), seed)]); strcat(buf, name_italian_1m[SeedModChance(4, lengthof(name_italian_1m), seed)]);
c = "o"; } else { // feminine form
} else { // femminine form
strcat(buf, name_italian_1f[SeedModChance(4, lengthof(name_italian_1f), seed)]); strcat(buf, name_italian_1f[SeedModChance(4, lengthof(name_italian_1f), seed)]);
c = "a";
} }
if (SeedModChance(0, 3, seed) == 0) { if (SeedModChance(3, 3, seed) == 0) {
strcat(buf, name_italian_2[SeedModChance(11, lengthof(name_italian_2), seed)]); strcat(buf, name_italian_2[SeedModChance(11, lengthof(name_italian_2), seed)]);
strcat(buf,c); strcat(buf,mascul_femin_italian[i]);
} else { } else {
strcat(buf, name_italian_2i[SeedModChance(16, lengthof(name_italian_2i), seed)]); strcat(buf, name_italian_2i[SeedModChance(16, lengthof(name_italian_2i), seed)]);
} }
if (SeedModChance(15, 4, seed) == 0) { if (SeedModChance(15, 4, seed) == 0) {
if (SeedModChance(0, 2, seed) == 0) { if (SeedModChance(5, 2, seed) == 0) { // generic suffix
// generic suffix
strcat(buf, name_italian_3[SeedModChance(4, lengthof(name_italian_3), seed)]); strcat(buf, name_italian_3[SeedModChance(4, lengthof(name_italian_3), seed)]);
} } else { // river name suffix
else {
// river name suffix
strcat(buf, name_italian_river1[SeedModChance(4, lengthof(name_italian_river1), seed)]); strcat(buf, name_italian_river1[SeedModChance(4, lengthof(name_italian_river1), seed)]);
strcat(buf, name_italian_river2[SeedModChance(16, lengthof(name_italian_river2), seed)]); strcat(buf, name_italian_river2[SeedModChance(16, lengthof(name_italian_river2), seed)]);
} }