[Scummvm-cvs-logs] SF.net SVN: scummvm:[44619] scummvm/trunk/engines/sci/gui32

[m_kiewitz at users.sourceforge.net]

Revision: 44619
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44619&view=rev
Author:   m_kiewitz
Date:     2009-10-04 16:37:02 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI/gui: renaming...

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui32/gui32.cpp
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-04 16:35:02 UTC (rev 44618)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-04 16:37:02 UTC (rev 44619)
@@ -487,7 +487,7 @@
 	// 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 @@
 	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 @@
 	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;

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 16:35:02 UTC (rev 44618)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 16:37:02 UTC (rev 44619)
@@ -51,8 +51,8 @@
 	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 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.