[Scummvm-cvs-logs] scummvm master -> 559f51e29eba41b7a6ab63801bc2196ce9b6335a

[sev-]

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:
3b1af18d92 FULLPIPE: Implement ModalMainMenu::isSaveAllowed()
559f51e29e FULLPIPE: Implement ModalMainMenu::updateVolume()


Commit: 3b1af18d92ecf7f6cfe5d0eb0aeae1221530942a
    https://github.com/scummvm/scummvm/commit/3b1af18d92ecf7f6cfe5d0eb0aeae1221530942a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-19T12:51:45+03:00

Commit Message:
FULLPIPE: Implement ModalMainMenu::isSaveAllowed()

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index e138df2..00e9bf8 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -27,6 +27,7 @@
 #include "fullpipe/motion.h"
 #include "fullpipe/scenes.h"
 #include "fullpipe/gameloader.h"
+#include "fullpipe/statics.h"
 
 #include "fullpipe/constants.h"
 
@@ -1108,7 +1109,16 @@ bool ModalMainMenu::isOverArea(PictureObject *obj, Common::Point *point) {
 }
 
 bool ModalMainMenu::isSaveAllowed() {
-	warning("STUB: ModalMainMenu::isSaveAllowed()");
+	if (!g_fp->_isSaveAllowed)
+		return false;
+
+	if (g_fp->_aniMan->_flags & 0x100)
+		return false;
+
+	for (Common::Array<MessageQueue *>::iterator s = g_fp->_globalMessageQueueList->begin(); s != g_fp->_globalMessageQueueList->end(); ++s) {
+		if (!(*s)->_isFinished && ((*s)->getFlags() & 1))
+			return false;
+	}
 
 	return true;
 }


Commit: 559f51e29eba41b7a6ab63801bc2196ce9b6335a
    https://github.com/scummvm/scummvm/commit/559f51e29eba41b7a6ab63801bc2196ce9b6335a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-19T14:06:34+03:00

Commit Message:
FULLPIPE: Implement ModalMainMenu::updateVolume()

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 00e9bf8..5c73dcf 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1025,7 +1025,16 @@ bool ModalMainMenu::init(int counterdiff) {
 }
 
 void ModalMainMenu::updateVolume() {
-	warning("STUB: ModalMainMenu::updateVolume()");
+	if (g_fp->_soundEnabled ) {
+		for (int s = 0; s < g_fp->_currSoundListCount; s++)
+			for (int i = 0; i < g_fp->_currSoundList1[s]->getCount(); i++) {
+				updateSoundVolume(g_fp->_currSoundList1[s]->getSoundByIndex(i));
+			}
+	}
+}
+
+void ModalMainMenu::updateSoundVolume(Sound *snd) {
+	warning("STUB: ModalMainMenu::updateSoundVolume()");
 }
 
 void ModalMainMenu::updateSliderPos() {
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 78ddf71..1a14972 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -27,6 +27,7 @@ namespace Fullpipe {
 
 class PictureObject;
 class Picture;
+class Sound;
 
 class BaseModalObject {
  public:
@@ -185,6 +186,7 @@ private:
 	void enableDebugMenu(char c);
 	int checkHover(Common::Point &point);
 	void updateVolume();
+	void updateSoundVolume(Sound *snd);
 	void updateSliderPos();
 	bool isOverArea(PictureObject *obj, Common::Point *point);
 };