ACCESS: Fix redundant pointer references in adding items to _images list

scummvm · Dec 13, 2014 · 878038f · 878038f
1 parent 0e01c36
commit 878038f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -144,7 +144,7 @@ class ImageEntry {
 
 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
@@ -667,7 +667,7 @@ void Player::plotCom1() {
 
 void Player::plotCom2() {
 	if (!_playerOff)
-		_vm->_images.addToList(this);
+		_vm->_images.addToList(*this);
 }
 
 void Player::plotCom3() {