diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-18 18:02:34 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-18 18:02:34 (GMT) |
| commit | 483e9077023bf75e4e2aaa0630f62e5d3893395e (patch) | |
| tree | 5a6f05b9ae2c7cbc438f7508f5d9d1f509b8848b /src | |
| parent | af29942117a828e244195a530d2aa40fa9b2a5e2 (diff) | |
| parent | 4654a2aaa0c7a48583ec3e1b2b3d1c0923afc0cd (diff) | |
| download | powder-483e9077023bf75e4e2aaa0630f62e5d3893395e.zip powder-483e9077023bf75e4e2aaa0630f62e5d3893395e.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config.h | 4 | ||||
| -rw-r--r-- | src/client/Client.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Config.h b/src/Config.h index d30c9b1..4dbe929 100644 --- a/src/Config.h +++ b/src/Config.h @@ -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) diff --git a/src/client/Client.cpp b/src/client/Client.cpp index bde66d2..67a018b 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -626,10 +626,12 @@ void Client::Tick() } #endif +#ifndef IGNORE_UPDATES if(updateAvailable) { notifyUpdateAvailable(); } +#endif } catch (json::Exception &e) { |