diff --git a/namegen.c b/namegen.c index 8403bec681..c7a6c9f91c 100644 --- a/namegen.c +++ b/namegen.c @@ -281,7 +281,7 @@ static byte MakeFinnishTownName(char *buf, uint32 seed, const char *last) if (SeedChance(0, 15, seed) >= 10) { strecat(buf, name_finnish_real[SeedChance(2, lengthof(name_finnish_real), seed)], last); } else if (SeedChance(0, 15, seed) >= 5) { - // A two-part name by combining one of name_finnish_1 + "la"/"lä" + // A two-part name by combining one of name_finnish_1 + "la"/"lä" // The reason for not having the contents of name_finnish_{1,2} in the same table is // that the ones in name_finnish_2 are not good for this purpose. uint sel = SeedChance( 0, lengthof(name_finnish_1), seed); @@ -295,7 +295,7 @@ static byte MakeFinnishTownName(char *buf, uint32 seed, const char *last) { strecat(buf, "la", last); } else { - strecat(buf, "lä", last); + strecat(buf, "lä", last); } } else { // A two-part name by combining one of name_finnish_{1,2} + name_finnish_3. diff --git a/rail_cmd.c b/rail_cmd.c index cf97331749..feeacc7a4b 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -187,7 +187,7 @@ uint GetRailFoundation(Slope tileh, TrackBits bits) static uint32 CheckRailSlope(Slope tileh, TrackBits rail_bits, TrackBits existing, TileIndex tile) { if (IsSteepSlope(tileh)) { - if (existing == 0) { + if (_patches.build_on_slopes && existing == 0) { TrackBits valid = TRACK_BIT_CROSS | (HASBIT(1 << SLOPE_STEEP_W | 1 << SLOPE_STEEP_E, tileh) ? TRACK_BIT_VERT : TRACK_BIT_HORZ); if (valid & rail_bits) return _price.terraform; } diff --git a/settings_gui.c b/settings_gui.c index 4a25880e07..4767d51951 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -497,7 +497,9 @@ static void GameDifficultyWndProc(Window *w, WindowEvent *e) // save value in temporary variable ((int*)&_opt_mod_temp.diff)[btn] = val; + RaiseWindowWidget(w, _opt_mod_temp.diff_level + 3); SetDifficultyLevel(3, &_opt_mod_temp); // set difficulty level to custom + LowerWindowWidget(w, _opt_mod_temp.diff_level + 3); SetWindowDirty(w); } break; case 3: case 4: case 5: case 6: /* Easy / Medium / Hard / Custom */