Cleanup

svn-id: r44991

2 files changed, 3 insertions, 15 deletions

diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 0dacd1a23c..bcf7c8309a 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -99,11 +99,6 @@ enum kLanguage {
 	K_LANG_PORTUGUESE = 351
 };
 
-struct drawn_pic_t {
-	int nr;
-	int palette;
-};
-
 class FileHandle {
 public:
 	Common::String _name;
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index 3eb3fec67d..5de030992c 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -518,16 +518,9 @@ void SciGui32::clearMenuBar() {
 }
 
 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;
-
-	dp.nr = pictureId;
-	if (EGApaletteNo != -1) {
-		dp.palette = EGApaletteNo;
-	} else {
-		dp.palette = 0;
-	}
+	int palNo = (EGApaletteNo != -1) ? EGApaletteNo : 0;
 
 	if (mirroredFlag)
 		picFlags |= DRAWPIC1_FLAG_MIRRORED;
@@ -542,9 +535,9 @@ void SciGui32::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirr
 
 	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;