dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-11' into save_ext

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-09-05 23:17:02 +01:00
parent e6c7134935 f7af8b8bdc
commit a6e0b1ac7d
37 changed files with 795 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/newgrf_debug_data.h
View File

@@ -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 */

4
src/table/townname.h
View File

@@ -11,6 +11,10 @@
#include "../core/enum_type.hpp"
#if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
static const char * const _name_original_english_1[] = {
"Great ",
"Little ",