summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-05 07:57:10 +0000
committerrubidium <rubidium@openttd.org>2011-01-05 07:57:10 +0000
commit4cc2d71d6dd3543d1eb76d70c8c30de6c531c3ae (patch)
treea5189c8463a72ce2ce886655d482137f4a4d55e3 /src
parentb890bcb84070813a2dd5dbf14fb74b10ac7cced3 (diff)
downloadopenttd-4cc2d71d6dd3543d1eb76d70c8c30de6c531c3ae.tar.xz
(svn r21731) -Fix (r21728): don't forget to update the saveload version, or to check for MSVC warnings
Diffstat (limited to 'src')
-rw-r--r--src/company_cmd.cpp4
-rw-r--r--src/saveload/saveload.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 7b3ad8e03..f47ac9174 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -260,8 +260,8 @@ void UpdateLandscapingLimits()
{
Company *c;
FOR_ALL_COMPANIES(c) {
- c->terraform_limit = min(c->terraform_limit + _settings_game.construction.terraform_per_64k_frames, _settings_game.construction.terraform_frame_burst << 16);
- c->clear_limit = min(c->clear_limit + _settings_game.construction.clear_per_64k_frames, _settings_game.construction.clear_frame_burst << 16);
+ c->terraform_limit = min(c->terraform_limit + _settings_game.construction.terraform_per_64k_frames, (uint32)_settings_game.construction.terraform_frame_burst << 16);
+ c->clear_limit = min(c->clear_limit + _settings_game.construction.clear_per_64k_frames, (uint32)_settings_game.construction.clear_frame_burst << 16);
}
}
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 3f3d8246c..b56fe4b2a 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -220,7 +220,7 @@
* 153 21263
* 154 21426
* 155 21453
- * 156 !!TODO!!
+ * 156 21728
*/
extern const uint16 SAVEGAME_VERSION = 156; ///< Current savegame version of OpenTTD.