mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6213) -Fix: Calatan town names was only prefix OR the rest of the string, never both (nars)

release/0.5
bjarni 2006-08-29 14:45:39 +00:00
parent e079decb99
commit 459ce0a3f1
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
namegen.c
View File

@ -700,26 +700,26 @@ static byte MakeCatalanTownName(char *buf, uint32 seed) {
strcat(buf, name_catalan_real[SeedModChance(4, lengthof(name_catalan_real), seed)]); strcat(buf, name_catalan_real[SeedModChance(4, lengthof(name_catalan_real), seed)]);
} else { } else {
uint i; uint i;
if (SeedModChance(0, 2, seed) == 0) { // prefix if (SeedModChance(0, 2, seed) == 0) { // prefix
strcat(buf, name_catalan_pref[SeedModChance(11, lengthof(name_catalan_pref), seed)]); strcat(buf, name_catalan_pref[SeedModChance(11, lengthof(name_catalan_pref), seed)]);
} }
else {
i = SeedChance(0, 2, seed); i = SeedChance(0, 2, seed);
if (i == 0) { // masculine form if (i == 0) { // masculine form
strcat(buf, name_catalan_1m[SeedModChance(4, lengthof(name_catalan_1m), seed)]); strcat(buf, name_catalan_1m[SeedModChance(4, lengthof(name_catalan_1m), seed)]);
strcat(buf, name_catalan_2m[SeedModChance(11, lengthof(name_catalan_2m), seed)]); strcat(buf, name_catalan_2m[SeedModChance(11, lengthof(name_catalan_2m), seed)]);
} else { // feminine form } else { // feminine form
strcat(buf, name_catalan_1f[SeedModChance(4, lengthof(name_catalan_1f), seed)]); strcat(buf, name_catalan_1f[SeedModChance(4, lengthof(name_catalan_1f), seed)]);
strcat(buf, name_catalan_2f[SeedModChance(11, lengthof(name_catalan_2f), seed)]); strcat(buf, name_catalan_2f[SeedModChance(11, lengthof(name_catalan_2f), seed)]);
} }
if (SeedModChance(15, 5, seed) == 0) { if (SeedModChance(15, 5, seed) == 0) {
if (SeedModChance(5, 2, seed) == 0) { // generic suffix if (SeedModChance(5, 2, seed) == 0) { // generic suffix
strcat(buf, name_catalan_3[SeedModChance(4, lengthof(name_catalan_3), seed)]); strcat(buf, name_catalan_3[SeedModChance(4, lengthof(name_catalan_3), seed)]);
} else { // river name suffix } else { // river name suffix
strcat(buf, name_catalan_river1[SeedModChance(4, lengthof(name_catalan_river1), seed)]); strcat(buf, name_catalan_river1[SeedModChance(4, lengthof(name_catalan_river1), seed)]);
}
} }
} }
} }