Mercurial > hg > openttd

changeset 20345:a5b426ec42c6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r25297) -Fix (r25291): 32bit compilation.
author frosch <frosch@openttd.org>
date Sun, 26 May 2013 20:17:07 +0000 (2013-05-26)
parents 70f3ab64660a
children 4128d2c32209
files src/window.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -125,7 +125,7 @@
 /**
  * Sort WindowDesc by ini_key.
  */
-static int DescSorter(WindowDesc * const *a, WindowDesc * const *b)
+static int CDECL DescSorter(WindowDesc * const *a, WindowDesc * const *b)
 {
 	if ((*a)->ini_key != NULL && (*b)->ini_key != NULL) return strcmp((*a)->ini_key, (*b)->ini_key);
 	return ((*b)->ini_key != NULL ? 1 : 0) - ((*a)->ini_key != NULL ? 1 : 0);
@@ -597,7 +597,7 @@
 		case WWT_STICKYBOX:
 			w->flags ^= WF_STICKY;
 			nw->SetDirty(w);
-			if (_ctrl_pressed) w->window_desc->pref_sticky = w->flags & WF_STICKY;
+			if (_ctrl_pressed) w->window_desc->pref_sticky = (w->flags & WF_STICKY) != 0;
 			return;
 
 		default: