matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw 2012-11-18 18:02:34 +00:00
commit 483e907702
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Config.h
View File

@ -27,7 +27,7 @@
#endif #endif
#ifndef BUILD_NUM #ifndef BUILD_NUM
#define BUILD_NUM 248 #define BUILD_NUM 249
#endif #endif
#ifndef SNAPSHOT_ID #ifndef SNAPSHOT_ID
@ -42,6 +42,8 @@
#endif #endif
//VersionInfoEnd //VersionInfoEnd
//#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications
#if defined(SNAPSHOT) #if defined(SNAPSHOT)
#define IDENT_RELTYPE "S" #define IDENT_RELTYPE "S"
#elif defined(BETA) #elif defined(BETA)

2
src/client/Client.cpp
View File

@ -626,10 +626,12 @@ void Client::Tick()
} }
#endif #endif
#ifndef IGNORE_UPDATES
if(updateAvailable) if(updateAvailable)
{ {
notifyUpdateAvailable(); notifyUpdateAvailable();
} }
#endif
} }
catch (json::Exception &e) catch (json::Exception &e)
{ {