From 94c294bfdcfb7caa84c88649f3630605ed90e884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sun, 2 Jul 2017 20:29:58 +0200 Subject: Irrlicht cleanup: cleanup various object to use RenderingEngine (#6088) * Irrlicht cleanup: cleanup various object to use RenderingEngine * CAO doesn't need scenemanager in addToScene * Camera doesn't need VideoDriver pointer or SceneManager in constructor * Hud doesn't need driver & scene manager in constructor * Hud doesn't need scenemanager pointer * Tile.h doesn't need IrrlichtDevice header (just SMaterial) * WieldMeshSceneNode: only take scene, we always use scene root node as parent --- src/game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 841b2d7ee..827512fbc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1914,7 +1914,7 @@ bool Game::createClient(const std::string &playername, /* Camera */ - camera = new Camera(smgr, *draw_control, client); + camera = new Camera(*draw_control, client); if (!camera || !camera->successfullyCreated(*error_message)) return false; client->setCamera(camera); @@ -1971,7 +1971,7 @@ bool Game::createClient(const std::string &playername, player->hurt_tilt_timer = 0; player->hurt_tilt_strength = 0; - hud = new Hud(driver, smgr, guienv, client, player, local_inventory); + hud = new Hud(guienv, client, player, local_inventory); if (!hud) { *error_message = "Memory error: could not create HUD"; -- cgit v1.2.3