From b3a36f7378ea0f299cfa36c81de42e00adb7292d Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Mon, 26 Jun 2017 20:11:17 +0200 Subject: Isolate irrlicht references and use a singleton (#6041) * Add Device3D class which will contain IrrlichtDevice interface move getSupportedVideoDrivers to Device3D Add Device3D singleton & use it in various places Rename Device3D to Rendering engine & add helper functions to various device pointers More singleton work RenderingEngine owns draw_load_screen move draw functions to RenderingEngine Reduce IrrlichtDevice exposure and guienvironment RenderingEngine: Expose get_timer_time() to remove device from guiEngine Make irrlichtdevice & scene manager less exposed * Code style fixes * Move porting::getVideoDriverName, getVideoDriverFriendlyName, getDisplayDensity, getDisplaySize to RenderingEngine Fix XORG_USED macro -> RenderingEngine + create_engine_device from RenderingEngine constructor directly * enum paralax => enum parallax --- src/game.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/game.h') diff --git a/src/game.h b/src/game.h index 4fb198be8..de3dd769f 100644 --- a/src/game.h +++ b/src/game.h @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef GAME_HEADER #define GAME_HEADER -#include "irrlichttypes_extrabloated.h" +#include "irrlichttypes.h" #include class InputHandler; @@ -42,7 +42,6 @@ struct GameUIFlags void the_game(bool *kill, bool random_input, InputHandler *input, - IrrlichtDevice *device, const std::string &map_dir, const std::string &playername, const std::string &password, -- cgit v1.2.3