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

Merge branch 'cargo_type_order' into jgrpp

Browse Source 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
This commit is contained in:
Jonathan G Rennison
2018-07-02 21:04:06 +01:00
parent 79ca5c8b7d 00b1fe6246
commit 3330e4cef8
45 changed files with 183 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rev.cpp.in
View File

@@ -70,13 +70,13 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
* 24-27 minor version
* 20-23 build
* 19 1 if it is a release, 0 if it is not.
* 0-18 used to be the SVN revision, currently unused
* 0-18 used to be the SVN revision, now just last revision before switch to git
*
* The 19th bit is there so the development/betas/alpha, etc. leading to a
* final release will always have a lower version number than the released
* version, thus making comparisons on specific revisions easy.
*/
const uint32 _openttd_newgrf_version = 1 << 28 | 9 << 24 | 0 << 20 | 0 << 19;
const uint32 _openttd_newgrf_version = 1 << 28 | 9 << 24 | 0 << 20 | 0 << 19 | 28004;
#ifdef __MORPHOS__
/**