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

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

View File

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

View File

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