aboutsummaryrefslogtreecommitdiff
path: root/engines/access
diff options
context:
space:
mode:
authorStrangerke2014-11-29 23:43:43 +0100
committerPaul Gilbert2014-12-12 22:53:22 -0500
commit63bcd2ebcbe8063e5009fb27ed2d1aaa08bf28a1 (patch)
tree5b1c8d6d4b6a0b4cfef337fb1d5993b4cdada904 /engines/access
parentd37593d5c1008995b292a62f473a2a8dfa322cc1 (diff)
downloadscummvm-rg350-63bcd2ebcbe8063e5009fb27ed2d1aaa08bf28a1.tar.gz
scummvm-rg350-63bcd2ebcbe8063e5009fb27ed2d1aaa08bf28a1.tar.bz2
scummvm-rg350-63bcd2ebcbe8063e5009fb27ed2d1aaa08bf28a1.zip
ACCESS: Remove second character sprite in Dead command
Diffstat (limited to 'engines/access')
-rw-r--r--engines/access/amazon/amazon_game.cpp3
-rw-r--r--engines/access/player.cpp7
-rw-r--r--engines/access/player.h2
3 files changed, 12 insertions, 0 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index dfaba977af..b665c49806 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -654,6 +654,9 @@ void AmazonEngine::dead(int deathId) {
_room->clearRoom();
freeChar();
+ _currentManOld = 1;
+ _player->removeSprite1();
+
warning("TODO: restart game");
quitGame();
_events->pollEvents();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 2313ed266e..cb7459e8cc 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -137,6 +137,13 @@ void Player::freeSprites() {
_playerSprites = nullptr;
}
+void Player::removeSprite1() {
+ if (_playerSprites1) {
+ delete _playerSprites1;
+ _playerSprites1 = nullptr;
+ }
+}
+
void Player::calcManScale() {
if (!_vm->_manScaleOff) {
_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) *
diff --git a/engines/access/player.h b/engines/access/player.h
index 67908a315d..631452f12d 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -120,6 +120,8 @@ public:
void freeSprites();
+ void removeSprite1();
+
void calcManScale();
void walk();