summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-04 23:26:22 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-04 23:41:45 +0200
commit6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d (patch)
treea4ae355fe26eda518a5fd82c15347b6cfcf6b7f6 /src/game.h
parent1b06ec9f12e3fbfe6fbf6579fb64bb895464badb (diff)
downloadmana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.gz
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.bz2
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.xz
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.zip
Replaced emote window with a new emote popup
The popup is meant to be temporary, showing the emote instantly when you click on it. It adapts nicely to show any number of emotes. I still need to add a better way of assigning emote shortcuts, since currently you can only change which emote is assigned to which shortcut by actually using it.
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game.h b/src/game.h
index ddda7cfc..1b9373a9 100644
--- a/src/game.h
+++ b/src/game.h
@@ -22,8 +22,6 @@
#ifndef GAME_H
#define GAME_H
-//#include <memory>
-
#include "SDL.h"
#include "configlistener.h"
@@ -32,6 +30,8 @@ extern std::string map_path;
extern volatile int fps;
extern volatile int tick_time;
+class WindowMenu;
+
class Game : public ConfigListener
{
public:
@@ -56,6 +56,8 @@ class Game : public ConfigListener
SDL_TimerID mLogicCounterId;
SDL_TimerID mSecondsCounterId;
+
+ WindowMenu *mWindowMenu;
};
/**