summaryrefslogtreecommitdiff
path: root/src/client.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-23 23:17:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-24 21:08:17 +0300
commitc88734cc2b8a0785c23531ce70bf703887aa0c4b (patch)
treecdb4448b0bea29f9d9c61401ce91a00f92e2a5f5 /src/client.h
parentd3994b21fda3e7d8ba417a382fc8f065a7bf1c52 (diff)
downloadmv-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.gz
mv-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.bz2
mv-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.xz
mv-c88734cc2b8a0785c23531ce70bf703887aa0c4b.zip
remove most static methods from Client.
Diffstat (limited to 'src/client.h')
-rw-r--r--src/client.h21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/client.h b/src/client.h
index 17b0372fa..4b550ad16 100644
--- a/src/client.h
+++ b/src/client.h
@@ -218,12 +218,6 @@ public:
~Client();
- /**
- * Provides access to the client instance.
- */
- static Client *instance() A_WARN_UNUSED
- { return mInstance; }
-
void gameInit();
void testsInit();
@@ -304,11 +298,11 @@ public:
static void closeDialogs();
- static void setFramerate(const int fpsLimit);
+ void setFramerate(const int fpsLimit);
- static int getFramerate() A_WARN_UNUSED;
+ int getFramerate() const A_WARN_UNUSED;
- bool isTmw() A_WARN_UNUSED;
+ bool isTmw() const A_WARN_UNUSED;
static void applyGrabMode();
@@ -336,17 +330,18 @@ public:
void resizeVideo(int width, int height, const bool always = false);
- static bool limitPackets(const int type) A_WARN_UNUSED;
+ bool limitPackets(const int type) A_WARN_UNUSED;
- static bool checkPackets(const int type) A_WARN_UNUSED;
+ bool checkPackets(const int type) const A_WARN_UNUSED;
static void logEvent(const SDL_Event &event);
PacketLimit mPacketLimits[PACKET_SIZE + 1];
- static void windowRemoved(const Window *const window);
+ void windowRemoved(const Window *const window);
- static void updateScreenKeyboard(int height);
+ void updateScreenKeyboard(const int height)
+ { mKeyboardHeight = height; }
Window *openErrorDialog(const std::string &header,
const std::string &message,