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

(svn r19870) -Codechange: silence some of GCC 3.3 warnings

This commit is contained in:
smatz 2010-05-21 05:42:41 +00:00
parent 52b211f939
commit 93233a9335
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/settings.h
View File

@ -90,7 +90,7 @@ static bool UpdateClientConfigValues(int32 p1);
*/
#define NSD_GENERAL(name, def, cmd, guiflags, min, max, interval, many, str, proc, load)\
{name, (const void*)(def), {(byte)cmd}, {(uint16)guiflags}, min, max, interval, many, str, proc, load}
{name, (const void*)(ptrdiff_t)(def), {(byte)cmd}, {(uint16)guiflags}, min, max, interval, many, str, proc, load}
/* Macros for various objects to go in the configuration file.
* This section is for global variables */

8
src/viewport.cpp
View File

@ -2330,9 +2330,9 @@ static void CalcRaildirsDrawstyle(TileHighlightData *thd, int x, int y, int meth
/* 'Build' the last half rail tile if needed */
if ((offset & TILE_UNIT_MASK) > (TILE_SIZE / 2)) {
if (dx + dy >= (int)TILE_SIZE) {
x += (dx + dy < 0) ? TILE_SIZE : -(int)TILE_SIZE;
x += (dx + dy < 0) ? (int)TILE_SIZE : -(int)TILE_SIZE;
} else {
y += (dx + dy < 0) ? TILE_SIZE : -(int)TILE_SIZE;
y += (dx + dy < 0) ? (int)TILE_SIZE : -(int)TILE_SIZE;
}
}
@ -2365,9 +2365,9 @@ static void CalcRaildirsDrawstyle(TileHighlightData *thd, int x, int y, int meth
/* 'Build' the last half rail tile if needed */
if ((offset & TILE_UNIT_MASK) > (TILE_SIZE / 2)) {
if (dx - dy < 0) {
y += (dx > dy) ? TILE_SIZE : -(int)TILE_SIZE;
y += (dx > dy) ? (int)TILE_SIZE : -(int)TILE_SIZE;
} else {
x += (dx < dy) ? TILE_SIZE : -(int)TILE_SIZE;
x += (dx < dy) ? (int)TILE_SIZE : -(int)TILE_SIZE;
}
}