aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorMartin Kiewitz2009-11-04 12:54:27 +0000
committerMartin Kiewitz2009-11-04 12:54:27 +0000
commit429c06c5ae7d9a1cd144994aaff46f87a13a1943 (patch)
tree56e19ef7ddf53f5cc2b9ba64d37711666139aedd /engines/sci/gui
parent12e3375f3b47e6e626d8457257fd2036ed835ab1 (diff)
downloadscummvm-rg350-429c06c5ae7d9a1cd144994aaff46f87a13a1943.tar.gz
scummvm-rg350-429c06c5ae7d9a1cd144994aaff46f87a13a1943.tar.bz2
scummvm-rg350-429c06c5ae7d9a1cd144994aaff46f87a13a1943.zip
SCI/newgui: kGraph / InitPriority changed to reflect sci0 implementation, also moved code
svn-id: r45661
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui.cpp16
-rw-r--r--engines/sci/gui/gui.h3
2 files changed, 9 insertions, 10 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index baca9e5005..6f7ab143e7 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -101,14 +101,6 @@ void SciGui::initPriorityBands() {
}
}
-void SciGui::modifyPriorityBands(int top, int bottom) {
- if (_usesOldGfxFunctions) {
- _gfx->PriorityBandsInit(15, top, bottom);
- } else {
- _gfx->PriorityBandsInit(14, top, bottom);
- }
-}
-
void SciGui::wait(int16 ticks) {
uint32 time;
@@ -508,6 +500,14 @@ void SciGui::graphRedrawBox(Common::Rect rect) {
_gfx->SetPort(oldPort);
}
+void SciGui::graphAdjustPriority(int top, int bottom) {
+ if (_usesOldGfxFunctions) {
+ _gfx->PriorityBandsInit(15, top, bottom);
+ } else {
+ _gfx->PriorityBandsInit(14, top, bottom);
+ }
+}
+
int16 SciGui::picNotValid(int16 newPicNotValid) {
int16 oldPicNotValid = _screen->_picNotValid;
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index f1cef36a6f..008aae1c92 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -105,6 +105,7 @@ public:
virtual void graphRestoreBox(reg_t handle);
virtual void graphUpdateBox(Common::Rect rect);
virtual void graphRedrawBox(Common::Rect rect);
+ virtual void graphAdjustPriority(int top, int bottom);
virtual int16 picNotValid(int16 newPicNotValid);
@@ -145,8 +146,6 @@ 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 void modifyPriorityBands(int top, int bottom);
-
virtual bool debugUndither(bool flag);
virtual bool debugShowMap(int mapNo);