cpp/openttd-patchpack/source Changeset - r19825:1cb0614821be

Changeset - r19825:1cb0614821be

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

glx - 12 years ago 2012-12-03 21:03:13
glx@openttd.org

(svn r24780) -Fix [FS#5378]: passing an int to a function expecting a byte can have side effects when MSVC optimises it

2 files changed with 3 insertions and 3 deletions:

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/window.cpp

➞

Show inline comments

@@ @@ -304,10 +304,10 @@ void Window::UnfocusFocusedWidget() @@
  * @param widget_index Index of the widget in the window to set the focus to.
  * @return Focus has changed.
  */
-bool Window::SetFocusedWidget(byte widget_index)
+bool Window::SetFocusedWidget(int widget_index)
+{
 	/* Do nothing if widget_index is already focused, or if it wasn't a valid widget. */
 	if (widget_index >= this->nested_array_size) return false;
+	if ((uint)widget_index >= this->nested_array_size) return false;
 	assert(this->nested_array[widget_index] != NULL); // Setting focus to a non-existing widget is a bad idea.
 	if (this->nested_focus != NULL) {

src/window_gui.h

➞

Show inline comments

@@ @@ -463,7 +463,7 @@ public: @@
+	}
 	void UnfocusFocusedWidget();
-	bool SetFocusedWidget(byte widget_index);
+	bool SetFocusedWidget(int widget_index);
 	EventState HandleEditBoxKey(int wid, uint16 key, uint16 keycode);

0 comments (0 inline, 0 general)