Moved modules/sprites.cpp to effect/images_ref.cpp

makefile.lst

@@ -168,7 +168,6 @@ COMMON_SOURCES =					\
 	src/modules/palettes.cpp			\
 	src/modules/recent.cpp				\
 	src/modules/rootmenu.cpp			\
-	src/modules/sprites.cpp				\
 	src/modules/tools.cpp				\
 	src/raster/algo.cpp				\
 	src/raster/algofill.cpp				\
@@ -194,6 +193,7 @@ COMMON_SOURCES =					\
 	src/util/col_file.cpp				\
 	src/util/filetoks.cpp				\
 	src/util/hash.cpp				\
+	src/util/images_ref.cpp				\
 	src/util/misc.cpp				\
 	src/util/msk_file.cpp				\
 	src/util/pic_file.cpp				\

src/commands/cmd_background_from_layer.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "undoable.h"

src/commands/cmd_canvas_size.cpp

@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/cmd_cel_properties.cpp

@@ -26,7 +26,6 @@
 #include "core/app.h"
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_change_image_type.cpp

@@ -24,7 +24,6 @@
 #include "core/app.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/quant.h"
 #include "raster/sprite.h"

src/commands/cmd_clear.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_close_file.cpp

@@ -24,7 +24,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool close_current_sprite();

src/commands/cmd_configure_tools.cpp

@@ -28,7 +28,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/brush.h"
 #include "raster/image.h"

src/commands/cmd_copy.cpp

@@ -21,7 +21,6 @@
 #include "jinete/jbase.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/cmd_crop.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/mask.h"

src/commands/cmd_cut.cpp

@@ -21,7 +21,6 @@
 #include "jinete/jbase.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/cmd_deselect_mask.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_draw_text.cpp

@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 /* static void cmd_draw_text_execute(const char *argument) */

src/commands/cmd_duplicate_layer.cpp

@@ -24,7 +24,6 @@
 #include "console.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_duplicate_sprite.cpp

@@ -27,7 +27,6 @@
 #include "core/app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool cmd_duplicate_sprite_enabled(const char *argument)

src/commands/cmd_exit.cpp

@@ -23,7 +23,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static void cmd_exit_execute(const char *argument)

src/commands/cmd_eyedropper_tool.cpp

@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/image.h"
 #include "widgets/colbar.h"

src/commands/cmd_film_editor.cpp

@@ -21,7 +21,6 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "dialogs/aniedit.h"
 
 static bool cmd_film_editor_enabled(const char *argument)

src/commands/cmd_flip.cpp

@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"

src/commands/cmd_frame_properties.cpp

@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "undoable.h"
 

src/commands/cmd_goto_frame.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "modules/gui.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"
 

src/commands/cmd_goto_layer.cpp

@@ -22,7 +22,6 @@
 #include "core/app.h"
 #include "modules/gui.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"

src/commands/cmd_invert_mask.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/cmd_layer_properties.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 

src/commands/cmd_load_mask.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "dialogs/filesel.h"
 #include "modules/gui.h" 
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_mask_all.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_mask_by_color.cpp

@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "dialogs/maskcol.h"
-#include "modules/sprites.h"
 
 static bool cmd_mask_by_color_enabled(const char *argument)
 {

src/commands/cmd_merge_down_layer.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_new_cel.cpp

@@ -24,7 +24,6 @@
 #include "console.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_new_file.cpp

@@ -31,7 +31,6 @@
 #include "core/cfg.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_new_frame.cpp

@@ -26,7 +26,6 @@
 #include "core/color.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_new_layer.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "undoable.h"

src/commands/cmd_new_layer_set.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 

src/commands/cmd_open_file.cpp

@@ -33,7 +33,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "widgets/statebar.h"
 
 typedef struct OpenFileData

src/commands/cmd_palette_editor.cpp

@@ -31,7 +31,6 @@
 #include "dialogs/filesel.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"

src/commands/cmd_paste.cpp

@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/clipboard.h"

src/commands/cmd_play_animation.cpp

@@ -26,7 +26,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"

src/commands/cmd_play_flic.cpp

@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 /* static void cmd_play_flic_execute(const char *argument) */

src/commands/cmd_preview.cpp

@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include "modules/sprites.h"
 
 #include <allegro.h>
 

src/commands/cmd_redo.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "widgets/statebar.h"

src/commands/cmd_remove_cel.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_remove_frame.cpp

@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "undoable.h"
 

src/commands/cmd_remove_layer.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "undoable.h"

src/commands/cmd_reselect_mask.cpp

@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_rotate_canvas.cpp

@@ -26,7 +26,6 @@
 #include "core/app.h"
 #include "core/job.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"

src/commands/cmd_save_file.cpp

@@ -29,7 +29,6 @@
 #include "file/file.h"
 #include "modules/gui.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_save_mask.cpp

@@ -24,7 +24,6 @@
 
 #include "commands/commands.h"
 #include "dialogs/filesel.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/msk_file.h"

src/commands/cmd_select_file.cpp

@@ -27,7 +27,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool cmd_select_file_enabled(const char *argument)

src/commands/cmd_sprite_properties.cpp

@@ -26,7 +26,6 @@
 #include "core/core.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "widgets/colbut.h"

src/commands/cmd_sprite_size.cpp

@@ -27,7 +27,6 @@
 #include "commands/commands.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"

src/commands/cmd_undo.cpp

@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "widgets/statebar.h"

src/commands/fx/cmd_color_curve.cpp

@@ -30,7 +30,6 @@
 #include "effect/colcurve.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/misc.h"

src/commands/fx/cmd_convolution_matrix.cpp

@@ -41,7 +41,6 @@
 #include "effect/convmatr.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/fx/cmd_despeckle.cpp

@@ -35,7 +35,6 @@
 #include "effect/effect.h"
 #include "effect/median.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/fx/cmd_invert_color.cpp

@@ -34,7 +34,6 @@
 #include "core/core.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/fx/cmd_replace_color.cpp

@@ -32,7 +32,6 @@
 #include "effect/effect.h"
 #include "effect/replcol.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/commands/fx/effectbg.cpp

@@ -28,7 +28,6 @@
 #include "effect/effect.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"
 #include "widgets/statebar.h"

src/core/app.cpp

@@ -50,7 +50,6 @@
 #include "modules/palettes.h"
 #include "modules/recent.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/palette.h"

src/dialogs/aniedit.cpp

@@ -32,7 +32,6 @@
 #include "modules/gui.h"
 /* #include "modules/palettes.h" */
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "raster/raster.h"
 #include "undoable.h"
 #include "util/celmove.h"

src/dialogs/drawtext.cpp

@@ -31,7 +31,6 @@
 #include "dialogs/filesel.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/blend.h"
 #include "raster/image.h"
 #include "raster/sprite.h"

src/dialogs/maskcol.cpp

@@ -32,7 +32,6 @@
 #include "core/core.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"

src/dialogs/vectmap.cpp

@@ -23,7 +23,6 @@
 
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/effect/effect.cpp

@@ -35,8 +35,8 @@
 #include "effect/invrtcol.h"
 #include "effect/median.h"
 #include "effect/replcol.h"
+#include "effect/images_ref.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/effect/images_ref.cpp

@@ -22,22 +22,20 @@
 
 #include "jinete/jlist.h"
 
-#include "ui_context.h"
 #include "effect/effect.h"
-#include "modules/sprites.h"
+#include "effect/images_ref.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "util/misc.h"
 
-static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int target, bool write);
+static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int target, bool write);
 
