cmclient update to 1.6.0

This commit is contained in:
Pavel Stupnikov
2016-04-02 01:07:50 +03:00
223 changed files with 4097 additions and 3048 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: misc_gui.cpp 27194 2015-03-17 22:08:48Z frosch $ */
/* $Id: misc_gui.cpp 27381 2015-08-10 20:24:13Z michi_cc $ */
/*
* This file is part of OpenTTD.
@@ -481,7 +481,6 @@ static const char * const _credits[] = {
" Mike Ragsdale - OpenTTD installer",
" Christian Rosentreter (tokai) - MorphOS / AmigaOS port",
" Richard Kempton (richK) - additional airports, initial TGP implementation",
" Emperor Jake - titlegame",
"",
" Alberto Demichelis - Squirrel scripting language \xC2\xA9 2003-2008",
" L. Peter Deutsch - MD5 implementation \xC2\xA9 1999, 2000, 2002",
@@ -875,7 +874,7 @@ Point QueryString::GetCaretPosition(const Window *w, int wid) const
int delta = min(0, (right - left) - tb->pixels - 10);
if (tb->caretxoffs + delta < 0) delta = -tb->caretxoffs;
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, wi->pos_y + WD_FRAMERECT_TOP};
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, (int)wi->pos_y + WD_FRAMERECT_TOP};
return pt;
}