summaryrefslogtreecommitdiff
path: root/src/disaster_cmd.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-06-05 12:16:12 +0000
committerfrosch <frosch@openttd.org>2010-06-05 12:16:12 +0000
commit1d3adb2b66989630b2a3c201ac1210a886d41a51 (patch)
treec7c2c22646cfdeb1312455bfd9d59674b7ff96be /src/disaster_cmd.cpp
parent406c2a986571ce594f491c0fde225b89f14ac8c3 (diff)
downloadopenttd-1d3adb2b66989630b2a3c201ac1210a886d41a51.tar.xz
(svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation.
Diffstat (limited to 'src/disaster_cmd.cpp')
-rw-r--r--src/disaster_cmd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 44f27fa8a..dcf3ef844 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -73,7 +73,7 @@ static void DisasterClearSquare(TileIndex tile)
switch (GetTileType(tile)) {
case MP_RAILWAY:
if (Company::IsHumanID(GetTileOwner(tile))) {
- Backup<CompanyByte> cur_company(_current_company, OWNER_WATER);
+ Backup<CompanyByte> cur_company(_current_company, OWNER_WATER, FILE_LINE);
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
cur_company.Restore();
@@ -83,7 +83,7 @@ static void DisasterClearSquare(TileIndex tile)
break;
case MP_HOUSE: {
- Backup<CompanyByte> cur_company(_current_company, OWNER_NONE);
+ Backup<CompanyByte> cur_company(_current_company, OWNER_NONE, FILE_LINE);
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
cur_company.Restore();
break;