aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-30 18:33:03 +0000
committerFilippos Karapetis2009-12-30 18:33:03 +0000
commitd4556f5a26864171e4ff437aae855f8f79e9531a (patch)
tree735d5616ef2943082f8526425e319a96c705c219 /engines/sci/gui
parent1e4a7752411317919f7420009abc59595774b1ab (diff)
downloadscummvm-rg350-d4556f5a26864171e4ff437aae855f8f79e9531a.tar.gz
scummvm-rg350-d4556f5a26864171e4ff437aae855f8f79e9531a.tar.bz2
scummvm-rg350-d4556f5a26864171e4ff437aae855f8f79e9531a.zip
SCI32: Added sanity checks to kAddScreenItem and kUpdateScreenItem, so that they don't try and draw cels outside the screen
svn-id: r46767
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui.cpp8
-rw-r--r--engines/sci/gui/gui.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 33d124cc54..fcbe4f9a05 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -823,6 +823,14 @@ void SciGui::portraitShow(Common::String resourceName, Common::Point position, u
void SciGui::portraitUnload(uint16 portraitId) {
}
+uint16 SciGui::getScreenWidth() {
+ return _screen->_displayWidth;
+}
+
+uint16 SciGui::getScreenHeight() {
+ return _screen->_displayHeight;
+}
+
bool SciGui::debugUndither(bool flag) {
_screen->unditherSetState(flag);
return false;
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 4db3d931d2..ee1604d25b 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -149,6 +149,9 @@ public:
virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
virtual void portraitUnload(uint16 portraitId);
+ virtual uint16 getScreenWidth();
+ virtual uint16 getScreenHeight();
+
virtual bool debugUndither(bool flag);
virtual bool debugShowMap(int mapNo);