LAB: Handle intro font in intro constructor and destructor

scummvm · Dec 24, 2015 · ba243ea · ba243ea
1 parent f4bc3c0
commit ba243ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
@@ -43,7 +43,11 @@ namespace Lab {
 Intro::Intro(LabEngine *vm) : _vm(vm) {
 	_quitIntro = false;
 	_introDoBlack = false;
-	_font = nullptr;
+	_font = _vm->_resource->getFont("F:Map.fon");
+}
+
+Intro::~Intro() {
+	_vm->_graphics->closeFont(&_font);
 }
 
 void Intro::introEatMessages() {
@@ -316,8 +320,6 @@ void Intro::play() {
 	_vm->_graphics->blackAllScreen();
 	_vm->updateMusicAndEvents();
 
-	_font = _vm->_resource->getFont("F:Map.fon");
-
 	_vm->_anim->_noPalChange = true;
 	nReadPict("Intro.1");
 	_vm->_anim->_noPalChange = false;
@@ -435,8 +437,6 @@ void Intro::play() {
 		_vm->_graphics->rectFill(0, 0, _vm->_graphics->_screenWidth - 1, _vm->_graphics->_screenHeight - 1);
 		_vm->_anim->_doBlack = true;
 	}
-
-	_vm->_graphics->closeFont(&_font);
 }
 
 } // End of namespace Lab
diff --git a/engines/lab/intro.h b/engines/lab/intro.h
@@ -36,6 +36,7 @@ namespace Lab {
 class Intro {
 public:
 	Intro(LabEngine *vm);
+	~Intro();
 
 	/**
 	 * Does the introduction sequence for Labyrinth.