[Scummvm-cvs-logs] scummvm master -> 43791c51c8f9ec41400e2f8591e2c3d673c83454
sylvaintv
sylvaintv at gmail.com
Wed May 8 02:28:58 CEST 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4b6378f2e8 * HOPKINS: Fix bug #3611824 - problem when changing clothes
43791c51c8 HOPKINS: Fix bug #3612566 - scaling glitch on Samantha
Commit: 4b6378f2e846bb31103341f332f4b8e609843e6f
https://github.com/scummvm/scummvm/commit/4b6378f2e846bb31103341f332f4b8e609843e6f
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2013-05-07T17:21:45-07:00
Commit Message:
* HOPKINS: Fix bug #3611824 - problem when changing clothes
Changed paths:
engines/hopkins/script.cpp
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index df8c077..c392732 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -960,6 +960,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
_vm->_globals->loadCharacterData();
_vm->_objectsMan->_sprite[0]._deltaX = 28;
_vm->_objectsMan->_sprite[0]._deltaY = 155;
+ _vm->_objectsMan->_sprite[0]._spriteData = _vm->_globals->_characterSpriteBuf;
_vm->_objectsMan->computeAndSetSpriteSize();
break;
@@ -970,6 +971,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
_vm->_globals->loadCharacterData();
_vm->_objectsMan->_sprite[0]._deltaX = 34;
_vm->_objectsMan->_sprite[0]._deltaY = 190;
+ _vm->_objectsMan->_sprite[0]._spriteData = _vm->_globals->_characterSpriteBuf;
_vm->_objectsMan->computeAndSetSpriteSize();
break;
Commit: 43791c51c8f9ec41400e2f8591e2c3d673c83454
https://github.com/scummvm/scummvm/commit/43791c51c8f9ec41400e2f8591e2c3d673c83454
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2013-05-07T17:23:44-07:00
Commit Message:
HOPKINS: Fix bug #3612566 - scaling glitch on Samantha
Changed paths:
engines/hopkins/objects.cpp
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index c26c9ab..f2f5475 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2186,7 +2186,7 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha
loc->_pos.y = getSpriteY(0);
loc->_startSpriteIndex = 64;
loc->_location = _vm->_globals->_screenId;
- loc->_zoomFactor = _sprite[0]._animationType;
+ loc->_zoomFactor = _sprite[0]._zoomFactor;
removeSprite(1);
addStaticSprite(_headSprites, loc->_pos, 1, 3, loc->_zoomFactor, false, 20, 127);
More information about the Scummvm-git-logs
mailing list