WITCHER: Use ScopedPtr for WitcherEngine::_game

xoreos · Oct 26, 2016 · 0fa7935 · 0fa7935
1 parent b870873
commit 0fa7935
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/engines/witcher/witcher.cpp b/src/engines/witcher/witcher.cpp
@@ -55,14 +55,12 @@ namespace Engines {
 namespace Witcher {
 
 WitcherEngine::WitcherEngine() :
-	_languageText(Aurora::kLanguageInvalid), _languageVoice(Aurora::kLanguageInvalid),
-	_game(0) {
+	_languageText(Aurora::kLanguageInvalid), _languageVoice(Aurora::kLanguageInvalid) {
 
 	_console.reset(new Console(*this));
 }
 
 WitcherEngine::~WitcherEngine() {
-	delete _game;
 }
 
 bool WitcherEngine::detectLanguages(Aurora::GameID UNUSED(game), const Common::UString &target,
@@ -152,7 +150,7 @@ void WitcherEngine::run() {
 
 	CursorMan.showCursor();
 
-	_game = new Game(*this, *_console);
+	_game.reset(new Game(*this, *_console));
 	_game->run();
 
 	deinit();
@@ -322,9 +320,7 @@ void WitcherEngine::loadLanguageFiles(Aurora::Language langText, Aurora::Languag
 }
 
 void WitcherEngine::deinit() {
-	delete _game;
-
-	_game = 0;
+	_game.reset();
 
 	LuaScriptMan.deinit();
 	::Aurora::Lua::ScriptManager::destroy();

diff --git a/src/engines/witcher/witcher.h b/src/engines/witcher/witcher.h
@@ -27,6 +27,7 @@
 
 #include <list>
 
+#include "src/common/scopedptr.h"
 #include "src/common/ustring.h"
 #include "src/common/changeid.h"
 
@@ -70,7 +71,7 @@ class WitcherEngine : public Engines::Engine {
 	std::list<Common::ChangeID> _languageResources;
 	Common::ChangeID _languageTLK;
 
-	Game *_game;
+	Common::ScopedPtr<Game> _game;
 
 
 	void init();