summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
commit382067b05c4fe97bcf0da0143405375ec295f7c6 (patch)
treef668cd2595ac0c85f0942f88729d3ff1956676fa /src/game.h
parentee8191705826d978b7793497fdd307536c709bff (diff)
parent9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff)
downloadmv-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz
mv-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2
mv-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz
mv-382067b05c4fe97bcf0da0143405375ec295f7c6.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.h b/src/game.h
index 08349cdaa..023796290 100644
--- a/src/game.h
+++ b/src/game.h
@@ -107,12 +107,12 @@ class Game final
static void closeDialogs();
- void videoResized(const int width, const int height) const;
+ static void videoResized(const int width, const int height);
bool getValidSpeed() const A_WARN_UNUSED
{ return mValidSpeed; }
- void moveInDirection(const unsigned char direction);
+ static void moveInDirection(const unsigned char direction);
static bool createScreenshot();