aboutsummaryrefslogtreecommitdiff
path: root/engines/access
diff options
context:
space:
mode:
authorPaul Gilbert2014-11-10 12:25:13 -0500
committerPaul Gilbert2014-12-12 22:29:27 -0500
commit878038fe07ed750a4616d4a86dfb2a9f9873d245 (patch)
treed558b6fa2a05834693b5a279561ec92f933c3899 /engines/access
parent0e01c3623a499fd69acef789bb4c2a6c39091b99 (diff)
downloadscummvm-rg350-878038fe07ed750a4616d4a86dfb2a9f9873d245.tar.gz
scummvm-rg350-878038fe07ed750a4616d4a86dfb2a9f9873d245.tar.bz2
scummvm-rg350-878038fe07ed750a4616d4a86dfb2a9f9873d245.zip
ACCESS: Fix redundant pointer references in adding items to _images list
Diffstat (limited to 'engines/access')
-rw-r--r--engines/access/amazon/amazon_scripts.cpp4
-rw-r--r--engines/access/animation.cpp2
-rw-r--r--engines/access/asurface.cpp4
-rw-r--r--engines/access/asurface.h2
-rw-r--r--engines/access/player.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 189f634aa6..3ccca2bd2d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -318,7 +318,7 @@ void AmazonScripts::pan() {
ie._spritesPtr = _pObject[i];
ie._frameNumber = _pImgNum[i];
- _vm->_images.addToList(&ie);
+ _vm->_images.addToList(ie);
}
}
@@ -810,7 +810,7 @@ void AmazonScripts::plotInactive() {
_vm->_inactive._offsetY = _game->_inactiveYOff;
_vm->_inactive._frameNumber = 0;
- _vm->_images.addToList(&_vm->_inactive);
+ _vm->_images.addToList(_vm->_inactive);
}
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 03f349e34a..de44740c7f 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -232,7 +232,7 @@ void Animation::setFrame1(AnimationFrame *frame) {
ie._position = part->_position + _vm->_animation->_base;
ie._offsetY = part->_offsetY - ie._position.y;
- _vm->_images.addToList(&ie);
+ _vm->_images.addToList(ie);
}
}
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index cf8bf0766f..d36f6e4ba1 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -90,9 +90,9 @@ static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
return (ie1._position.y + ie1._offsetY) < (ie2._position.y + ie2._offsetY);
}
-void ImageEntryList::addToList(ImageEntry *ie) {
+void ImageEntryList::addToList(ImageEntry &ie) {
assert(size() < 35);
- push_back(*ie);
+ push_back(ie);
Common::sort(begin(), end(), sortImagesY);
}
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 5c164f0e59..d066589f84 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -144,7 +144,7 @@ public:
class ImageEntryList : public Common::Array<ImageEntry> {
public:
- void addToList(ImageEntry *ie);
+ void addToList(ImageEntry &ie);
};
} // End of namespace Access
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index ba5ba8924f..2abe9ad097 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -667,7 +667,7 @@ void Player::plotCom1() {
void Player::plotCom2() {
if (!_playerOff)
- _vm->_images.addToList(this);
+ _vm->_images.addToList(*this);
}
void Player::plotCom3() {