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

[thebluegr at users.sourceforge.net]

Revision: 39514
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39514&view=rev
Author:   thebluegr
Date:     2009-03-18 11:25:23 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Slight cleanup

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp	2009-03-18 11:07:29 UTC (rev 39513)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp	2009-03-18 11:25:23 UTC (rev 39514)
@@ -112,14 +112,6 @@
 	return NULL;
 }
 
-void apply_assign(gfx_res_assign_t *conf, gfx_pixmap_t *pxm) {
-	if (pxm->palette)
-		pxm->palette->free();
-
-	pxm->palette = new Palette(conf->assign.palette.colors, conf->assign.palette.colors_nr);
-	pxm->palette->name = "res";
-}
-
 void apply_mod(gfx_res_mod_t *mod, gfx_pixmap_t *pxm) {
 	Palette *pal = pxm->palette;
 	int i, pal_size = pal ? pal->size() : 0;
@@ -177,9 +169,16 @@
 
 	conf = find_match(options->res_conf.assign[restype], restype, nr, loop, cel);
 
-	if (conf)
-		apply_assign(&(conf->conf.assign), pxm);
+	if (conf) {
+		// Assign palette
+		if (pxm->palette)
+			pxm->palette->free();
 
+		pxm->palette = new Palette(conf->conf.assign.assign.palette.colors, 
+								   conf->conf.assign.assign.palette.colors_nr);
+		pxm->palette->name = "res";
+	}
+
 	conf = options->res_conf.mod[restype];
 	while (conf) {
 		conf = find_match(conf, restype, nr, loop, cel);


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