libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 04:16:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Make some fields of CAnimStream private

Browse Source
This commit is contained in:
Paul Gilbert 2015-06-02 21:37:51 -04:00
parent b5a2b55096
commit 3bee3e78cd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sherlock/objects.h
View File

@ -418,11 +418,12 @@ struct CAnim {
void load(Common::SeekableReadStream &s, bool isRoseTattoo); void load(Common::SeekableReadStream &s, bool isRoseTattoo);
}; };
struct CAnimStream { class CAnimStream {
Common::SeekableReadStream *_stream; // Stream to read frames from Common::SeekableReadStream *_stream; // Stream to read frames from
int _frameSize; // Temporary used to store the frame size int _frameSize; // Temporary used to store the frame size
void *_images; // TOOD: FIgure out hwo to hook up ImageFile with streaming support void *_images; // TOOD: FIgure out hwo to hook up ImageFile with streaming support
public:
ImageFrame *_imageFrame; ImageFrame *_imageFrame;
Common::Point _position; // Animation position Common::Point _position; // Animation position
@ -432,7 +433,7 @@ struct CAnimStream {
int _flags; // Flags int _flags; // Flags
int _scaleVal; // Specifies the scale amount int _scaleVal; // Specifies the scale amount
int _zPlacement; // Used by doBgAnim for determining Z order int _zPlacement; // Used by doBgAnim for determining Z order
public:
CAnimStream(); CAnimStream();
void getNextFrame(); void getNextFrame();

6
engines/sherlock/tattoo/tattoo_scene.cpp
View File

@ -211,7 +211,7 @@ void TattooScene::checkBgShapes() {
Scene::checkBgShapes(); Scene::checkBgShapes();
// Check for any active playing animation // Check for any active playing animation
if (_activeCAnim._images && _activeCAnim._zPlacement != REMOVE) { if (_activeCAnim._imageFrame && _activeCAnim._zPlacement != REMOVE) {
switch (_activeCAnim._flags & 3) { switch (_activeCAnim._flags & 3) {
case 0: case 0:
_activeCAnim._zPlacement = BEHIND; _activeCAnim._zPlacement = BEHIND;
@ -427,7 +427,7 @@ void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
people[idx].adjustSprite(); people[idx].adjustSprite();
} }
if ((_activeCAnim._images != nullptr) && (_activeCAnim._zPlacement != REMOVE)) { if (_activeCAnim._imageFrame != nullptr && _activeCAnim._zPlacement != REMOVE) {
_activeCAnim.getNextFrame(); _activeCAnim.getNextFrame();
} }
@ -644,7 +644,7 @@ void TattooScene::doBgAnimDrawSprites() {
} }
} }
if (_activeCAnim._images != nullptr || _activeCAnim._zPlacement == REMOVE) { if (_activeCAnim._imageFrame != nullptr || _activeCAnim._zPlacement == REMOVE) {
if (_activeCAnim._zPlacement != REMOVE) { if (_activeCAnim._zPlacement != REMOVE) {
screen.flushImage(_activeCAnim._imageFrame, _activeCAnim._position, _activeCAnim._oldBounds, _activeCAnim._scaleVal); screen.flushImage(_activeCAnim._imageFrame, _activeCAnim._position, _activeCAnim._oldBounds, _activeCAnim._scaleVal);
} else { } else {

2
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -169,7 +169,7 @@ void TattooUserInterface::doBgAnimRestoreUI() {
_oldInvGraphicBounds); _oldInvGraphicBounds);
// If a canimation is active, restore the graphics underneath it // If a canimation is active, restore the graphics underneath it
if (scene._activeCAnim._images != nullptr) if (scene._activeCAnim._imageFrame != nullptr)
screen.restoreBackground(scene._activeCAnim._oldBounds); screen.restoreBackground(scene._activeCAnim._oldBounds);
// If a canimation just ended, remove it's graphics from the backbuffer // If a canimation just ended, remove it's graphics from the backbuffer