libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Stop windows from going off-screen to the right

Browse Source
This commit is contained in:
Paul Gilbert 2015-07-26 21:15:57 -04:00
parent 20a067a662
commit c2d1369546
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sherlock/scene.h
View File

@ -246,11 +246,6 @@ public:
*/
void selectScene();
/**
* Fres all the graphics and other dynamically allocated data for the scene
*/
void freeScene();
/**
* Check the scene's objects against the game flags. If false is passed,
* it means the scene has just been loaded. A value of true means that the scene
@ -280,6 +275,11 @@ public:
*/
int whichZone(const Common::Point &pt);
/**
* Fres all the graphics and other dynamically allocated data for the scene
*/
virtual void freeScene();
/**
* Returns the index of the closest zone to a given point.
*/

9
engines/sherlock/tattoo/tattoo_scene.cpp
View File

@ -292,6 +292,15 @@ void TattooScene::checkBgShapes() {
}
}
void TattooScene::freeScene() {
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
Scene::freeScene();
delete ui._mask;
delete ui._mask1;
ui._mask = ui._mask1 = nullptr;
}
void TattooScene::doBgAnimCheckCursor() {
Events &events = *_vm->_events;
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;

5
engines/sherlock/tattoo/tattoo_scene.h
View File

@ -117,6 +117,11 @@ public:
*/
int getScaleVal(const Point32 &pt);
/**
* Fres all the graphics and other dynamically allocated data for the scene
*/
virtual void freeScene();
/**
* Draw all objects and characters.
*/

2
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -65,6 +65,8 @@ TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm),
TattooUserInterface::~TattooUserInterface() {
delete _interfaceImages;
delete _mask;
delete _mask1;
}
void TattooUserInterface::initScrollVars() {

4
engines/sherlock/tattoo/widget_base.cpp
View File

@ -177,8 +177,8 @@ void WidgetBase::restrictToScreen() {
_bounds.moveTo(screen._currentScroll.x, _bounds.top);
if (_bounds.top < 0)
_bounds.moveTo(_bounds.left, 0);
if (_bounds.right > screen._backBuffer1.w())
_bounds.moveTo(screen._backBuffer1.w() - _bounds.width(), _bounds.top);
if (_bounds.right > (screen._currentScroll.x + SHERLOCK_SCREEN_WIDTH))
_bounds.moveTo(screen._currentScroll.x + SHERLOCK_SCREEN_WIDTH - _bounds.width(), _bounds.top);
if (_bounds.bottom > screen._backBuffer1.h())
_bounds.moveTo(_bounds.left, screen._backBuffer1.h() - _bounds.height());
}