-ImageRef *images_ref_get_from_sprite(Sprite* sprite, int target, bool write)
+ImageRef* images_ref_get_from_sprite(Sprite* sprite, int target, bool write)
 {
-  Layer *layer = target & TARGET_ALL_LAYERS ? sprite->set:
+  Layer* layer = target & TARGET_ALL_LAYERS ? sprite->set:
 					      sprite->layer;
 
   return images_ref_get_from_layer(sprite, layer, target, write);
@@ -53,7 +51,7 @@ void images_ref_free(ImageRef* image_ref)
   }
 }
 
-static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int target, bool write)
+static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int target, bool write)
 {
 #define ADD_IMAGES(images)			\
   {						\
@@ -72,7 +70,7 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
 
 #define NEW_IMAGE(layer, cel)					\
   {								\
-    ImageRef *image_ref = jnew(ImageRef, 1);			\
+    ImageRef* image_ref = jnew(ImageRef, 1);			\
 								\
     image_ref->image = layer->sprite->stock->image[cel->image];	\
     image_ref->layer = layer;					\
@@ -82,8 +80,8 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     ADD_IMAGES(image_ref);					\
   }
   
-  ImageRef *first_image = NULL;
-  ImageRef *last_image = NULL;
+  ImageRef* first_image = NULL;
+  ImageRef* last_image = NULL;
   int frame = sprite->frame;
 
   if (!layer_is_readable(layer))
@@ -97,13 +95,13 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     case GFXOBJ_LAYER_IMAGE: {
       if (target & TARGET_ALL_FRAMES) {
 	for (frame=0; frame<sprite->frames; frame++) {
-	  Cel *cel = layer_get_cel(layer, frame);
+	  Cel* cel = layer_get_cel(layer, frame);
 	  if (cel != NULL)
 	    NEW_IMAGE(layer, cel);
 	}
       }
       else {
-	Cel *cel = layer_get_cel(layer, frame);
+	Cel* cel = layer_get_cel(layer, frame);
 	if (cel != NULL)
 	  NEW_IMAGE(layer, cel);
       }
@@ -111,7 +109,7 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     }
 
     case GFXOBJ_LAYER_SET: {
-      ImageRef *sub_images;
+      ImageRef* sub_images;
       JLink link;
 
       JI_LIST_FOR_EACH(layer->layers, link) {

src/effect/images_ref.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MODULES_SPRITES_H_INCLUDED
-#define MODULES_SPRITES_H_INCLUDED
+#ifndef EFFECT_IMAGES_REF_H_INCLUDED
+#define EFFECT_IMAGES_REF_H_INCLUDED
 
 class Sprite;
 class Image;

src/modules/editors.cpp

@@ -26,7 +26,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "util/misc.h"

src/modules/gui.cpp

@@ -47,7 +47,6 @@
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/sprite.h"
 #include "util/recscr.h"

src/modules/tools.cpp

@@ -40,7 +40,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/raster.h"
 #include "util/misc.h"

src/util/celmove.cpp

@@ -27,7 +27,6 @@
 #include "core/color.h"
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/blend.h"
 #include "raster/cel.h"
 #include "raster/image.h"

src/util/clipboard.cpp

@@ -32,7 +32,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/cel.h"
 #include "raster/image.h"

src/util/misc.cpp

@@ -34,7 +34,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/raster.h"
 #include "util/misc.h"
 #include "widgets/editor.h"

src/util/quantize.cpp

@@ -22,7 +22,7 @@
 
 #include "console.h"
 #include "effect/effect.h"
-#include "modules/sprites.h"
+#include "effect/images_ref.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"

src/widgets/colbar.cpp

@@ -32,7 +32,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"

src/widgets/editor/editor.cpp

@@ -35,7 +35,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/brush.h"
 #include "raster/image.h"

src/widgets/fileview.cpp

@@ -34,7 +34,6 @@
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/rotate.h"

src/widgets/statebar.cpp

@@ -31,7 +31,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"