cpp/openttd-patchpack/source Changeset - r16887:fa78cf9583b3

Changeset - r16887:fa78cf9583b3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 13 years ago 2010-12-25 12:47:05
smatz@openttd.org

(svn r21632) -Codechange: call ResetObjectToPlace() even when current place_mode is HT_NONE

2 files changed with 10 insertions and 13 deletions:

src/viewport.cpp

src/window.cpp

0 comments (0 inline, 0 general)

src/viewport.cpp

➞

Show inline comments

@@ @@ -2839,18 +2839,16 @@ void SetObjectToPlaceWnd(CursorID icon, @@
 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_DIR_MASK) != HT_NONE || _special_mouse_mode == WSM_DRAGDROP) {
 	if (_thd.window_class != WC_INVALID) {
 		/* Undo clicking on button and drag & drop */
 		Window *w = FindWindowById(_thd.window_class, _thd.window_number);
 		if (w != NULL) {
 			/* Call the abort function, but set the window class to something
 			 * that will never be used to avoid infinite loops. Setting it to
 			 * the 'next' window class must not be done because recursion into
 			 * this function might in some cases reset the newly set object to
 			 * place or not properly reset the original selection. */
 			_thd.window_class = WC_INVALID;
 			w->OnPlaceObjectAbort();
+		}
 		/* Call the abort function, but set the window class to something
 		 * that will never be used to avoid infinite loops. Setting it to
 		 * the 'next' window class must not be done because recursion into
 		 * this function might in some cases reset the newly set object to
 		 * place or not properly reset the original selection. */
 		_thd.window_class = WC_INVALID;
 		if (w != NULL) w->OnPlaceObjectAbort();
+	}
 	SetTileSelectSize(1, 1);

src/window.cpp

➞

Show inline comments

@@ @@ -653,8 +653,7 @@ void Window::DeleteChildWindows(WindowCl @@
  */
 Window::~Window()
+{
 	if ((_thd.place_mode & ~HT_DIR_MASK) != HT_NONE &&
 			_thd.window_class == this->window_class &&
 	if (_thd.window_class == this->window_class &&
 			_thd.window_number == this->window_number) {
 		ResetObjectToPlace();
+	}

0 comments (0 inline, 0 general)