--- uae/src/include/drawing.h	2018/04/24 17:00:33	1.1.1.11
+++ uae/src/include/drawing.h	2018/04/24 17:17:02	1.1.1.14
@@ -1,6 +1,6 @@
 /*
  * Data used for communication between custom.c and drawing.c.
- * 
+ *
  * Copyright 1996-1998 Bernd Schmidt
  */
 
@@ -31,7 +31,7 @@
 
 #define max_diwlastword (PIXEL_XPOS(maxhpos) + 16)
 
-extern int lores_factor, lores_shift, sprite_width;
+extern int lores_factor, lores_shift;
 
 STATIC_INLINE int coord_hw_to_window_x (int x)
 {
@@ -60,7 +60,7 @@ extern int framecnt;
 
 
 /* color values in two formats: 12 (OCS/ECS) or 24 (AGA) bit Amiga RGB (color_regs),
- * and the native color value; both for each Amiga hardware color register. 
+ * and the native color value; both for each Amiga hardware color register.
  *
  * !!! See color_reg_xxx functions below before touching !!!
  */
@@ -103,7 +103,7 @@ STATIC_INLINE int color_reg_cmp (struct
     if (currprefs.chipset_mask & CSMASK_AGA)
 	return memcmp (ce1->color_regs_aga, ce2->color_regs_aga, sizeof (uae_u32) * 256);
     else
-	return memcmp (ce1->color_regs_ecs, ce2->color_regs_ecs, sizeof (uae_u16) * 32);    
+	return memcmp (ce1->color_regs_ecs, ce2->color_regs_ecs, sizeof (uae_u16) * 32);
 }
 /* ugly copy hack, is there better solution? */
 STATIC_INLINE void color_reg_cpy (struct color_entry *dst, struct color_entry *src)
@@ -185,6 +185,8 @@ struct decision {
     uae_u8 nr_planes;
     uae_u8 bplres;
     unsigned int any_hires_sprites:1;
+    unsigned int ham_seen:1;
+    unsigned int ham_at_start:1;
 };
 
 /* Anything related to changes in hw registers during the DDF for one
@@ -195,8 +197,6 @@ struct draw_info {
     int nr_color_changes, nr_sprites;
 };
 
-extern int next_sprite_entry;
-
 extern struct decision line_decisions[2 * (MAXVPOS+1) + 1];
 extern struct draw_info line_drawinfo[2][2 * (MAXVPOS+1) + 1];