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 8d9ab22eb6
commit ee53807e51
19 changed files with 256 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/industry_gui.cpp
View File

@@ -33,6 +33,7 @@
#include "company_base.h"
#include "core/geometry_func.hpp"
#include "core/random_func.hpp"
#include "core/backup_type.hpp"
#include "table/strings.h"
#include "table/sprites.h"
@@ -522,12 +523,14 @@ public:
return;
}
_current_company = OWNER_NONE;
Backup<CompanyByte> cur_company(_current_company, OWNER_NONE);
_generating_world = true;
_ignore_restrictions = true;
DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 8) | this->selected_type, seed,
CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY), &CcBuildIndustry);
cur_company.Restore();
_ignore_restrictions = false;
_generating_world = false;
} else {