aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-05-02 12:11:42 +0300
committerEugene Sandulenko2014-05-02 12:11:42 +0300
commit3b54cc0e8153d0a91ecc5825ccb3144f7303b260 (patch)
treee90861c4d823720bf347a7f729e53348b365dd01
parent6b0d938737f99cd9388462bf7167619f609e116e (diff)
downloadscummvm-rg350-3b54cc0e8153d0a91ecc5825ccb3144f7303b260.tar.gz
scummvm-rg350-3b54cc0e8153d0a91ecc5825ccb3144f7303b260.tar.bz2
scummvm-rg350-3b54cc0e8153d0a91ecc5825ccb3144f7303b260.zip
FULLPIPE: ditto for Scene::_messageQueueList
-rw-r--r--engines/fullpipe/scene.cpp10
-rw-r--r--engines/fullpipe/scene.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index b1af0350a0..5dde566192 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -140,7 +140,7 @@ Scene::~Scene() {
// _faObjlist is not used
for (int i = 0; i < _messageQueueList.size(); i++)
- delete (MessageQueue *)_messageQueueList[i];
+ delete _messageQueueList[i];
_messageQueueList.clear();
@@ -388,16 +388,16 @@ void Scene::deletePictureObject(PictureObject *obj) {
MessageQueue *Scene::getMessageQueueById(int messageId) {
for (uint i = 0; i < _messageQueueList.size(); i++)
- if (((MessageQueue *)_messageQueueList[i])->_dataId == messageId)
- return (MessageQueue *)_messageQueueList[i];
+ if (_messageQueueList[i]->_dataId == messageId)
+ return _messageQueueList[i];
return 0;
}
MessageQueue *Scene::getMessageQueueByName(char *name) {
for (uint i = 0; i < _messageQueueList.size(); i++)
- if (!strcmp(((MessageQueue *)_messageQueueList[i])->_queueName, name))
- return (MessageQueue *)_messageQueueList[i];
+ if (!strcmp(_messageQueueList[i]->_queueName, name))
+ return _messageQueueList[i];
return 0;
}
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index ef39bbf03f..6c53755eb8 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -33,7 +33,7 @@ class Scene : public Background {
public:
Common::Array<StaticANIObject *> _staticANIObjectList1;
Common::Array<StaticANIObject *> _staticANIObjectList2;
- PtrList _messageQueueList;
+ Common::Array<MessageQueue *> _messageQueueList;
PtrList _faObjectList;
Shadows *_shadows;
SoundList *_soundList;