aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui32
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-31 17:54:28 +0000
committerFilippos Karapetis2009-10-31 17:54:28 +0000
commitc64fa600b7cd1eb185f29a29de75dd19497c4857 (patch)
tree227cd9efb3ef37887a5546f8c9011c80e74bab01 /engines/sci/gui32
parent2b29b53b473af96e910066ce090e526dc0a5fb62 (diff)
downloadscummvm-rg350-c64fa600b7cd1eb185f29a29de75dd19497c4857.tar.gz
scummvm-rg350-c64fa600b7cd1eb185f29a29de75dd19497c4857.tar.bz2
scummvm-rg350-c64fa600b7cd1eb185f29a29de75dd19497c4857.zip
- Added some TODOs
- Disabled the kGraph case used in KQ6 Windows for now, as it's problematic and crashes the game - Added extra param to kDrawCel(), used in KQ6 Windows The icon bar in KQ6 Windows is shown a bit better now svn-id: r45567
Diffstat (limited to 'engines/sci/gui32')
-rw-r--r--engines/sci/gui32/gui32.cpp2
-rw-r--r--engines/sci/gui32/gui32.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index 12ec90e8e8..8d6cabafaf 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -883,7 +883,7 @@ void SciGui32::drawPicture(GuiResourceId pictureId, int16 animationNr, bool anim
_s->pic_is_new = 1;
}
-void SciGui32::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo) {
+void SciGui32::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight) {
int loop = loopNo;
int cel = celNo;
GfxView *new_view;
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index d76fc772da..66c0772ff7 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -62,7 +62,7 @@ public:
void drawMenuBar();
void clearMenuBar();
void drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
- void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo);
+ void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight = -1);
void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);
void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 alignment, int16 style, bool hilite);
void drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);