Tidy-up and memory savings

Makefile,fe1

@@ -24,16 +24,6 @@ Linkflags = -aif -o $@
 
 
 # Dynamic dependencies:
-o.CTheEscape:	c.CTheEscape
-o.CTheEscape:	C:h.swis
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	h.Sound
-o.CTheEscape:	c.CTheEscape
-o.CTheEscape:	C:h.swis
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	h.Sound
 o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
@@ -43,8 +33,13 @@ o.Sound:	C:h.swis
 o.Sound:	C:h.kernel
 o.Sound:	C:h.kernel
 o.Sound:	h.Sound
-o.Sound:	c.Sound
-o.Sound:	C:h.swis
-o.Sound:	C:h.kernel
-o.Sound:	C:h.kernel
-o.Sound:	h.Sound
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound

c/CTheEscape

@@ -12,6 +12,7 @@ _kernel_swi_regs outreg;
 unsigned char *buffer;
 
 extern struct CompositionElement composition[128];
+extern int current_element;
 
 void intro()
 {
@@ -77,7 +78,7 @@ void intro()
   currentstart += 100;
   
   draw_sprite("tng",320,400);
-  
+  printf("%i elements at %i bytes\n",current_element,sizeof(composition[0]));
   sound_composition_start(clock());
   
   while(sound_composition_incomplete())
@@ -88,6 +89,7 @@ int main(int argc, char *argv[])
 {
   sound_on();
   
+  // mode 28 80x60 640x480 16 colours
   display_mode(28);
   load_sprites("Spr");
 

c/Graphics

@@ -61,7 +61,6 @@ void load_sprites(char* filename)
 
 void display_mode(int mode)
 {
-  // mode 28 80x60 640x480 16 colours
   inreg.r[0] = 0;
   inreg.r[1] = mode;
   _kernel_swi(OS_ScreenMode,&inreg,&outreg);

h/Sound

@@ -1,8 +1,9 @@
 #define COMPOSITION_MAX 128
+
 struct CompositionElement {
-int Start;
-int Note;
-int Volume;
-int Channel;
-int Length;
+  signed short int Start;
+  unsigned char Note;
+  signed char Volume;
+  unsigned char Channel;
+  unsigned short int Length;
 };