update to 1.6.0

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2016-04-02 00:50:09 +03:00
parent fe10aa3cba
commit 5c9ef5a264
223 changed files with 4114 additions and 3049 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: newgrf_debug_data.h 27048 2014-10-28 00:51:51Z peter1138 $ */
/* $Id: newgrf_debug_data.h 27381 2015-08-10 20:24:13Z michi_cc $ */
/*
* This file is part of OpenTTD.
@@ -13,7 +13,7 @@
#include "../newgrf_engine.h"
/* Helper for filling property tables */
#define NIP(prop, base, variable, type, name) { name, cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
#define NIP(prop, base, variable, type, name) { name, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
#define NIP_END() { NULL, 0, 0, 0, 0 }
/* Helper for filling callback tables */