[Scummvm-cvs-logs] scummvm master -> 9a0ba3e63443fcfef4d2edcc48e06faf0820b0c3
dreammaster
dreammaster at scummvm.org
Sat Sep 20 16:42:28 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9a0ba3e634 MADS: Add new Animation fields needed by AnimView
Commit: 9a0ba3e63443fcfef4d2edcc48e06faf0820b0c3
https://github.com/scummvm/scummvm/commit/9a0ba3e63443fcfef4d2edcc48e06faf0820b0c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-09-20T10:41:52-04:00
Commit Message:
MADS: Add new Animation fields needed by AnimView
Changed paths:
engines/mads/animation.cpp
engines/mads/animation.h
diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 556c475..e4ca26d 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -32,10 +32,8 @@ void AAHeader::load(Common::SeekableReadStream *f) {
_miscEntriesCount = f->readUint16LE();
_frameEntriesCount = f->readUint16LE();
_messagesCount = f->readUint16LE();
- f->skip(1);
- _flags = f->readByte();
-
- f->skip(2);
+ _loadFlags = f->readUint16LE();
+ _charSpacing = f->readSint16LE();
_bgType = (AnimBgType)f->readUint16LE();
_roomNumber = f->readUint16LE();
f->skip(2);
@@ -134,7 +132,8 @@ void AnimMiscEntry::load(Common::SeekableReadStream *f) {
_numTicks = f->readUint16LE();
_posAdjust.x = f->readSint16LE();
_posAdjust.y = f->readSint16LE();
- _field8 = f->readUint16LE();
+ _scroll.x = f->readSByte();
+ _scroll.y = f->readSByte();
}
/*------------------------------------------------------------------------*/
@@ -275,7 +274,7 @@ void Animation::load(UserInterface &interfaceSurface, DepthSurface &depthSurface
// If the animation specifies a font, then load it for access
delete _font;
- if (_header._flags & ANIMFLAG_CUSTOM_FONT) {
+ if (_header._loadFlags & ANIMFLAG_CUSTOM_FONT) {
Common::String fontName = "*" + _header._fontResource;
_font = _vm->_font->getFont(fontName.c_str());
} else {
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index 4bf330e..c14f7c8 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -34,8 +34,8 @@
namespace MADS {
enum AnimFlag {
- ANIMFLAG_DITHER = 0x0001, // Dither to 16 colors
- ANIMFLAG_CUSTOM_FONT = 0x0020, // Load ccustom font
+ ANIMFLAG_DITHER = 0x1000, // Dither to 16 colors
+ ANIMFLAG_CUSTOM_FONT = 0x2000, // Load ccustom font
ANIMFLAG_LOAD_BACKGROUND = 0x0100, // Load background
ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200 // Load background only
};
@@ -82,7 +82,7 @@ public:
int _msgIndex;
int _numTicks;
Common::Point _posAdjust;
- int _field8;
+ Common::Point _scroll;
/**
* Loads data for the record
@@ -116,7 +116,8 @@ public:
int _miscEntriesCount;
int _frameEntriesCount;
int _messagesCount;
- byte _flags;
+ int _loadFlags;
+ int _charSpacing;
AnimBgType _bgType;
int _roomNumber;
bool _manualFlag;
More information about the Scummvm-git-logs
mailing list