diff options
-rw-r--r-- | engines/dreamweb/backdrop.cpp | 3 | ||||
-rw-r--r-- | engines/dreamweb/dreamweb.h | 2 | ||||
-rw-r--r-- | engines/dreamweb/sprite.cpp | 7 | ||||
-rw-r--r-- | engines/dreamweb/structs.h | 10 |
4 files changed, 4 insertions, 18 deletions
diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp index 9f47c72285..887da70539 100644 --- a/engines/dreamweb/backdrop.cpp +++ b/engines/dreamweb/backdrop.cpp @@ -114,14 +114,13 @@ void DreamWebEngine::makeBackOb(SetObject *objData, uint16 x, uint16 y) { return; uint8 priority = objData->priority; uint8 type = objData->type; - Sprite *sprite = makeSprite(x, y, false, &_setFrames, 0); + Sprite *sprite = makeSprite(x, y, false, &_setFrames); sprite->_objData = objData; if (priority == 255) priority = 0; sprite->priority = priority; sprite->type = type; - sprite->b16 = 0; sprite->delay = 0; sprite->animFrame = 0; } diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 95f92960be..b7713352ff 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -726,7 +726,7 @@ public: void printSprites(); void printASprite(const Sprite *sprite); void clearSprites(); - Sprite *makeSprite(uint8 x, uint8 y, bool _mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi); + Sprite *makeSprite(uint8 x, uint8 y, bool _mainManCallback, const GraphicsFile *frameData); void initMan(); void walking(Sprite *sprite); void aboutTurn(Sprite *sprite); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 97d8d72b1f..e662fa6ec3 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -64,7 +64,7 @@ void DreamWebEngine::clearSprites() { _spriteTable.clear(); } -Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi) { +Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const GraphicsFile *frameData) { // Note: the original didn't append sprites here, but filled up the // first unused entry. This can change the order of entries, but since they // are drawn based on the priority field, this shouldn't matter. @@ -77,8 +77,6 @@ Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const sprite->x = x; sprite->y = y; sprite->_frameData = frameData; - sprite->w8 = somethingInDi; - sprite->w2 = 0xffff; sprite->frameNumber = 0; sprite->delay = 0; sprite->_objData = 0; @@ -93,7 +91,6 @@ void DreamWebEngine::spriteUpdate() { Common::List<Sprite>::iterator i; for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) { Sprite &sprite = *i; - sprite.w24 = sprite.w2; if (sprite._mainManCallback) mainMan(&sprite); else { @@ -106,7 +103,7 @@ void DreamWebEngine::spriteUpdate() { } void DreamWebEngine::initMan() { - Sprite *sprite = makeSprite(_ryanX, _ryanY, true, &_mainSprites, 0); + Sprite *sprite = makeSprite(_ryanX, _ryanY, true, &_mainSprites); sprite->priority = 4; sprite->speed = 0; sprite->walkFrame = 0; diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h index 55ed7bf3df..b34715addf 100644 --- a/engines/dreamweb/structs.h +++ b/engines/dreamweb/structs.h @@ -33,25 +33,15 @@ struct SetObject; struct Sprite { bool _mainManCallback; - uint16 w2; - uint16 w4; const GraphicsFile *_frameData; - uint16 w8; uint8 x; uint8 y; - uint16 w12; - uint8 b14; uint8 frameNumber; - uint8 b16; - uint8 b17; uint8 delay; uint8 animFrame; // index into SetObject::frames SetObject *_objData; uint8 speed; uint8 priority; - uint16 w24; - uint16 w26; - uint8 b28; uint8 walkFrame; uint8 type; uint8 hidden; |