SHERLOCK: RT: Fix initial facing of characters within scene

This commit is contained in:
Paul Gilbert 2015-06-13 17:59:45 -04:00
parent a9ee64f857
commit 2909c968e5
3 changed files with 4 additions and 4 deletions

View File

@ -180,7 +180,6 @@ void Sprite::clear() {
_noShapeSize.x = _noShapeSize.y = 0;
_status = 0;
_misc = 0;
_numFrames = 0;
_altImages = nullptr;
_altSeq = 0;
Common::fill(&_stopFrames[0], &_stopFrames[8], (ImageFrame *)nullptr);
@ -192,7 +191,7 @@ void Sprite::setImageFrame() {
if (IS_SERRATED_SCALPEL)
imageNumber = imageNumber + _walkSequences[_sequenceNumber][0] - 2;
else if (imageNumber > _numFrames)
else if (imageNumber > _maxFrames)
imageNumber = 1;
// Get the images to use
@ -209,6 +208,8 @@ void Sprite::setImageFrame() {
// sort of HACK
imageNumber *= 2;
}
} else if (IS_ROSE_TATTOO) {
--imageNumber;
}
// Set the frame pointer

View File

@ -238,7 +238,6 @@ public:
Common::Point _noShapeSize; // Size of a NO_SHAPE
int _status; // Status: open/closed, moved/not moved
int8 _misc; // Miscellaneous use
int _numFrames; // How many frames the object has
// Rose Tattoo fields
int _startSeq; // Frame sequence starts at

View File

@ -684,7 +684,7 @@ bool TattooPeople::loadWalk() {
// Load the images for the character
_data[idx]->_images = new ImageFile(_data[idx]->_walkVGSName, false);
_data[idx]->_numFrames = _data[idx]->_images->size();
_data[idx]->_maxFrames = _data[idx]->_images->size();
// Load walk sequence data
Common::String fname = Common::String(_data[idx]->_walkVGSName.c_str(), strchr(_data[idx]->_walkVGSName.c_str(), '.'));