- Some work on kLocalToGlobal and kGlobalToLocal for SCI2+

- Removed the custom types MemoryHandle, LoopNo, CelNo (cause we ended up having code like LoopNo loopNo = ...)
- Improved the sanity checks in frameOut()

svn-id: r47087
This commit is contained in:
Filippos Karapetis 2010-01-06 17:25:54 +00:00
parent 9a99226d31
commit 254850aa23
13 changed files with 85 additions and 77 deletions

View file

@ -36,9 +36,6 @@ namespace Sci {
#define SCI_SHAKE_DIRECTION_HORIZONTAL 2
typedef int GuiResourceId; // is a resource-number and -1 means no parameter given
typedef reg_t MemoryHandle;
typedef int16 LoopNo;
typedef int16 CelNo;
typedef int16 TextAlignment;
@ -80,15 +77,15 @@ struct Window : public Port {
struct AnimateEntry {
reg_t object;
GuiResourceId viewId;
LoopNo loopNo;
CelNo celNo;
int16 loopNo;
int16 celNo;
int16 paletteNo;
int16 x, y, z;
int16 priority;
uint16 signal;
Common::Rect celRect;
bool showBitsFlag;
MemoryHandle castHandle;
reg_t castHandle;
};
typedef Common::List<AnimateEntry *> AnimateList;