petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing

Browse Source
This commit is contained in:
rubidium
2009-04-19 10:31:30 +00:00
parent 2a2b40461d
commit 329cabab4f
21 changed files with 103 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/window.cpp
View File

@@ -577,7 +577,7 @@ void Window::DeleteChildWindows() const
*/
Window::~Window()
{
if (_thd.place_mode != VHM_NONE &&
if (_thd.place_mode != HT_NONE &&
_thd.window_class == this->window_class &&
_thd.window_number == this->window_number) {
ResetObjectToPlace();
@@ -1994,7 +1994,7 @@ void MouseLoop(MouseClick click, int mousewheel)
case MC_DOUBLE_LEFT:
case MC_LEFT:
DEBUG(misc, 2, "Cursor: 0x%X (%d)", _cursor.sprite, _cursor.sprite);
if (_thd.place_mode != VHM_NONE &&
if (_thd.place_mode != HT_NONE &&
/* query button and place sign button work in pause mode */
_cursor.sprite != SPR_CURSOR_QUERY &&
_cursor.sprite != SPR_CURSOR_SIGN &&
@@ -2003,7 +2003,7 @@ void MouseLoop(MouseClick click, int mousewheel)
return;
}
if (_thd.place_mode == VHM_NONE) {
if (_thd.place_mode == HT_NONE) {
if (!HandleViewportClicked(vp, x, y) &&
!(w->flags4 & WF_DISABLE_VP_SCROLL) &&
_settings_client.gui.left_mouse_btn_scrolling) {