Update openttd to 1.7.0-RC1

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2017-03-12 16:41:12 +03:00
parent ecdb1590ab
commit 3433ae02f4
262 changed files with 5052 additions and 3913 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: newgrf_debug_data.h 27381 2015-08-10 20:24:13Z michi_cc $ */
/* $Id: newgrf_debug_data.h 27654 2016-09-05 19:11:01Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -17,7 +17,7 @@
#define NIP_END() { NULL, 0, 0, 0, 0 }
/* Helper for filling callback tables */
#define NIC(cb_id, base, variable, bit) { #cb_id, cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id }
#define NIC(cb_id, base, variable, bit) { #cb_id, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id }
#define NIC_END() { NULL, 0, 0, 0, 0 }
/* Helper for filling variable tables */