[Scummvm-cvs-logs] SF.net SVN: scummvm:[44991] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Oct 12 19:21:23 CEST 2009
Revision: 44991
http://scummvm.svn.sourceforge.net/scummvm/?rev=44991&view=rev
Author: thebluegr
Date: 2009-10-12 17:21:23 +0000 (Mon, 12 Oct 2009)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/state.h
scummvm/trunk/engines/sci/gui32/gui32.cpp
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-10-12 16:00:30 UTC (rev 44990)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-10-12 17:21:23 UTC (rev 44991)
@@ -99,11 +99,6 @@
K_LANG_PORTUGUESE = 351
};
-struct drawn_pic_t {
- int nr;
- int palette;
-};
-
class FileHandle {
public:
Common::String _name;
Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-10-12 16:00:30 UTC (rev 44990)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-10-12 17:21:23 UTC (rev 44991)
@@ -518,17 +518,10 @@
}
void SciGui32::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
- drawn_pic_t dp;
gfx_color_t transparent = s->wm_port->_bgcolor;
int picFlags = DRAWPIC01_FLAG_FILL_NORMALLY;
+ int palNo = (EGApaletteNo != -1) ? EGApaletteNo : 0;
- dp.nr = pictureId;
- if (EGApaletteNo != -1) {
- dp.palette = EGApaletteNo;
- } else {
- dp.palette = 0;
- }
-
if (mirroredFlag)
picFlags |= DRAWPIC1_FLAG_MIRRORED;
@@ -542,9 +535,9 @@
debugC(2, kDebugLevelGraphics, "Drawing pic.%03d\n", pictureId);
if (addToFlag) {
- gfxop_add_to_pic(s->gfx_state, dp.nr, picFlags, dp.palette);
+ gfxop_add_to_pic(s->gfx_state, pictureId, picFlags, palNo);
} else {
- gfxop_new_pic(s->gfx_state, dp.nr, picFlags, dp.palette);
+ gfxop_new_pic(s->gfx_state, pictureId, picFlags, palNo);
}
delete s->wm_port;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list