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

[thebluegr at users.sourceforge.net]

Revision: 39633
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39633&view=rev
Author:   thebluegr
Date:     2009-03-23 14:24:10 +0000 (Mon, 23 Mar 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.h

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-03-23 12:30:47 UTC (rev 39632)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-03-23 14:24:10 UTC (rev 39633)
@@ -92,14 +92,6 @@
 	s->opcodes = NULL;
 }
 
-
-static int _init_graphics_input(EngineState *s) {
-	s->pic_priority_table = NULL;
-	s->pics = NULL;
-	s->pics_nr = 0;
-	return 0;
-}
-
 static void _sci1_alloc_system_colors(EngineState *s) {
 	gfx_color_t black = { PaletteEntry(0, 0, 0), 0, 0, 0, GFX_MASK_VISUAL };
 	gfxop_set_system_color(s->gfx_state, 0, &black);
@@ -509,8 +501,9 @@
 
 	sciprintf("Engine initialized\n");
 
-	if (_init_graphics_input(s))
-		return 1;
+	s->pic_priority_table = NULL;
+	s->pics = NULL;
+	s->pics_nr = 0;
 
 	return 0;
 }
@@ -525,11 +518,14 @@
 
 void internal_stringfrag_strncpy(EngineState *s, reg_t *dest, reg_t *src, int len);
 
+#if 0
+// Unreferenced - removed
 void script_set_gamestate_save_dir(EngineState *s, reg_t path) {
 	SystemString *str = &s->sys_strings->strings[SYS_STRING_SAVEDIR];
 	reg_t *srcbuf = kernel_dereference_reg_pointer(s, path, 1);
 	internal_stringfrag_strncpy(s, str->value, srcbuf, MAX_SAVE_DIR_SIZE);
 }
+#endif
 
 void script_free_vm_memory(EngineState *s) {
 	sciprintf("Freeing VM memory\n");

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-03-23 12:30:47 UTC (rev 39632)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-03-23 14:24:10 UTC (rev 39633)
@@ -60,7 +60,7 @@
 
 struct gfx_resource_t {
 	int ID; /* Resource ID */
-	int lock_sequence_nr; /* See description of lock_counter in gfx_resstate_t */
+	int lock_sequence_nr; /* See description of lock_counter in GfxResManager */
 	int mode; /* A mode type hash */
 
 	union {
@@ -84,22 +84,7 @@
 
 typedef Common::HashMap<int, gfx_resource_t *> IntResMap;
 
-struct gfx_resstate_t {
-	int version; /* Interpreter version */
-	gfx_options_t *options;
-	gfx_driver_t *driver;
-	Palette *static_palette;
-	int lock_counter; /* Global lock counter; increased for each new resource allocated.
-			  ** The newly allocated resource will then be assigned the new value
-			  ** of the lock_counter, as will any resources referenced afterwards.
-			  */
-	int tag_lock_counter; /* lock counter value at tag time */
 
-	IntResMap _resourceMaps[GFX_RESOURCE_TYPES_NR];
-	ResourceManager *resManager;
-};
-
-
 class GfxResManager {
 public:
 	GfxResManager(int version, gfx_options_t *options, gfx_driver_t *driver, ResourceManager *resManager);
@@ -195,8 +180,7 @@
 	gfxr_pic_t *addToPic(int old_nr, int new_nr, int flags, int old_default_palette, int default_palette);
 
 	/* Calculate a picture
-	** Parameters: (gfx_resstate_t *) state: The resource state, containing options and version information
-	**             (gfxr_pic_t *) scaled_pic: The pic structure that is to be written to
+	** Parameters: (gfxr_pic_t *) scaled_pic: The pic structure that is to be written to
 	**             (gfxr_pic_t *) unscaled_pic: The pic structure the unscaled pic is to be written to,
 	**                                          or NULL if it isn't needed.
 	**             (int) flags: Pic drawing flags (interpreter dependant)


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