From b3a36f7378ea0f299cfa36c81de42e00adb7292d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= 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/mainmenumanager.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/mainmenumanager.h') diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h index b9bd3762b..adc40f4ff 100644 --- a/src/mainmenumanager.h +++ b/src/mainmenumanager.h @@ -124,17 +124,12 @@ extern bool isMenuActive(); class MainGameCallback : public IGameCallback { public: - MainGameCallback(IrrlichtDevice *a_device): - device(a_device) - { - } + MainGameCallback() {} + virtual ~MainGameCallback() {} virtual void exitToOS() { shutdown_requested = true; -#ifndef __ANDROID__ - device->closeDevice(); -#endif } virtual void disconnect() @@ -170,8 +165,6 @@ public: bool shutdown_requested = false; bool keyconfig_changed = false; - - IrrlichtDevice *device; }; extern MainGameCallback *g_gamecallback; -- cgit v1.2.3