[Scummvm-cvs-logs] scummvm master -> ba243ea58781a7f52ccee526655e305a3daacfbb

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f4bc3c0ab4 LAB: Rename main intro function
ba243ea587 LAB: Handle intro font in intro constructor and destructor


Commit: f4bc3c0ab424ea5c7a123ad21814a6c0fae10847
    https://github.com/scummvm/scummvm/commit/f4bc3c0ab424ea5c7a123ad21814a6c0fae10847
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-12-24T01:47:53+01:00

Commit Message:
LAB: Rename main intro function

Changed paths:
    engines/lab/engine.cpp
    engines/lab/intro.cpp
    engines/lab/intro.h



diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 62d4da9..d511065 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -1090,7 +1090,7 @@ void LabEngine::go() {
 	_event->mouseHide();
 
 	Intro *intro = new Intro(this);
-	intro->introSequence();
+	intro->play();
 	delete intro;
 
 	_event->mouseShow();
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index b73de25..7184d10 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -218,7 +218,7 @@ void Intro::nReadPict(const Common::String filename, bool playOnce) {
 	_vm->_graphics->readPict(finalFileName, playOnce);
 }
 
-void Intro::introSequence() {
+void Intro::play() {
 	uint16 palette[16] = {
 		0x0000, 0x0855, 0x0FF9, 0x0EE7,
 		0x0ED5, 0x0DB4, 0x0CA2, 0x0C91,
diff --git a/engines/lab/intro.h b/engines/lab/intro.h
index 0c2bc6d..991db2f 100644
--- a/engines/lab/intro.h
+++ b/engines/lab/intro.h
@@ -40,7 +40,7 @@ public:
 	/**
 	 * Does the introduction sequence for Labyrinth.
 	 */
-	void introSequence();
+	void play();
 
 private:
 	/**


Commit: ba243ea58781a7f52ccee526655e305a3daacfbb
    https://github.com/scummvm/scummvm/commit/ba243ea58781a7f52ccee526655e305a3daacfbb
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-12-24T02:03:00+01:00

Commit Message:
LAB: Handle intro font in intro constructor and destructor

Changed paths:
    engines/lab/intro.cpp
    engines/lab/intro.h



diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 7184d10..e5a41d6 100644
--- 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
index 991db2f..9961be6 100644
--- 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.