[Scummvm-cvs-logs] scummvm master -> 04ca386e6808e66d97f60d66c45954699ec8ef26

[sev-]

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

Summary:
c55398cd4b FULLPIPE: Implement clearGlobalMessageQueueList()
da23bd0772 FULLPIPE: Implement global_messageHandler_KickMetal()
04ca386e68 FULLPIPE: Implement global_messageHandler_KickStucco()


Commit: c55398cd4bf07dc21b557339fe37cde61a2bcaa4
    https://github.com/scummvm/scummvm/commit/c55398cd4bf07dc21b557339fe37cde61a2bcaa4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-26T12:08:37+03:00

Commit Message:
FULLPIPE: Implement clearGlobalMessageQueueList()

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



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 9c8f5ac..8257d14 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -699,6 +699,10 @@ void GlobalMessageQueueList::addMessageQueue(MessageQueue *msg) {
 	push_back(msg);
 }
 
+void clearGlobalMessageQueueList() {
+	g_fp->_globalMessageQueueList->clear();
+}
+
 void clearGlobalMessageQueueList1() {
 	clearMessages();
 
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index da579d5..e6f7f05 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -193,6 +193,7 @@ void clearMessageHandlers();
 void processMessages();
 void updateGlobalMessageQueue(int id, int objid);
 void clearMessages();
+void clearGlobalMessageQueueList();
 void clearGlobalMessageQueueList1();
 
 bool chainQueue(int queueId, int flags);


Commit: da23bd077243d80bef4c7cb759a5fe40a64eb76e
    https://github.com/scummvm/scummvm/commit/da23bd077243d80bef4c7cb759a5fe40a64eb76e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-26T12:18:53+03:00

Commit Message:
FULLPIPE: Implement global_messageHandler_KickMetal()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/messagehandlers.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 8f3f587..f76a12f 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -43,6 +43,8 @@ namespace Fullpipe {
 #define MV_LFT_OPEN 1048
 #define MV_MAN_GOLADDER 451
 #define MV_MAN_GOLADDER2 2844
+#define MV_MAN_HMRKICK 1028
+#define MV_MAN_HMRKICK_COINLESS 1445
 #define MV_MAN_LIFTDOWN 1052
 #define MV_MAN_LIFTUP 1051
 #define MV_MAN_LOOKUP 4773
@@ -219,8 +221,11 @@ namespace Fullpipe {
 #define SC_MAINMENU 4620
 #define SC_MAP 5222
 #define SC_TITLES 5166
+#define SND_CMN_015 3139
 #define SND_CMN_031 3516
 #define SND_CMN_032 3517
+#define SND_CMN_054 4762
+#define SND_CMN_055 4763
 #define SND_CMN_060 4921
 #define SND_CMN_061 4922
 #define SND_CMN_070 5199
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index 17af2bf..bc757bc 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -38,7 +38,30 @@ void global_messageHandler_KickStucco() {
 }
 
 void global_messageHandler_KickMetal() {
-	warning("STUB: global_messageHandler_KickMetal()");
+	Movement *mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK);
+
+	int end = mov->_currMovement ? mov->_currMovement->_dynamicPhases.size() : mov->_dynamicPhases.size();
+
+	for (int i = 0; i < end; i++) {
+		ExCommand *ex = mov->getDynamicPhaseByIndex(i)->_exCommand;
+
+		if (ex)
+			if (ex->_messageKind == 35)
+				if (ex->_messageNum == SND_CMN_054 || ex->_messageNum == SND_CMN_055)
+					ex->_messageNum = SND_CMN_015;
+	}
+
+	mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK_COINLESS);
+	end = mov->_currMovement ? mov->_currMovement->_dynamicPhases.size() : mov->_dynamicPhases.size();
+
+	for (int i = 0; i < end; i++) {
+		ExCommand *ex = mov->getDynamicPhaseByIndex(i)->_exCommand;
+
+		if (ex)
+			if (ex->_messageKind == 35)
+				if (ex->_messageNum == SND_CMN_054 || ex->_messageNum == SND_CMN_055)
+					ex->_messageNum = SND_CMN_015;
+	}
 }
 
 int global_messageHandler1(ExCommand *cmd) {


Commit: 04ca386e6808e66d97f60d66c45954699ec8ef26
    https://github.com/scummvm/scummvm/commit/04ca386e6808e66d97f60d66c45954699ec8ef26
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-26T12:23:37+03:00

Commit Message:
FULLPIPE: Implement global_messageHandler_KickStucco()

Changed paths:
    engines/fullpipe/messagehandlers.cpp



diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index bc757bc..15aa78d 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -34,12 +34,47 @@
 namespace Fullpipe {
 
 void global_messageHandler_KickStucco() {
-	warning("STUB: global_messageHandler_KickStucco()");
+	Movement *mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK);
+	int end = mov->_currMovement ? mov->_currMovement->_dynamicPhases.size() : mov->_dynamicPhases.size();
+	bool flip = false;
+
+	for (int i = 0; i < end; i++) {
+		ExCommand *ex = mov->getDynamicPhaseByIndex(i)->_exCommand;
+
+		if (ex)
+			if (ex->_messageKind == 35)
+				if (ex->_messageNum == SND_CMN_015) {
+					if (flip) {
+						ex->_messageNum = SND_CMN_055;
+					} else {
+						ex->_messageNum = SND_CMN_054;
+						flip = true;
+					}
+				}
+	}
+
+	mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK_COINLESS);
+	end = mov->_currMovement ? mov->_currMovement->_dynamicPhases.size() : mov->_dynamicPhases.size();
+	flip = false;
+
+	for (int i = 0; i < end; i++) {
+		ExCommand *ex = mov->getDynamicPhaseByIndex(i)->_exCommand;
+
+		if (ex)
+			if (ex->_messageKind == 35)
+				if (ex->_messageNum == SND_CMN_015) {
+					if (flip) {
+						ex->_messageNum = SND_CMN_055;
+					} else {
+						ex->_messageNum = SND_CMN_054;
+						flip = true;
+					}
+				}
+	}
 }
 
 void global_messageHandler_KickMetal() {
 	Movement *mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK);
-
 	int end = mov->_currMovement ? mov->_currMovement->_dynamicPhases.size() : mov->_dynamicPhases.size();
 
 	for (int i = 0; i < end; i++) {