KOTOR: Make the GUI hold its GFF3File Object

xoreos · Nov 7, 2017 · 14245eb · 14245eb
1 parent 08e09fa
commit 14245eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/engines/kotor/gui/gui.cpp b/src/engines/kotor/gui/gui.cpp
@@ -89,10 +89,9 @@ void GUI::load(const Common::UString &resref, float width, float height) {
 	_name = resref;
 
 	try {
-		Common::ScopedPtr<Aurora::GFF3File>
-			gff(new Aurora::GFF3File(resref, Aurora::kFileTypeGUI, MKTAG('G', 'U', 'I', ' ')));
+		_gff.reset(new Aurora::GFF3File(resref, Aurora::kFileTypeGUI, MKTAG('G', 'U', 'I', ' ')));
 
-		loadWidget(gff->getTopLevel(), 0, width, height);
+		loadWidget(_gff->getTopLevel(), 0, width, height);
 
 	} catch (Common::Exception &e) {
 		e.add("Can't load GUI \"%s\"", resref.c_str());

diff --git a/src/engines/kotor/gui/gui.h b/src/engines/kotor/gui/gui.h
@@ -28,6 +28,7 @@
 #include "src/common/scopedptr.h"
 
 #include "src/aurora/types.h"
+#include "src/aurora/gff3file.h"
 
 #include "src/graphics/aurora/types.h"
 #include "src/graphics/aurora/highlightable.h"
@@ -115,6 +116,8 @@ class GUI : public Engines::GUI {
 
 	Common::ScopedPtr<GUIBackground> _background;
 
+	Common::ScopedPtr<Aurora::GFF3File> _gff;
+
 	Common::UString _name;
 
 	void loadWidget(const Aurora::GFF3Struct &strct, Widget *parent, float width, float height);