summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-03-24 22:00:11 +0000
committerrubidium <rubidium@openttd.org>2009-03-24 22:00:11 +0000
commit4546be7e906ffcf8810d45e6630081e9b1716e90 (patch)
tree014b183c7d62148808f939e9f3b20a74404b28c4
parent5c44bb6b63b9b9d9ecd1977079f105a3053aed4a (diff)
downloadopenttd-4546be7e906ffcf8810d45e6630081e9b1716e90.tar.xz
(svn r15838) -Fix: MSVC 64 bits warnings
-rw-r--r--src/disaster_cmd.cpp4
-rw-r--r--src/namegen.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 725cd914c..41b25dcb4 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -880,9 +880,9 @@ static void DoDisaster()
{
byte buf[lengthof(_disasters)];
- size_t j = 0;
+ byte j = 0;
for (size_t i = 0; i != lengthof(_disasters); i++) {
- if (_cur_year >= _disasters[i].min_year && _cur_year < _disasters[i].max_year) buf[j++] = i;
+ if (_cur_year >= _disasters[i].min_year && _cur_year < _disasters[i].max_year) buf[j++] = (byte)i;
}
if (j == 0) return;
diff --git a/src/namegen.cpp b/src/namegen.cpp
index 68fc86a24..b48ce19d8 100644
--- a/src/namegen.cpp
+++ b/src/namegen.cpp
@@ -559,7 +559,7 @@ static char *MakeCzechTownName(char *buf, const char *last, uint32 seed)
assert(i > 0);
/* Load the ending */
- ending = map[SeedModChance(16, i, seed)];
+ ending = map[SeedModChance(16, (int)i, seed)];
/* Override possible CZG_*FREE; this must be a real gender,
* otherwise we get overflow when modifying the adjectivum. */
gender = _name_czech_subst_ending[ending].gender;