Fix outdated comments

svn-id: r40003

3 files changed, 9 insertions, 25 deletions

diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index ddc197a95e..a040d68062 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -123,7 +123,7 @@ public:
 	/* Retrieves the static palette from the interpreter-specific code
 	** Parameters: (int *) colors_nr: Number of colors to use
 	**             (int) nr: The palette to read
-	** Returns   : (gfx_pixmap_color_t *) *colors_nr static color entries
+	** Returns   : (Palette *) static palette
 	**             if a static palette must be used, NULL otherwise
 	*/
 	Palette *getPalette(int *colors_nr, int num = 999);
@@ -158,7 +158,7 @@ public:
 	**             (int) default_palette: The default palette to use for drawing (if applicable)
 	**             (bool) scaled: Whether to return the scaled maps, or the unscaled
 	**                           ones (which may be identical) for some special operations.
-	** Returns   : (gfx_pic_t *) The appropriate pic resource with all maps as index (but not
+	** Returns   : (gfxr_pic_t *) The appropriate pic resource with all maps as index (but not
 	**                           neccessarily translated) data.
 	*/
 	gfxr_pic_t *getPic(int num, int maps, int flags, int default_palette, bool scaled = false);
@@ -171,7 +171,7 @@ public:
 	**             (int) default_palette: The default palette to use for drawing (if applicable)
 	**             (int) scaled: Whether to return the scaled maps, or the unscaled
 	**                           ones (which may be identical) for some special operations.
-	** Returns   : (gfx_pic_t *) The appropriate pic resource with all maps as index (but not
+	** Returns   : (gfxr_pic_t *) The appropriate pic resource with all maps as index (but not
 	**                           neccessarily translated) data.
 	** This function invalidates the cached pic pointed to by old_nr in the cache. While subsequent
 	** addToPic() writes will still modify the 'invalidated' pic, gfxr_get_pic() operations will
diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h
index cff5f2f103..6479badb92 100644
--- a/engines/sci/gfx/gfx_resource.h
+++ b/engines/sci/gfx/gfx_resource.h
@@ -183,7 +183,7 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int fill_normally, int default_palette,
 **             (gfxr_pic0_params_t *) style: The drawing style
 **             (int) resid: The resource ID
 **             (int) sci1: Nonzero if SCI1
-**             (gfx_pixmap_color_t *) static_pal: The static palette
+**             (Palette *) static_pal: The static palette
 **             (int) static_pal_nr: Number of entries in static palette
 ** Returns   : (void)
 ** The result is stored in gfxr_visual_map, gfxr_priority_map, and gfxr_control_map.
@@ -203,7 +203,7 @@ void gfxr_draw_pic11(gfxr_pic_t *pic, int fill_normally, int default_palette,
 **             (byte *) resource: Pointer to the resource data
 **             (gfxr_pic0_params_t *) style: The drawing style
 **             (int) resid: The resource ID
-**             (gfx_pixmap_color_t *) static_pal: The static palette
+**             (Palette *) static_pal: The static palette
 **             (int) static_pal_nr: Number of entries in static palette
 ** Returns   : (void)
 ** The result is stored in gfxr_visual_map, gfxr_priority_map, and gfxr_control_map.
@@ -259,7 +259,7 @@ Palette *gfxr_read_pal1(int id, byte *resource, int size);
 **                                will be stored in
 **             (byte *) resource: Source data
 **             (int) size: Size of the memory block pointed to by resource
-** Returns   : (gfx_pixmap_color_t *) *colors_nr color_t entries with the colors
+** Returns   : (Palette *) *colors_nr Palette with the colors
 */
 
 Palette *gfxr_read_pal1_amiga(Common::File &file);
@@ -267,7 +267,7 @@ Palette *gfxr_read_pal1_amiga(Common::File &file);
 ** Parameters: (int *) colors_nr: Pointer to the variable the number of colors
 **                                will be stored in
 **             (FILE *) f: Palette file
-** Returns   : (gfx_pixmap_color_t *) *colors_nr color_t entries with the colors
+** Returns   : (Palette *) Palette with the colors
 */
 
 Palette *gfxr_read_pal11(int id, byte *resource, int size);
@@ -277,7 +277,7 @@ Palette *gfxr_read_pal11(int id, byte *resource, int size);
 **                                will be stored in
 **             (byte *) resource: Source data
 **             (int) size: Size of the memory block pointed to by resource
-** Returns   : (gfx_pixmap_color_t *) *colors_nr color_t entries with the colors
+** Returns   : (Palette *) Palette with the colors
 */
 
 gfxr_view_t *gfxr_draw_view1(int id, byte *resource, int size, Palette *static_pal);
@@ -285,7 +285,7 @@ gfxr_view_t *gfxr_draw_view1(int id, byte *resource, int size, Palette *static_p
 ** Parameters: (int) id: Resource ID of the view
 **             (byte *) resource: Pointer to the resource to read
 **             (int) size: Size of the resource
-**             (gfx_pixmap_color_t *) static_pal: The static palette
+**             (Palette *) static_pal: The static palette
 **             (int) static_pal_nr: Number of entries in static palette
 ** Returns   : (gfxr_view_t *) The resulting view
 */
diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h
index bf49c20fb3..97c599d94b 100644
--- a/engines/sci/gfx/gfx_tools.h
+++ b/engines/sci/gfx/gfx_tools.h
@@ -190,22 +190,6 @@ int gfx_crossblit_pixmap(gfx_mode_t *mode, gfx_pixmap_t *pxm, int priority,
 ** linear access.
 */
 
-//int gfx_alloc_color(gfx_palette_t *pal, gfx_pixmap_color_t *color);
-/* Allocates a color entry for the specified pixmap color
-** Parameters: (gfx_palette_t *) pal: The palette structure the color should be allocated in
-**             (gfx_pixmap_color_t *) color: The color to allocate
-** Returns   : (int) GFX_ERROR if any error occured, GFX_OK if the color could be mapped to an
-**                   existing color or a positive value if a new color was allocated in the
-**                   palette.
-*/
-
-//int gfx_free_color(gfx_palette_t *pal, gfx_pixmap_color_t *color);
-/* Frees the color entry allocated for the specified pixmap color
-** Parameters: (gfx_palette_t *) pal: The palette structure the color was previously allocated in
-**             (gfx_pixmap_color_t *) color: The color to free
-** Returns   : (int) GFX_ERROR if any error occured, GFX_OK otherwise
-*/
-
 gfx_pixmap_t *gfx_pixmap_scale_index_data(gfx_pixmap_t *pixmap, gfx_mode_t *mode);
 /* Scales the index data associated with a pixmap
 ** Parameters: (gfx_pixmap_t *) pixmap: The pixmap whose index data should be scaled