Mercurial > hg > openttd

changeset 16885:4937eb396d5a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21620) -Codechange: Don't consider direction bits when checking for an active highlight mode.
author alberth <alberth@openttd.org>
date Fri, 24 Dec 2010 14:52:42 +0000
parents a1363dbe6bd9
children c123be7fd3cb
files src/viewport.cpp src/window.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -2840,7 +2840,7 @@
 void SetObjectToPlace(CursorID icon, PaletteID pal, HighLightStyle mode, WindowClass window_class, WindowNumber window_num)
 {
 	/* undo clicking on button and drag & drop */
-	if (_thd.place_mode != HT_NONE || _special_mouse_mode == WSM_DRAGDROP) {
+	if ((_thd.place_mode & ~HT_DIR_MASK) != HT_NONE || _special_mouse_mode == WSM_DRAGDROP) {
 		Window *w = FindWindowById(_thd.window_class, _thd.window_number);
 		if (w != NULL) {
 			/* Call the abort function, but set the window class to something
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -653,7 +653,7 @@
  */
 Window::~Window()
 {
-	if (_thd.place_mode != HT_NONE &&
+	if ((_thd.place_mode & ~HT_DIR_MASK) != HT_NONE &&
 			_thd.window_class == this->window_class &&
 			_thd.window_number == this->window_number) {
 		ResetObjectToPlace();