thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TWINE: use stream to parse the sprite offsets

Browse source
This commit is contained in:
Martin Gerhardy 2020-11-05 00:25:34 +01:00
parent c8183e2926
commit e498b80bed
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
engines/twine/redraw.cpp
View file

@ -21,6 +21,7 @@
*/ */
#include "twine/redraw.h" #include "twine/redraw.h"
#include "common/memstream.h"
#include "common/textconsole.h" #include "common/textconsole.h"
#include "graphics/surface.h" #include "graphics/surface.h"
#include "twine/actor.h" #include "twine/actor.h"
@ -448,8 +449,10 @@ void Redraw::redrawEngineActions(int32 bgRedraw) { // fullRedraw
_engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, spritePtr); _engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, spritePtr);
// calculate sprite position on screen // calculate sprite position on screen
renderLeft = _engine->_renderer->projPosX + *((const int16 *)(_engine->_resources->spriteBoundingBoxPtr + (actor2->entity * 16))); Common::MemoryReadStream stream(_engine->_resources->spriteBoundingBoxPtr, _engine->_resources->spriteBoundingBoxSize);
renderTop = _engine->_renderer->projPosY + *((const int16 *)(_engine->_resources->spriteBoundingBoxPtr + (actor2->entity * 16) + 2)); stream.seek(actor2->entity * 16);
renderLeft = _engine->_renderer->projPosX + stream.readSint16LE();
renderTop = _engine->_renderer->projPosY + stream.readSint16LE();
renderRight = renderLeft + spriteWidth; renderRight = renderLeft + spriteWidth;
renderBottom = renderTop + spriteHeight; renderBottom = renderTop + spriteHeight;
@ -500,8 +503,10 @@ void Redraw::redrawEngineActions(int32 bgRedraw) { // fullRedraw
_engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, _engine->_resources->spriteTable[extra->info0]); _engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, _engine->_resources->spriteTable[extra->info0]);
// calculate sprite position on screen // calculate sprite position on screen
renderLeft = _engine->_renderer->projPosX + *(const int16 *)(_engine->_resources->spriteBoundingBoxPtr + extra->info0 * 16); Common::MemoryReadStream stream(_engine->_resources->spriteBoundingBoxPtr, _engine->_resources->spriteBoundingBoxSize);
renderTop = _engine->_renderer->projPosY + *(const int16 *)(_engine->_resources->spriteBoundingBoxPtr + extra->info0 * 16 + 2); stream.seek(extra->info0 * 16);
renderLeft = _engine->_renderer->projPosX + stream.readSint16LE();
renderTop = _engine->_renderer->projPosY + stream.readSint16LE();
renderRight = renderLeft + spriteWidth; renderRight = renderLeft + spriteWidth;
renderBottom = renderTop + spriteHeight; renderBottom = renderTop + spriteHeight;
@ -567,8 +572,10 @@ void Redraw::redrawEngineActions(int32 bgRedraw) { // fullRedraw
int32 spriteWidth, spriteHeight; int32 spriteWidth, spriteHeight;
_engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, spritePtr); _engine->_grid->getSpriteSize(0, &spriteWidth, &spriteHeight, spritePtr);
const int16 offsetX = *((const int16 *)(_engine->_resources->spriteBoundingBoxPtr + (overlay->info0 * 16))); Common::MemoryReadStream stream(_engine->_resources->spriteBoundingBoxPtr, _engine->_resources->spriteBoundingBoxSize);
const int16 offsetY = *((const int16 *)(_engine->_resources->spriteBoundingBoxPtr + (overlay->info0 * 16) + 2)); stream.seek(overlay->info0 * 16);
const int16 offsetX = stream.readSint16LE();
const int16 offsetY = stream.readSint16LE();
renderLeft = offsetX + overlay->x; renderLeft = offsetX + overlay->x;
renderTop = offsetY + overlay->y; renderTop = offsetY + overlay->y;