NWN: Use PtrVector for the main menu fog parts

xoreos · Oct 26, 2016 · 118153a · 118153a
1 parent f035b03
commit 118153a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/engines/nwn/gui/main/newgamefog.cpp b/src/engines/nwn/gui/main/newgamefog.cpp
@@ -124,19 +124,16 @@ NewGameFogs::NewGameFogs(size_t count) {
 }
 
 NewGameFogs::~NewGameFogs() {
-	for (std::vector<Graphics::Aurora::Model *>::iterator f = _fogs.begin(); f != _fogs.end(); ++f) {
-		(*f)->hide();
-		delete *f;
-	}
+	hide();
 }
 
 void NewGameFogs::show() {
-	for (std::vector<Graphics::Aurora::Model *>::iterator f = _fogs.begin(); f != _fogs.end(); ++f)
+	for (Common::PtrVector<Graphics::Aurora::Model>::iterator f = _fogs.begin(); f != _fogs.end(); ++f)
 		(*f)->show();
 }
 
 void NewGameFogs::hide() {
-	for (std::vector<Graphics::Aurora::Model *>::iterator f = _fogs.begin(); f != _fogs.end(); ++f)
+	for (Common::PtrVector<Graphics::Aurora::Model>::iterator f = _fogs.begin(); f != _fogs.end(); ++f)
 		(*f)->hide();
 }
 

diff --git a/src/engines/nwn/gui/main/newgamefog.h b/src/engines/nwn/gui/main/newgamefog.h
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "src/common/types.h"
+#include "src/common/ptrvector.h"
 
 #include "src/graphics/aurora/types.h"
 
@@ -44,7 +45,7 @@ class NewGameFogs {
 	void hide();
 
 private:
-	std::vector<Graphics::Aurora::Model *> _fogs;
+	Common::PtrVector<Graphics::Aurora::Model> _fogs;
 };
 
 } // End of namespace NWN