Merge branch 'master'

This commit is contained in:
momo5502 2016-01-08 14:24:18 +01:00
commit 7aa73a4d2f
2 changed files with 4 additions and 2 deletions

View File

@ -80,10 +80,10 @@ namespace Components
Utils::Hook::Set<char*>(0x6431D1, "data"); Utils::Hook::Set<char*>(0x6431D1, "data");
// UI version string // UI version string
Utils::Hook::Set<char*>(0x43F73B, "iw4x IW4x: r" REVISION_STR); Utils::Hook::Set<char*>(0x43F73B, "iw4x IW4x: r" REVISION_STR "-" MILESTONE);
// console version string // console version string
Utils::Hook::Set<char*>(0x4B12BB, "iw4x IW4x r" REVISION_STR " (built " __DATE__ " " __TIME__ ")"); Utils::Hook::Set<char*>(0x4B12BB, "iw4x IW4x r" REVISION_STR "-" MILESTONE " (built " __DATE__ " " __TIME__ ")");
// version string // version string
Utils::Hook::Set<char*>(0x60BD56, "iw4x IW4x (r" REVISION_STR ")"); Utils::Hook::Set<char*>(0x60BD56, "iw4x IW4x (r" REVISION_STR ")");

View File

@ -4,6 +4,8 @@
#define STRINGIZE_(x) #x #define STRINGIZE_(x) #x
#define STRINGIZE(x) STRINGIZE_(x) #define STRINGIZE(x) STRINGIZE_(x)
#define MILESTONE "alpha"
#define REVISION_STR STRINGIZE(REVISION) #define REVISION_STR STRINGIZE(REVISION)
#define VERSION 4,2,REVISION #define VERSION 4,2,REVISION
#define VERSION_STR "4.2." REVISION_STR #define VERSION_STR "4.2." REVISION_STR