merged trunk into branch and corrected __PS2__ to __PLAYSTATION2__ in a couple files

svn-id: r49435

2 files changed, 13 insertions, 1 deletions

diff --git a/engines/m4/animation.h b/engines/m4/animation.h
index c8be7f5cb3..2dfe0d887e 100644
--- a/engines/m4/animation.h
+++ b/engines/m4/animation.h
@@ -62,6 +62,8 @@ class Animation {
         Common::String *_spriteSeriesNames;
         SpriteAsset *_spriteSeries;
         int _curFrame, _curFrameEntry;
+
+	bool freeFlag() const { return _freeFlag; }
 };
 
 } // End of namespace M4
diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp
index efb495e823..8073db32db 100644
--- a/engines/m4/mads_scene.cpp
+++ b/engines/m4/mads_scene.cpp
@@ -64,7 +64,7 @@ void MadsScene::loadScene2(const char *aaName) {
 	_kernelMessages.clear();
 
 	// Load up the properties for the scene
-	_sceneResources.load(_currentScene);
+	_sceneResources.load(_currentScene, NULL,  0/*word_83546*/, _walkSurface, _backgroundSurface);
 
 	// Load scene walk paths
 	loadSceneCodes(_currentScene);
@@ -304,6 +304,16 @@ void MadsScene::update() {
 
 void MadsScene::updateState() {
 	_sequenceList.tick();
+
+	if ((_activeAnimation) && !_abortTimers) {
+		_activeAnimation->update();
+		if (((MadsAnimation *) _activeAnimation)->freeFlag()) {
+			delete _activeAnimation;
+			_activeAnimation = NULL;
+		}
+	}
+
+	_kernelMessages.update();
 }
 
 int MadsScene::loadSceneSpriteSet(const char *setName) {