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

[thebluegr at users.sourceforge.net]

Revision: 39593
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39593&view=rev
Author:   thebluegr
Date:     2009-03-21 16:42:45 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Cleanup

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp	2009-03-21 16:24:07 UTC (rev 39592)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp	2009-03-21 16:42:45 UTC (rev 39593)
@@ -123,32 +123,23 @@
 		pxm->palette = pal;
 	}
 
-	switch (mod->type) {
+	for (i = 0; i < pal_size; i++) {
+		int v;
 
-	case GFX_RES_MULTIPLY_FIXED: {
-		for (i = 0; i < pal_size; i++) {
-			int v;
-
 #define UPDATE_COL(nm, idx)                        \
 		v = nm;             \
 		v *= mod->mod.factor[idx]; \
 		v >>= 4;                   \
 		nm = (v > 255)? 255 : v;
 
-			PaletteEntry c = pal->getColor(i);
-			UPDATE_COL(c.r, 0);
-			UPDATE_COL(c.g, 1);
-			UPDATE_COL(c.b, 2);
-			pal->setColor(i, c.r, c.g, c.b);
+		PaletteEntry c = pal->getColor(i);
+		UPDATE_COL(c.r, 0);
+		UPDATE_COL(c.g, 1);
+		UPDATE_COL(c.b, 2);
+		pal->setColor(i, c.r, c.g, c.b);
 			
 #undef UPDATE_COL
-		}
-		break;
 	}
-
-	default:
-		GFXERROR("Using unexpected visual resource modifier %d\n", mod->type);
-	}
 }
 
 int gfx_get_res_config(gfx_options_t *options, gfx_pixmap_t *pxm) {

Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.h	2009-03-21 16:24:07 UTC (rev 39592)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.h	2009-03-21 16:42:45 UTC (rev 39593)
@@ -40,8 +40,6 @@
 /* GFX resource assignments */
 
 struct gfx_res_assign_t {
-	short type; /* GFX_RES_ASSIGN_TYPE_* */
-
 	union {
 		struct {
 			int colors_nr;
@@ -53,11 +51,7 @@
 
 /* GFX resource modifications */
 
-#define GFX_RES_MULTIPLY_FIXED 0 /* Linear palette update */
-
 struct gfx_res_mod_t {
-	short type; /* GFX_RES_ASSIGN_TYPE_* */
-
 	union {
 		byte factor[3]; /* divide by 16 to retrieve factor */
 	} mod;


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