libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Fix display of user interface during animation

Browse Source
This commit is contained in:
Paul Gilbert 2014-03-15 18:52:44 -04:00
parent b652e2eafd
commit ca6cf0eaf2
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/mads/mads.h
View File

@ -39,7 +39,6 @@
#include "mads/msurface.h"
#include "mads/resources.h"
#include "mads/sound.h"
#include "mads/user_interface.h"
/**
* This is the namespace of the MADS engine.

16
engines/mads/msurface.cpp
View File

@ -34,20 +34,32 @@ MADSEngine *MSurface::_vm = nullptr;
MSurface::MSurface() {
pixels = nullptr;
_freeFlag = false;
}
MSurface::MSurface(int width, int height) {
pixels = nullptr;
_freeFlag = false;
setSize(width, height);
}
MSurface::~MSurface() {
Graphics::Surface::free();
if (_freeFlag)
Graphics::Surface::free();
}
void MSurface::setSize(int width, int height) {
Graphics::Surface::free();
if (_freeFlag)
Graphics::Surface::free();
Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
_freeFlag = true;
}
void MSurface::setPixels(byte *pData, int horizSize, int vertSize) {
_freeFlag = false;
pixels = pData;
w = horizSize;
h = vertSize;
}
int MSurface::scaleValue(int value, int scale, int err) {

8
engines/mads/msurface.h
View File

@ -50,6 +50,8 @@ struct SpriteInfo {
* MADS graphics surface
*/
class MSurface : public Graphics::Surface {
private:
bool _freeFlag;
protected:
static MADSEngine *_vm;
public:
@ -83,6 +85,12 @@ public:
*/
void setSize(int width, int height);
/**
* Sets the pixels the surface is associated with
* @remarks The surface will not free the data block
*/
void setPixels(byte *pData, int horizSize, int vertSize);
/**
* Draws an arbitrary line on the screen using a specified color
* @param startPos Starting position

5
engines/mads/user_interface.cpp
View File

@ -39,6 +39,9 @@ void SceneNode::load(Common::SeekableReadStream *f) {
UserInterface::UserInterface(MADSEngine *vm) : _vm(vm) {
_category = CAT_NONE;
_screenObjectsCount = 0;
byte *pData = _vm->_screen.getBasePtr(0, MADS_SCREEN_HEIGHT - MADS_INTERFACE_HEIGHT);
setPixels(pData, MADS_SCREEN_WIDTH, MADS_INTERFACE_HEIGHT);
}
void UserInterface::load(const Common::String &resName) {
@ -61,7 +64,6 @@ void UserInterface::load(const Common::String &resName) {
delete palStream;
// set the size for the interface
setSize(MADS_SCREEN_WIDTH, MADS_INTERFACE_HEIGHT);
Common::SeekableReadStream *pixelsStream = madsPack.getItemStream(1);
pixelsStream->read(getData(), MADS_SCREEN_WIDTH * MADS_INTERFACE_HEIGHT);
delete pixelsStream;
@ -84,7 +86,6 @@ void UserInterface::setup(int id) {
resName += "A";
resName += ".INT";
free();
load(resName);
}
scene._screenObjects._v832EC = id;