petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests 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

6
src/openttd.cpp
View File

@@ -65,6 +65,7 @@
#include "engine_func.h"
#include "core/random_func.hpp"
#include "rail_gui.h"
#include "core/backup_type.hpp"
#include "newgrf_commons.h"
@@ -1215,8 +1216,7 @@ void StateGameLoop()
/* All these actions has to be done from OWNER_NONE
* for multiplayer compatibility */
CompanyID old_company = _current_company;
_current_company = OWNER_NONE;
Backup<CompanyByte> cur_company(_current_company, OWNER_NONE);
AnimateAnimatedTiles();
IncreaseDate();
@@ -1229,7 +1229,7 @@ void StateGameLoop()
CallWindowTickEvent();
NewsLoop();
_current_company = old_company;
cur_company.Restore();
}
}