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

Strangerke Strangerke at scummvm.org
Tue May 24 23:25:22 CEST 2016


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

Summary:
a68ef2fd1c GNAP: Initialize the members of CutScene


Commit: a68ef2fd1ced4545edcbacf86fa7107b78f5f3ed
    https://github.com/scummvm/scummvm/commit/a68ef2fd1ced4545edcbacf86fa7107b78f5f3ed
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-24T23:17:08+02:00

Commit Message:
GNAP: Initialize the members of CutScene

Changed paths:
    engines/gnap/scenes/scenecore.cpp
    engines/gnap/scenes/scenecore.h



diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index 5e941f4..d4b06c9 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -649,6 +649,21 @@ bool Scene::clearKeyStatus() {
 	return false;
 }
 
+/****************************************************************************/
+
+CutScene::CutScene(GnapEngine *vm) : Scene(vm) {
+	_itemsCount = -1;
+	
+	for (int i = 0; i < 16; i++) {
+		_resourceIdArr[i] = -1;
+		_sequenceCountArr[i] = -1;
+		_canSkip[i] = false;
+	}
+
+	for (int i = 0; i < 50; i++)
+		_sequenceIdArr[i] = -1;
+};
+
 void CutScene::run() {
 	GameSys& gameSys = *_vm->_gameSys;
 
diff --git a/engines/gnap/scenes/scenecore.h b/engines/gnap/scenes/scenecore.h
index 5bfc80d..c54b5a7 100644
--- a/engines/gnap/scenes/scenecore.h
+++ b/engines/gnap/scenes/scenecore.h
@@ -49,7 +49,7 @@ protected:
 
 class CutScene : public Scene {
 public:
-	CutScene(GnapEngine *vm) : Scene(vm) {};
+	CutScene(GnapEngine *vm);
 	virtual ~CutScene() {};
 
 	virtual int init() = 0;






More information about the Scummvm-git-logs mailing list