KOTOR: Replace ScopedPtr/ScopedArray with std::unique_ptr

xoreos · Aug 11, 2020 · 996185f · 996185f
1 parent 368ddb4
commit 996185f
Show file tree

Hide file tree

Showing 30 changed files with 107 additions and 104 deletions.
diff --git a/src/engines/kotor/creature.cpp b/src/engines/kotor/creature.cpp
@@ -170,11 +170,11 @@ Common::UString Creature::getHeadMeshString(KotORBase::Gender gender, KotORBase:
 
 Graphics::Aurora::Model *Creature::createModel(const CharacterGenerationInfo *info) {
 	Common::UString bodyString = getBodyMeshString(info->getGender(), info->getClass());
-	Common::ScopedPtr<Graphics::Aurora::Model> body(loadModelObject(bodyString, ""));
+	std::unique_ptr<Graphics::Aurora::Model> body(loadModelObject(bodyString, ""));
 	if (!body)
 		return 0;
 
-	Common::ScopedPtr<Graphics::Aurora::Model> head(createHeadModel(info));
+	std::unique_ptr<Graphics::Aurora::Model> head(createHeadModel(info));
 	if (head)
 		body->attachModel("headhook", head.release());
 
@@ -183,7 +183,7 @@ Graphics::Aurora::Model *Creature::createModel(const CharacterGenerationInfo *in
 
 Graphics::Aurora::Model *Creature::createHeadModel(const CharacterGenerationInfo *info) {
 	Common::UString headString = getHeadMeshString(info->getGender(), info->getSkin(), info->getFace());
-	Common::ScopedPtr<Graphics::Aurora::Model> head(loadModelObject(headString, ""));
+	std::unique_ptr<Graphics::Aurora::Model> head(loadModelObject(headString, ""));
 	if (!head)
 		return 0;
 

diff --git a/src/engines/kotor/game.cpp b/src/engines/kotor/game.cpp
@@ -59,15 +59,15 @@ Game::Game(KotOREngine &engine, Engines::Console &console, const Version &gameVe
 		_engine(&engine),
 		_gameVersion(&gameVersion) {
 
-	_functions.reset(new Functions(*this));
+	_functions = std::make_unique<Functions>(*this);
 	collectModules();
 }
 
 Game::~Game() {
 }
 
 void Game::run() {
-	_module.reset(new Module(*_console));
+	_module = std::make_unique<Module>(*_console);
 
 	while (!EventMan.quitRequested()) {
 		mainMenu();

diff --git a/src/engines/kotor/gui/chargen/charactergeneration.cpp b/src/engines/kotor/gui/chargen/charactergeneration.cpp
@@ -22,12 +22,13 @@
  *  The primary character generation menu.
  */
 
+#include <memory>
+
 #include "external/glm/mat4x4.hpp"
 #include "external/glm/gtc/type_ptr.hpp"
 #include "external/glm/gtc/matrix_transform.hpp"
 
 #include "src/common/util.h"
-#include "src/common/scopedptr.h"
 
 #include "src/aurora/talkman.h"
 
@@ -159,7 +160,7 @@ void CharacterGenerationMenu::showQuickOrCustom() {
 
 	_step = 0;
 
-	_quickOrCustom.reset(new QuickOrCustomPanel(this));
+	_quickOrCustom = std::make_unique<QuickOrCustomPanel>(this);
 	addChild(_quickOrCustom.get());
 }
 
@@ -169,7 +170,7 @@ void CharacterGenerationMenu::showQuick() {
 	if (_customChar)
 		removeChild(_customChar.get());
 
-	_quickChar.reset(new QuickCharPanel(this));
+	_quickChar = std::make_unique<QuickCharPanel>(this);
 	addChild(_quickChar.get());
 }
 
@@ -179,15 +180,15 @@ void CharacterGenerationMenu::showCustom() {
 	if (_quickChar)
 		removeChild(_quickChar.get());
 
-	_customChar.reset(new CustomCharPanel(this));
+	_customChar = std::make_unique<CustomCharPanel>(this);
 	addChild(_customChar.get());
 }
 
 void CharacterGenerationMenu::showPortrait() {
 	// Operate on a copy of the character object
 	CharacterGenerationInfo info = *_pc;
 
-	_charGenMenu.reset(new CharacterGenerationPortraitMenu(info));
+	_charGenMenu = std::make_unique<CharacterGenerationPortraitMenu>(info);
 
 	sub(*_charGenMenu);
 	if (_charGenMenu->isAccepted()) {
@@ -197,7 +198,7 @@ void CharacterGenerationMenu::showPortrait() {
 		if (lblPortrait)
 			lblPortrait->setFill(_pc->getPortrait());
 
-		Common::ScopedPtr<Graphics::Aurora::Model> head(Creature::createHeadModel(_pc));
+		std::unique_ptr<Graphics::Aurora::Model> head(Creature::createHeadModel(_pc));
 		if (head) {
 			GfxMan.lockFrame();
 			_pcModel->attachModel("headhook", head.release());
@@ -213,7 +214,7 @@ void CharacterGenerationMenu::showName() {
 	// Operate on a copy of the character object
 	CharacterGenerationInfo info = *_pc;
 
-	_charGenMenu.reset(new CharacterGenerationNameMenu(info));
+	_charGenMenu = std::make_unique<CharacterGenerationNameMenu>(info);
 
 	sub(*_charGenMenu);
 	if (_charGenMenu->isAccepted()) {

diff --git a/src/engines/kotor/gui/chargen/charactergeneration.h b/src/engines/kotor/gui/chargen/charactergeneration.h
@@ -63,17 +63,17 @@ class CharacterGenerationMenu : public KotORBase::GUI {
 private:
 	KotORBase::Module *_module;
 	CharacterGenerationInfo *_pc;
-	Common::ScopedPtr<Graphics::Aurora::Model> _pcModel;
+	std::unique_ptr<Graphics::Aurora::Model> _pcModel;
 
 	int _step;
 
-	Common::ScopedPtr<GUI> _quickOrCustom;
-	Common::ScopedPtr<GUI> _quickChar;
-	Common::ScopedPtr<GUI> _customChar;
+	std::unique_ptr<GUI> _quickOrCustom;
+	std::unique_ptr<GUI> _quickChar;
+	std::unique_ptr<GUI> _customChar;
 
-	Common::ScopedPtr<CharacterGenerationBaseMenu> _charGenMenu;
+	std::unique_ptr<CharacterGenerationBaseMenu> _charGenMenu;
 
-	Common::ScopedPtr<Graphics::Aurora::SubSceneQuad> _charSubScene;
+	std::unique_ptr<Graphics::Aurora::SubSceneQuad> _charSubScene;
 
 	void callbackKeyInput(const Events::Key &key, const Events::EventType &type);
 };

diff --git a/src/engines/kotor/gui/chargen/classselection.cpp b/src/engines/kotor/gui/chargen/classselection.cpp
@@ -142,7 +142,7 @@ ClassSelectionMenu::~ClassSelectionMenu() {
 }
 
 void ClassSelectionMenu::createCharacterGeneration(CharacterGenerationInfo *info) {
-	_charGen.reset(new CharacterGenerationMenu(_module, info));
+	_charGen = std::make_unique<CharacterGenerationMenu>(_module, info);
 }
 
 void ClassSelectionMenu::callbackRun() {

diff --git a/src/engines/kotor/gui/chargen/classselection.h b/src/engines/kotor/gui/chargen/classselection.h
@@ -48,7 +48,7 @@ class ClassSelectionMenu : public KotORBase::GUI {
 	virtual ~ClassSelectionMenu();
 
 private:
-	Common::ScopedPtr<KotORBase::GUI> _charGen;
+	std::unique_ptr<KotORBase::GUI> _charGen;
 
 	Graphics::Aurora::SubSceneQuad _maleSoldierSubScene;
 	Graphics::Aurora::SubSceneQuad _maleScoutSubScene;
@@ -82,19 +82,19 @@ class ClassSelectionMenu : public KotORBase::GUI {
 	Common::UString _scoutMaleTitle;
 	Common::UString _scoutFemaleTitle;
 
-	Common::ScopedPtr<CharacterGenerationInfo> _maleSoldier;
-	Common::ScopedPtr<CharacterGenerationInfo> _maleScout;
-	Common::ScopedPtr<CharacterGenerationInfo> _maleScoundrel;
-	Common::ScopedPtr<CharacterGenerationInfo> _femaleSoldier;
-	Common::ScopedPtr<CharacterGenerationInfo> _femaleScout;
-	Common::ScopedPtr<CharacterGenerationInfo> _femaleScoundrel;
-
-	Common::ScopedPtr<Graphics::Aurora::Model> _maleSoldierModel;
-	Common::ScopedPtr<Graphics::Aurora::Model> _maleScoutModel;
-	Common::ScopedPtr<Graphics::Aurora::Model> _maleScoundrelModel;
-	Common::ScopedPtr<Graphics::Aurora::Model> _femaleSoldierModel;
-	Common::ScopedPtr<Graphics::Aurora::Model> _femaleScoutModel;
-	Common::ScopedPtr<Graphics::Aurora::Model> _femaleScoundrelModel;
+	std::unique_ptr<CharacterGenerationInfo> _maleSoldier;
+	std::unique_ptr<CharacterGenerationInfo> _maleScout;
+	std::unique_ptr<CharacterGenerationInfo> _maleScoundrel;
+	std::unique_ptr<CharacterGenerationInfo> _femaleSoldier;
+	std::unique_ptr<CharacterGenerationInfo> _femaleScout;
+	std::unique_ptr<CharacterGenerationInfo> _femaleScoundrel;
+
+	std::unique_ptr<Graphics::Aurora::Model> _maleSoldierModel;
+	std::unique_ptr<Graphics::Aurora::Model> _maleScoutModel;
+	std::unique_ptr<Graphics::Aurora::Model> _maleScoundrelModel;
+	std::unique_ptr<Graphics::Aurora::Model> _femaleSoldierModel;
+	std::unique_ptr<Graphics::Aurora::Model> _femaleScoutModel;
+	std::unique_ptr<Graphics::Aurora::Model> _femaleScoundrelModel;
 
 	void createCharacterGeneration(CharacterGenerationInfo *);
 

diff --git a/src/engines/kotor/gui/ingame/hud.cpp b/src/engines/kotor/gui/ingame/hud.cpp
@@ -230,7 +230,7 @@ void HUD::setMinimap(const Common::UString &map, int northAxis,
 
 	GfxMan.lockFrame();
 
-	_minimap.reset(new Minimap(map, northAxis, mapPt1X, mapPt1Y, mapPt2X, mapPt2Y, worldPt1X, worldPt1Y, worldPt2X, worldPt2Y));
+	_minimap = std::make_unique<Minimap>(map, northAxis, mapPt1X, mapPt1Y, mapPt2X, mapPt2Y, worldPt1X, worldPt1Y, worldPt2X, worldPt2Y);
 	mapView->setSubScene(_minimap.get());
 
 	GfxMan.unlockFrame();
@@ -255,7 +255,7 @@ void HUD::setRotation(float angle) {
 }
 
 void HUD::showContainer(KotORBase::Inventory &inv) {
-	_container.reset(new ContainerMenu());
+	_container = std::make_unique<ContainerMenu>();
 	_container->fillFromInventory(inv);
 
 	if (sub(*_container, kStartCodeNone, true, false) == 1) {

diff --git a/src/engines/kotor/gui/ingame/hud.h b/src/engines/kotor/gui/ingame/hud.h
@@ -68,9 +68,9 @@ class HUD : public KotORBase::HUD, Events::Notifyable {
 
 private:
 	Menu _menu;
-	Common::ScopedPtr<ContainerMenu> _container;
+	std::unique_ptr<ContainerMenu> _container;
 
-	Common::ScopedPtr<Minimap> _minimap;
+	std::unique_ptr<Minimap> _minimap;
 	Odyssey::WidgetLabel *_minimapPointer { nullptr };
 
 	void update(int width, int height);

diff --git a/src/engines/kotor/gui/ingame/ingame.cpp b/src/engines/kotor/gui/ingame/ingame.cpp
@@ -30,7 +30,7 @@ namespace Engines {
 namespace KotOR {
 
 IngameGUI::IngameGUI(KotORBase::Module &module, Console *console) {
-	_hud.reset(new HUD(module, console));
+	_hud = std::make_unique<HUD>(module, console);
 }
 
 } // End of namespace KotOR

diff --git a/src/engines/kotor/gui/ingame/menu.cpp b/src/engines/kotor/gui/ingame/menu.cpp
@@ -72,17 +72,17 @@ Menu::Menu(KotORBase::Module &module, Console *console) :
 		}
 	}
 
-	_menu[kMenuTypeEquipment].menu.reset(new MenuEquipment(_module, console));
-	_menu[kMenuTypeInventory].menu.reset(new MenuInventory(_module, console));
-	_menu[kMenuTypeCharacter].menu.reset(new MenuCharacter(_module, console));
-	_menu[kMenuTypeAbilities].menu.reset(new MenuAbilities(_module, console));
-	_menu[kMenuTypeMessages].menu.reset(new MenuMessages(console));
-	_menu[kMenuTypeJournal].menu.reset(new MenuJournal(console));
-	_menu[kMenuTypeMap].menu.reset(new MenuMap(console));
-	_menu[kMenuTypeOptions].menu.reset(new MenuOptions(console));
-
-	_menuLoad.reset(new SaveLoadMenu(module, console, kSaveLoadMenuTypeLoad, true));
-	_menuSave.reset(new SaveLoadMenu(module, console, kSaveLoadMenuTypeSave, true));
+	_menu[kMenuTypeEquipment].menu = std::make_unique<MenuEquipment>(_module, console);
+	_menu[kMenuTypeInventory].menu = std::make_unique<MenuInventory>(_module, console);
+	_menu[kMenuTypeCharacter].menu = std::make_unique<MenuCharacter>(_module, console);
+	_menu[kMenuTypeAbilities].menu = std::make_unique<MenuAbilities>(_module, console);
+	_menu[kMenuTypeMessages].menu = std::make_unique<MenuMessages>(console);
+	_menu[kMenuTypeJournal].menu = std::make_unique<MenuJournal>(console);
+	_menu[kMenuTypeMap].menu = std::make_unique<MenuMap>(console);
+	_menu[kMenuTypeOptions].menu = std::make_unique<MenuOptions>(console);
+
+	_menuLoad = std::make_unique<SaveLoadMenu>(module, console, kSaveLoadMenuTypeLoad, true);
+	_menuSave = std::make_unique<SaveLoadMenu>(module, console, kSaveLoadMenuTypeSave, true);
 }
 
 void Menu::setReturnStrref(uint32 id) {

diff --git a/src/engines/kotor/gui/ingame/menu.h b/src/engines/kotor/gui/ingame/menu.h
@@ -78,7 +78,7 @@ class Menu : public KotORBase::GUI {
 		Odyssey::WidgetProtoItem *protoItem;
 		Odyssey::WidgetButton *button;
 
-		Common::ScopedPtr<KotORBase::GUI> menu;
+		std::unique_ptr<KotORBase::GUI> menu;
 
 		SubMenu() : protoItem(0), button(0) { }
 	};
@@ -91,8 +91,8 @@ class Menu : public KotORBase::GUI {
 	SubMenu _menu[kMenuTypeMAX];
 	SubMenu *_currentMenu;
 
-	Common::ScopedPtr<SaveLoadMenu> _menuLoad;
-	Common::ScopedPtr<SaveLoadMenu> _menuSave;
+	std::unique_ptr<SaveLoadMenu> _menuLoad;
+	std::unique_ptr<SaveLoadMenu> _menuSave;
 
 	MenuType getMenuTypeByButtonTag(const Common::UString &tag);
 	void showMenu(MenuType type);

diff --git a/src/engines/kotor/gui/ingame/menu_opt.h b/src/engines/kotor/gui/ingame/menu_opt.h
@@ -25,7 +25,7 @@
 #ifndef ENGINES_KOTOR_GUI_INGAME_MENU_OPT_H
 #define ENGINES_KOTOR_GUI_INGAME_MENU_OPT_H
 
-#include "src/common/scopedptr.h"
+#include <memory>
 
 #include "src/engines/kotorbase/gui/gui.h"
 

diff --git a/src/engines/kotor/gui/main/main.cpp b/src/engines/kotor/gui/main/main.cpp
@@ -74,7 +74,7 @@ MainMenu::MainMenu(const Version &gameVersion, KotORBase::Module &module, ::Engi
 
 	startMainMusic();
 
-	_malakScene.reset(new Graphics::Aurora::SubSceneQuad);
+	_malakScene = std::make_unique<Graphics::Aurora::SubSceneQuad>();
 
 	_malakModel.reset(loadModelObject("mainmenu"));
 
@@ -105,7 +105,7 @@ void MainMenu::createClassSelection() {
 	_module->loadTexturePack();
 
 	// Create the class selection menu
-	_classSelection.reset(new ClassSelectionMenu(_module, _console));
+	_classSelection = std::make_unique<ClassSelectionMenu>(_module, _console);
 
 	loadScreen.hide();
 	show();
@@ -116,15 +116,15 @@ void MainMenu::createMovies() {
 		return;
 
 	// Create the movies menu
-	_movies.reset(new MoviesMenu(_console));
+	_movies = std::make_unique<MoviesMenu>(_console);
 }
 
 void MainMenu::createOptions() {
 	if (_options)
 		return;
 
 	// Create the options menu
-	_options.reset(new OptionsMenu(*_gameVersion, _console));
+	_options = std::make_unique<OptionsMenu>(*_gameVersion, _console);
 
 }
 
@@ -133,7 +133,7 @@ void MainMenu::createLoadGame() {
 		return;
 
 	// Create the load game menu
-	_loadGame.reset(new SaveLoadMenu(*_module, _console));
+	_loadGame = std::make_unique<SaveLoadMenu>(*_module, _console);
 }
 
 void MainMenu::startMainMusic() {

diff --git a/src/engines/kotor/gui/main/main.h b/src/engines/kotor/gui/main/main.h
@@ -25,7 +25,7 @@
 #ifndef ENGINES_KOTOR_GUI_MAIN_MAIN_H
 #define ENGINES_KOTOR_GUI_MAIN_MAIN_H
 
-#include "src/common/scopedptr.h"
+#include <memory>
 
 #include "src/graphics/aurora/subscenequad.h"
 
@@ -55,13 +55,13 @@ class MainMenu : public KotORBase::GUI {
 	KotORBase::Module *_module;
 	const Version *_gameVersion;
 
-	Common::ScopedPtr<Graphics::Aurora::SubSceneQuad> _malakScene;
-	Common::ScopedPtr<Graphics::Aurora::Model> _malakModel;
+	std::unique_ptr<Graphics::Aurora::SubSceneQuad> _malakScene;
+	std::unique_ptr<Graphics::Aurora::Model> _malakModel;
 
-	Common::ScopedPtr<GUI> _classSelection;
-	Common::ScopedPtr<GUI> _movies;
-	Common::ScopedPtr<GUI> _options;
-	Common::ScopedPtr<GUI> _loadGame;
+	std::unique_ptr<GUI> _classSelection;
+	std::unique_ptr<GUI> _movies;
+	std::unique_ptr<GUI> _options;
+	std::unique_ptr<GUI> _loadGame;
 
 	Sound::ChannelHandle _menuMusic;
 

diff --git a/src/engines/kotor/gui/main/options.cpp b/src/engines/kotor/gui/main/options.cpp
@@ -47,11 +47,11 @@ OptionsMenu::OptionsMenu(const Version &gameVersion, ::Engines::Console *console
 
 	addBackground(KotORBase::kBackgroundTypeMenu);
 
-	_gameplay.reset(new OptionsGameplayMenu(_console));
-	_feedback.reset(new OptionsFeedbackMenu(_console));
-	_autopause.reset(new OptionsAutoPauseMenu(_console));
-	_graphics.reset(new OptionsGraphicsMenu(_console));
-	_sound.reset(new OptionsSoundMenu(_console));
+	_gameplay = std::make_unique<OptionsGameplayMenu>(_console);
+	_feedback = std::make_unique<OptionsFeedbackMenu>(_console);
+	_autopause = std::make_unique<OptionsAutoPauseMenu>(_console);
+	_graphics = std::make_unique<OptionsGraphicsMenu>(_console);
+	_sound = std::make_unique<OptionsSoundMenu>(_console);
 
 	Common::UString versionString = Common::UString(::Version::getProjectNameVersion());
 

diff --git a/src/engines/kotor/gui/main/options.h b/src/engines/kotor/gui/main/options.h
@@ -25,7 +25,7 @@
 #ifndef ENGINES_KOTOR_GUI_MAIN_OPTIONS_H
 #define ENGINES_KOTOR_GUI_MAIN_OPTIONS_H
 
-#include "src/common/scopedptr.h"
+#include <memory>
 
 #include "src/graphics/aurora/highlightable.h"
 
@@ -48,11 +48,11 @@ class OptionsMenu : public KotORBase::GUI {
 	void callbackActive(Widget &widget);
 
 private:
-	Common::ScopedPtr<KotORBase::GUI> _gameplay;
-	Common::ScopedPtr<KotORBase::GUI> _feedback;
-	Common::ScopedPtr<KotORBase::GUI> _autopause;
-	Common::ScopedPtr<KotORBase::GUI> _graphics;
-	Common::ScopedPtr<KotORBase::GUI> _sound;
+	std::unique_ptr<KotORBase::GUI> _gameplay;
+	std::unique_ptr<KotORBase::GUI> _feedback;
+	std::unique_ptr<KotORBase::GUI> _autopause;
+	std::unique_ptr<KotORBase::GUI> _graphics;
+	std::unique_ptr<KotORBase::GUI> _sound;
 };
 
 } // End of namespace KotOR