SCI/gui: renaming...

svn-id: r44619
This commit is contained in:
Martin Kiewitz 2009-10-04 16:37:02 +00:00
parent ec526ca461
commit 4a9804a044
2 changed files with 6 additions and 6 deletions

View File

@ -487,7 +487,7 @@ void SciGUI32::textColors(int argc, reg_t *argv) {
// stub
}
void SciGUI32::drawPicture(sciResourceId pictureId, uint16 showStyle, uint16 flags, int16 EGApaletteNo) {
void SciGUI32::drawPicture(GUIResourceId pictureId, uint16 showStyle, uint16 flags, int16 EGApaletteNo) {
drawn_pic_t dp;
gfx_color_t transparent = s->wm_port->_bgcolor;
int picFlags = DRAWPIC01_FLAG_FILL_NORMALLY;
@ -552,7 +552,7 @@ void SciGUI32::drawPicture(sciResourceId pictureId, uint16 showStyle, uint16 fla
s->pic_is_new = 1;
}
void SciGUI32::drawCell(sciResourceId viewId, uint16 loopNo, uint16 cellNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo) {
void SciGUI32::drawCell(GUIResourceId viewId, GUIViewLoopNo loopNo, GUIViewCellNo cellNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo) {
int loop = loopNo;
int cel = cellNo;
GfxView *new_view;
@ -1957,7 +1957,7 @@ void SciGUI32::addToPicList(reg_t listReference, int argc, reg_t *argv) {
reparentize_primary_widget_lists(s, s->port);
}
void SciGUI32::addToPicView(sciResourceId viewId, uint16 loopNo, uint16 cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control) {
void SciGUI32::addToPicView(GUIResourceId viewId, GUIViewLoopNo loopNo, GUIViewCellNo cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control) {
assert_primary_widget_lists(s);
GfxWidget *widget;

View File

@ -51,8 +51,8 @@ public:
void textFonts(int argc, reg_t *argv);
void textColors(int argc, reg_t *argv);
void drawPicture(sciResourceId pictureId, uint16 showStyle, uint16 flags, int16 EGApaletteNo);
void drawCell(sciResourceId viewId, uint16 loopNo, uint16 cellNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo);
void drawPicture(GUIResourceId pictureId, uint16 showStyle, uint16 flags, int16 EGApaletteNo);
void drawCell(GUIResourceId viewId, GUIViewLoopNo loopNo, GUIViewCellNo cellNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo);
void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool inverse);
void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool inverse);
@ -70,7 +70,7 @@ public:
int16 onControl(byte screenMask, Common::Rect rect);
void animate(reg_t castListReference, bool cycle, int argc, reg_t *argv);
void addToPicList(reg_t listReference, int argc, reg_t *argv);
void addToPicView(sciResourceId viewId, uint16 loopNo, uint16 cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
void addToPicView(GUIResourceId viewId, GUIViewLoopNo loopNo, GUIViewCellNo cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
void setNowSeen(reg_t objectReference);
void moveCursor(int16 x, int16 y);