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

(svn r15427) -Codechange: give w->caption_color a more sensible name as it holds the owner of whatever is shown in the window

Browse Source
This commit is contained in:
rubidium
2009-02-09 02:33:10 +00:00
parent 7df760b9c3
commit c7f3daacbf
13 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -608,7 +608,7 @@ restart_search:
* as deleting this window could cascade in deleting (many) others
* anywhere in the z-array */
FOR_ALL_WINDOWS_FROM_BACK(w) {
if (w->caption_color == id) {
if (w->owner == id) {
delete w;
goto restart_search;
}
@@ -627,7 +627,7 @@ void ChangeWindowOwner(Owner old_owner, Owner new_owner)
{
Window *w;
FOR_ALL_WINDOWS_FROM_BACK(w) {
if (w->caption_color != old_owner) continue;
if (w->owner != old_owner) continue;
switch (w->window_class) {
case WC_COMPANY_COLOR:
@@ -642,7 +642,7 @@ void ChangeWindowOwner(Owner old_owner, Owner new_owner)
continue;
default:
w->caption_color = new_owner;
w->owner = new_owner;
break;
}
}
@@ -768,7 +768,7 @@ void Window::Initialize(int x, int y, int min_width, int min_height,
/* Set up window properties */
this->window_class = cls;
this->flags4 = WF_WHITE_BORDER_MASK; // just opened windows have a white border
this->caption_color = 0xFF;
this->owner = INVALID_OWNER;
this->left = x;
this->top = y;
this->width = min_width;