[Scummvm-cvs-logs] scummvm master -> f628b7e20d48402be093e1b334a416a0f381f94c
sev-
sev at scummvm.org
Tue Sep 10 09:10:56 CEST 2013
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fda471ee80 FULLPIPE: Fix stupid type. CID 1072975
59d989d8c1 FULLPIPE: Add sanity check. CID 1063218
b3f0d87e3b FULLPIPE: Remove noop code. CID 1063230
1583ae66bf FULLPIPE: Add stub warning.
f628b7e20d FULLPIPE: Remove unused class variable
Commit: fda471ee800ed2e9ef3f4b3369dc508155d0c82e
https://github.com/scummvm/scummvm/commit/fda471ee800ed2e9ef3f4b3369dc508155d0c82e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T23:52:36-07:00
Commit Message:
FULLPIPE: Fix stupid type. CID 1072975
Changed paths:
engines/fullpipe/inventory.cpp
diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp
index 1abd369..1e229f3 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/fullpipe/inventory.cpp
@@ -319,7 +319,7 @@ bool CInventory2::handleLeftClick(ExCommand *cmd) {
if (!_isInventoryOut)
return false;
- bool res = false;
+ bool res = false;
for (uint i = 0; i < _inventoryIcons.size(); i++) {
if (cmd->_x >= _inventoryIcons[i]->x1 && cmd->_x <= _inventoryIcons[i]->x2 &&
@@ -343,8 +343,8 @@ bool CInventory2::handleLeftClick(ExCommand *cmd) {
}
}
- if (!res)
- unselectItem(this);
+ if (!res)
+ unselectItem(0);
return res;
}
Commit: 59d989d8c1f423f53761669aa007943ca649c2bc
https://github.com/scummvm/scummvm/commit/59d989d8c1f423f53761669aa007943ca649c2bc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T23:56:06-07:00
Commit Message:
FULLPIPE: Add sanity check. CID 1063218
Changed paths:
engines/fullpipe/messages.cpp
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 818753a..0fa2f6d 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -644,6 +644,9 @@ bool addMessageHandlerByIndex(int (*callback)(ExCommand *), int index, int16 id)
if (curItem)
curItem = curItem->nextItem;
+ if (!curItem)
+ return false;
+
bool res = allocMessageHandler(curItem, id, callback, index);
if (res)
Commit: b3f0d87e3bf36bb4159b12b345dc18cbb5c6d3fc
https://github.com/scummvm/scummvm/commit/b3f0d87e3bf36bb4159b12b345dc18cbb5c6d3fc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T23:57:57-07:00
Commit Message:
FULLPIPE: Remove noop code. CID 1063230
Changed paths:
engines/fullpipe/messages.cpp
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 0fa2f6d..478112f 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -272,9 +272,6 @@ bool MessageQueue::load(MfcArchive &file) {
}
bool MessageQueue::chain(StaticANIObject *ani) {
- if (ani)
- ani->isIdle();
-
if (checkGlobalExCommandList1() && checkGlobalExCommandList2()) {
if (!(getFlags() & 2)) {
g_fullpipe->_globalMessageQueueList->addMessageQueue(this);
Commit: 1583ae66bf955d72f84ae793d6cc513fc97a2778
https://github.com/scummvm/scummvm/commit/1583ae66bf955d72f84ae793d6cc513fc97a2778
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-10T00:06:21-07:00
Commit Message:
FULLPIPE: Add stub warning.
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 4ba03f1..41265dc 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -105,6 +105,7 @@ bool CMctlCompoundArray::load(MfcArchive &file) {
}
CMovGraph::CMovGraph() {
+ warning("STUB: CMovGraph::CMovGraph()");
_itemsCount = 0;
_items = 0;
//_callback1 = CMovGraphCallback1; // TODO
Commit: f628b7e20d48402be093e1b334a416a0f381f94c
https://github.com/scummvm/scummvm/commit/f628b7e20d48402be093e1b334a416a0f381f94c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-10T00:09:42-07:00
Commit Message:
FULLPIPE: Remove unused class variable
Changed paths:
engines/fullpipe/motion.h
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index f110ac3..89a9896 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -80,7 +80,6 @@ class CMovGraphNode : public CObject {
int _y;
int _distance;
int16 _field_10;
- int16 _field_12;
int _field_14;
public:
More information about the Scummvm-git-logs
mailing list