mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
glx 2012-12-03 21:03:13 +00:00
parent efd6e29b52
commit 5d74b679e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/window.cpp
View File

@ -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) {

2
src/window_gui.h
View File

@ -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);