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

(svn r20269) -Codechange: Use IsLocalCompany() everywhere, document the function and two company globals.

Browse Source
This commit is contained in:
alberth
2010-07-31 21:43:07 +00:00
parent 461da5e1d3
commit 603c33efc1
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -1974,7 +1974,7 @@ void HandleKeypress(uint32 raw_key)
{
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(IsGeneratingWorld() || _local_company == _current_company);
assert(IsGeneratingWorld() || IsLocalCompany());
/* Setup event */
uint16 key = GB(raw_key, 0, 16);
@@ -2135,7 +2135,7 @@ static void MouseLoop(MouseClick click, int mousewheel)
{
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(IsGeneratingWorld() || _local_company == _current_company);
assert(IsGeneratingWorld() || IsLocalCompany());
HandlePlacePresize();
UpdateTileSelection();
@@ -2241,7 +2241,7 @@ void HandleMouseEvents()
{
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(IsGeneratingWorld() || _local_company == _current_company);
assert(IsGeneratingWorld() || IsLocalCompany());
static int double_click_time = 0;
static Point double_click_pos = {0, 0};
@@ -2348,7 +2348,7 @@ void InputLoop()
{
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(IsGeneratingWorld() || _local_company == _current_company);
assert(IsGeneratingWorld() || IsLocalCompany());
CheckSoftLimit();
HandleKeyScrolling();