summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-08-29 14:45:39 +0000
committerbjarni <bjarni@openttd.org>2006-08-29 14:45:39 +0000
commit459ce0a3f1a394bc2d16f54c34f19d6e6aec5b01 (patch)
treef819d691e836005895291258e857c3195809e1e3
parente079decb9953c3ce31939c6caa694f480ebc680d (diff)
downloadopenttd-459ce0a3f1a394bc2d16f54c34f19d6e6aec5b01.tar.xz
(svn r6213) -Fix: Calatan town names was only prefix OR the rest of the string, never both (nars)
-rw-r--r--namegen.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/namegen.c b/namegen.c
index e1bcaedad..08f0805ff 100644
--- a/namegen.c
+++ b/namegen.c
@@ -700,26 +700,26 @@ static byte MakeCatalanTownName(char *buf, uint32 seed) {
strcat(buf, name_catalan_real[SeedModChance(4, lengthof(name_catalan_real), seed)]);
} else {
uint i;
+
if (SeedModChance(0, 2, seed) == 0) { // prefix
strcat(buf, name_catalan_pref[SeedModChance(11, lengthof(name_catalan_pref), seed)]);
}
- else {
- i = SeedChance(0, 2, seed);
- if (i == 0) { // masculine form
- strcat(buf, name_catalan_1m[SeedModChance(4, lengthof(name_catalan_1m), seed)]);
- strcat(buf, name_catalan_2m[SeedModChance(11, lengthof(name_catalan_2m), seed)]);
- } else { // feminine form
- strcat(buf, name_catalan_1f[SeedModChance(4, lengthof(name_catalan_1f), seed)]);
- strcat(buf, name_catalan_2f[SeedModChance(11, lengthof(name_catalan_2f), seed)]);
- }
+
+ i = SeedChance(0, 2, seed);
+ if (i == 0) { // masculine form
+ strcat(buf, name_catalan_1m[SeedModChance(4, lengthof(name_catalan_1m), seed)]);
+ strcat(buf, name_catalan_2m[SeedModChance(11, lengthof(name_catalan_2m), seed)]);
+ } else { // feminine form
+ strcat(buf, name_catalan_1f[SeedModChance(4, lengthof(name_catalan_1f), seed)]);
+ strcat(buf, name_catalan_2f[SeedModChance(11, lengthof(name_catalan_2f), seed)]);
+ }
- if (SeedModChance(15, 5, seed) == 0) {
- if (SeedModChance(5, 2, seed) == 0) { // generic suffix
- strcat(buf, name_catalan_3[SeedModChance(4, lengthof(name_catalan_3), seed)]);
- } else { // river name suffix
- strcat(buf, name_catalan_river1[SeedModChance(4, lengthof(name_catalan_river1), seed)]);
- }
+ if (SeedModChance(15, 5, seed) == 0) {
+ if (SeedModChance(5, 2, seed) == 0) { // generic suffix
+ strcat(buf, name_catalan_3[SeedModChance(4, lengthof(name_catalan_3), seed)]);
+ } else { // river name suffix
+ strcat(buf, name_catalan_river1[SeedModChance(4, lengthof(name_catalan_river1), seed)]);
}
}
}