dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration.

Browse Source
This commit is contained in:
frosch
2010-05-31 20:22:57 +00:00
parent 1d05fbebbe
commit 9db3cde73a
19 changed files with 256 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/disaster_cmd.cpp
View File

@@ -43,6 +43,7 @@
#include "ai/ai.hpp"
#include "company_base.h"
#include "core/random_func.hpp"
#include "core/backup_type.hpp"
#include "table/strings.h"
#include "table/sprites.h"
@@ -72,10 +73,9 @@ static void DisasterClearSquare(TileIndex tile)
switch (GetTileType(tile)) {
case MP_RAILWAY:
if (Company::IsHumanID(GetTileOwner(tile))) {
CompanyID old_company = _current_company;
_current_company = OWNER_WATER;
Backup<CompanyByte> cur_company(_current_company, OWNER_WATER);
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
_current_company = old_company;
cur_company.Restore();
/* update signals in buffer */
UpdateSignalsInBuffer();
@@ -83,10 +83,9 @@ static void DisasterClearSquare(TileIndex tile)
break;
case MP_HOUSE: {
CompanyID old_company = _current_company;
_current_company = OWNER_NONE;
Backup<CompanyByte> cur_company(_current_company, OWNER_NONE);
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
_current_company = old_company;
cur_company.Restore();
break;
}