Android: Fix recursive delete (#7882)

[dragonfireclient.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index c3a7691d864eb5ae6fd1e36919cad6786ba5dc0d..69e6eed0b394c60eff6b6c037d6908d6d986c1f8 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -17,139 +17,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GAME_HEADER
-#define GAME_HEADER
+#pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes.h"
 #include <string>
-#include "keycode.h"
-#include <list>
 
-class KeyList : protected std::list<KeyPress>
-{
-       typedef std::list<KeyPress> super;
-       typedef super::iterator iterator;
-       typedef super::const_iterator const_iterator;
-
-       virtual const_iterator find(const KeyPress &key) const
-       {
-               const_iterator f(begin());
-               const_iterator e(end());
-
-               while (f != e) {
-                       if (*f == key)
-                               return f;
-
-                       ++f;
-               }
-
-               return e;
-       }
-
-       virtual iterator find(const KeyPress &key)
-       {
-               iterator f(begin());
-               iterator e(end());
-
-               while (f != e) {
-                       if (*f == key)
-                               return f;
-
-                       ++f;
-               }
-
-               return e;
-       }
-
-public:
-       void clear()
-       {
-               super::clear();
-       }
-
-       void set(const KeyPress &key)
-       {
-               if (find(key) == end())
-                       push_back(key);
-       }
-
-       void unset(const KeyPress &key)
-       {
-               iterator p(find(key));
-
-               if (p != end())
-                       erase(p);
-       }
-
-       void toggle(const KeyPress &key)
-       {
-               iterator p(this->find(key));
-
-               if (p != end())
-                       erase(p);
-               else
-                       push_back(key);
-       }
+class InputHandler;
+class ChatBackend;  /* to avoid having to include chat.h */
+struct SubgameSpec;
 
-       bool operator[](const KeyPress &key) const
-       {
-               return find(key) != end();
-       }
+struct Jitter {
+       f32 max, min, avg, counter, max_sample, min_sample, max_fraction;
 };
 
-class InputHandler
-{
-public:
-       InputHandler()
-       {
-       }
-       virtual ~InputHandler()
-       {
-       }
-
-       virtual bool isKeyDown(const KeyPress &keyCode) = 0;
-       virtual bool wasKeyDown(const KeyPress &keyCode) = 0;
-
-       virtual v2s32 getMousePos() = 0;
-       virtual void setMousePos(s32 x, s32 y) = 0;
-
-       virtual bool getLeftState() = 0;
-       virtual bool getRightState() = 0;
-
-       virtual bool getLeftClicked() = 0;
-       virtual bool getRightClicked() = 0;
-       virtual void resetLeftClicked() = 0;
-       virtual void resetRightClicked() = 0;
-
-       virtual bool getLeftReleased() = 0;
-       virtual bool getRightReleased() = 0;
-       virtual void resetLeftReleased() = 0;
-       virtual void resetRightReleased() = 0;
+struct RunStats {
+       u32 drawtime;
 
-       virtual s32 getMouseWheel() = 0;
-
-       virtual void step(float dtime) {}
-
-       virtual void clear() {}
+       Jitter dtime_jitter, busy_time_jitter;
 };
 
-class ChatBackend;  /* to avoid having to include chat.h */
-struct SubgameSpec;
+struct CameraOrientation {
+       f32 camera_yaw;    // "right/left"
+       f32 camera_pitch;  // "up/down"
+};
 
 void the_game(bool *kill,
                bool random_input,
                InputHandler *input,
-               IrrlichtDevice *device,
-               gui::IGUIFont *font,
                const std::string &map_dir,
                const std::string &playername,
                const std::string &password,
                const std::string &address, // If "", local server is used
                u16 port,
-               std::wstring &error_message,
+               std::string &error_message,
                ChatBackend &chat_backend,
+               bool *reconnect_requested,
                const SubgameSpec &gamespec, // Used for local game
                bool simple_singleplayer_mode);
-
-#endif
-