From dac8e5fd32c7fa11a9cd926935e15c5cde34453b Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Fri, 19 Mar 2021 20:49:38 +0000
Subject: [PATCH] Tidy up of tabbing, addition of key scanning (and ability to
 skip intro)

---
 !RunImage,ff8 | Bin 4520 -> 4664 bytes
 Makefile,fe1  |  20 +++++++++++--------
 c/CTheEscape  |   6 +++++-
 c/Input       |  20 +++++++++++++++++++
 c/Sound       |  53 ++++++++++++++++++++++++++++----------------------
 5 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 c/Input

diff --git a/!RunImage,ff8 b/!RunImage,ff8
index 8e3a50b457d2d4ad7ba27e6a5e9f7433fbfb6971..95a74c37c371412de0be8c4e50c79cc5f46379b7 100644
GIT binary patch
delta 1479
zcmZ8heQZ-z6hHU%wR^9l+R`mB$JWlt6ccD6TbLT92Fx<I;lj`mr^8`~5CS91G!iv*
zuD~D5VC;|)6tWAMP}ImKWFZ+QGdhJt6aEo3E^7OHx(}7b7$pRqzgypA@g*ns{65Y-
z_p42nUc4utNTyXRAex@iXgWZ2J#{$$K=tb`8ljl9bduI7LDS!b4rK)Lw~>z{*N~q<
z{xxzJ@&V-6kSqU5<R2+~=b=mkmx!SGDbQ7*S{5Sc8wI)?lhze5>$3VqRRQ#HRv!W?
zSTC(hU@EfuSun#uE3&#;Pu~;LItQjKtG@x}EKo@4CIhWP{V5(2L5>RD>;l8k{n`2?
z&`s1I0b{6o->YD1P|*#BlxJ@{m?n5cO)|3&?4Q6CmTBxSeK`u=FRdNm+OQ8#Z8Eb5
zo?qvAYSu{01<w|6FG2h1f0_=h5!{2Q&q4hzc)q>uX-elgO*Vl1##u-lrY~-r(r$P(
zOjHf7xK3J4&_AE2&n@&(aOG&EVKYy`^D&pWf)$luw>s?OU`OUv7CYS|;F6B#F?in3
zR+fPscG%Tm)%DCB&MK#}2;79@iNGUy$Q5kK1G^OH*u083D%5fKz?DHOSRpNUk+j~y
zn;gTNYyy8y`6+7oQ;p^*xEFx8khIjpQT!%Bg{PhT4_>Zs=6Cfa6$y<-j$xK1aJFOg
zV0QJ=fBSoO+E4v<J@webm<_)Gi&Bk~4ZGVY#eeDditW7AT`DTL+FfY2I*vDar@JtJ
ztAlzm>a;IIJu=<JC*XV9QTFqP?$w&9@lAJ`IV)%?b(rWXFY`2r8~mE5N?hYH&l>Rw
zyK}0{3;*d)=0pmxg{fFHWV@(yVqF-cU*hN4Z%aOr(<+keGa_1LFF#_e7q__Eh?t#%
zMnc%tQ64j@+<C~79591nNg<p3J@!H{Mp#;};A{l)=(fVim(he*nnhe^7IKfiC>(BS
zetw&mh!zJzwm~QDJ7xyc3EaqiB4p!cxYb-)^Z+`=o1y#rY*8QkUXS(J3EF7Qq#Cb$
z#vhmw5$9jbhqOh4@Auv<)^eRUBqF@i8!?SuqCqWW$N4R9>E7+TcE8xZxvix+zN2Li
zn)-=meWNlR_-gs2K3JRa(zEFwiAFlG>~ep<JxgKyt8`$LmVuGN9d<a@Z|h;1_JAA2
zh3a$xdep*22JtWD!ZVr7o;pr`Eqc`A3>PoF%NCU2FTK@f-BF?hv?IJMw^O@5e*V4O
z4Wf3uo9OsKqRKv^jd(X2Diu~vg^v$lsrV9!e>v4badV%-mDsD&&)55;i=Xr9JmWWt
zFLe=ZLOg>|pPE%71`w%(ToP#DXdt&-P5#4vq6x&$h#AE1h#QDo2s%KdBMig>gdgz_
DDcvF@

delta 1393
zcmZ8gYfM{Z7=FLg)5|F|94u%DD=mY8KZY#}#Hmy2VkE3Mn^k3#1cO-(Q^uB2FEufc
z$iz#4l6Qm6Z1LdyQ86Y?j81WhCYxbqCYwKIoDyk|H8OsTpJpc3=c{L?dXgvSeJ<~J
zJ?Cs=rlFe1$V!wGt$m}=S|!m9-*okOSD%d*DPou^8RiFq)>Z;jIe~fs^)hM&^+%|$
zp|+v^5cLnJWquy@CCMwMa#5}qUhOj26|jd`2(RZN*iytWzlE~B=zk66JXm|t{{n2o
zF2g(rrKRY94COPhrlK#`GxI3shf*hf`)Mfid_{O!7pmtZ*jDtPhF?+aKMLh2n5)=7
z0d^Dp$Dok(M~*;=qGJ-uAE+s4WU-U%QrIvR-7sH))`t!e9m~Cj%#HtL1Tslzhp{V1
z_gL;_WPU5jL^}-AhRk!&UWE6{f4vb?g}D#ny%@lW0S+Q`wIoy(#^lKKLi@>DNCKJf
zN-}n2<YIS2t9!&SpMrm(#Fv|qW9)?1hItfhrU#iX1#hz5*8U*mXDm4iS>E)mbEvag
zw?P}TG7lp&&-FHMdkE^Mmbwk<TuJ9vtFsB(?^Y&^%yB+r^N#qTHi1o-bnHWiJdWF;
zHN)F*mtordhWQCT(KNl2Cq12SfbI$!=G*vWPXdo4`>q^=!ls_-)n=hR34Y4bZWanP
z&{uo<Ur5ALL&<@b9f`yt;tsVdFgQ)Ld4Di5m^hFaN)8A6lR?m@Q^~}zn}~Q^^|!|r
zT0DXIHxlj{ZwKa=zs%}ig*6>(icvcM2Ij=CWD@3yA397v{!wif+gaEfHoJ=6Y+g{z
z)MK-Gm1rJ&%(h~j9ai5EciC&J@3B|{Z<UVZC~ai>IAyQZS}bQTpR(Vr{4DsYy-E9C
z&~+a+5MjF`E(Un7qf@-kbB+#ig0qfJZTw%q)fo~g?swiHhB@UtD0+C+8B#LST;tj$
z26?|Lq&*>Mu?8!8mgiiZjTNYRaDJ}K6FCtX%Z<`w=Ji71nt&c2s9lX=Xs*}%e7{!f
z{8bO+T{Op2TB{$Ix)|&S*Jtt~7FkgvGkMv(p6R{#IxlM>@jQFn_bGo8?{sex&3wQe
zz@Ize4rwo8D}zcPALI+}2HsP)M>{t|w4Nq9%b%CMs(6<d9w^@}y1OTc$|s33$B51!
zCsJ@xlFOvz<?j&{@QjZBqsb$Z+O0?O3?Ti56^~)#b&txUm9DxiZxJoMNpuO2j~rD8
ossP_4pQ()VSCwULa&Xr;Y(NL903Was2m+13oxm0#4734%15@+*761SM

diff --git a/Makefile,fe1 b/Makefile,fe1
index 78a5da3..44b226f 100644
--- a/Makefile,fe1
+++ b/Makefile,fe1
@@ -7,8 +7,8 @@ Linkflags = -aif -o $@
 
 
 # Final targets:
-@.!RunImage:   @.o.CTheEscape @.o.Graphics @.o.Sound C:o.stubs 
-        Link $(Linkflags) @.o.CTheEscape @.o.Graphics @.o.Sound C:o.stubs 
+@.!RunImage:   @.o.CTheEscape @.o.Graphics @.o.Sound @.o.Input C:o.stubs 
+        Link $(Linkflags) @.o.CTheEscape @.o.Graphics @.o.Sound @.o.Input C:o.stubs 
 
 
 # User-editable dependencies:
@@ -21,7 +21,8 @@ Linkflags = -aif -o $@
         cc $(ccflags) -o @.o.Graphics @.c.Graphics
 @.o.Sound:   @.c.Sound
         cc $(ccflags) -o @.o.Sound @.c.Sound
-
+@.o.Input:   @.c.Input
+        cc $(ccflags) -o @.o.Input @.c.Input
 
 # Dynamic dependencies:
 o.Graphics:	c.Graphics
@@ -38,8 +39,11 @@ 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.Input:	c.Input
+o.Input:	C:h.swis
+o.Input:	C:h.kernel
+o.Input:	C:h.kernel
+o.Input:	c.Input
+o.Input:	C:h.swis
+o.Input:	C:h.kernel
+o.Input:	C:h.kernel
diff --git a/c/CTheEscape b/c/CTheEscape
index 4a749c6..28396d8 100644
--- a/c/CTheEscape
+++ b/c/CTheEscape
@@ -78,11 +78,15 @@ 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())
+  {
     sound_composition_tick(clock());
+
+    if(input_readkey(98))
+      sound_composition_stop();
+  }
 }
 
 int main(int argc, char *argv[])
diff --git a/c/Input b/c/Input
new file mode 100644
index 0000000..472f4cf
--- /dev/null
+++ b/c/Input
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include "swis.h"
+#include <kernel.h>
+
+// SWI Registers
+extern _kernel_swi_regs inreg;
+extern _kernel_swi_regs outreg;
+
+int input_readkey(int key)
+{
+    inreg.r[0] = 129;
+    inreg.r[1] = key ^ 255;
+    inreg.r[2] = 255;
+    _kernel_swi(OS_Byte,&inreg,&outreg);
+    
+    if(outreg.r[1] == 255)
+      return 1;
+      
+    return 0;
+}
diff --git a/c/Sound b/c/Sound
index 50f09af..34f77fb 100644
--- a/c/Sound
+++ b/c/Sound
@@ -85,6 +85,8 @@ void sound_composition_debug()
       );
     }
   }
+  
+  printf("%i elements at %i bytes each\n",current_element,sizeof(composition[0]));
 
   printf("------------------------------\n");
 }
@@ -94,6 +96,11 @@ void sound_composition_start(int cent)
   composition_startcent = cent;
 }
 
+void sound_composition_stop()
+{
+  current_playback_element = COMPOSITION_MAX;
+}
+
 void sound_composition_tick(int cents)
 {
   int offset_cents = cents - composition_startcent;
@@ -103,35 +110,35 @@ void sound_composition_tick(int cents)
   {
     if(composition[i].Start <= offset_cents)
     {
-	  if(composition[i].Start >= 0)
-	  {
+      if(composition[i].Start >= 0)
+      {
         sound_composition_element_play(composition[i]);
-	    current_playback_element = i + 1;
-	  }
+        current_playback_element = i + 1;
+      }
     }
   }
 }
 
 int sound_note(char* note)
 {
-	int octave = note[1] - 48;
-    char *basenote = "ZZ";
-	int index = 1;
-	int indexi = 0;
-	int len = sizeof(notes)/sizeof(notes[0]);
-	basenote[0] = note[0];
-	if(strlen(note) == 3)
-	{
-		basenote[1] = '#';
-	}else{
-		basenote[1] = 'X';
-	}
-	for(indexi = 0; indexi < len; indexi++)
-	{
-		if(strcmp(notes[indexi],basenote) == 0)
-			index = indexi;
-	}
-	return 41 + (4 * index) + ((octave - 2) * 48);
+  int octave = note[1] - 48;
+  char *basenote = "ZZ";
+  int index = 1;
+  int indexi = 0;
+  int len = sizeof(notes)/sizeof(notes[0]);
+  basenote[0] = note[0];
+  if(strlen(note) == 3)
+  {
+    basenote[1] = '#';
+  }else{
+    basenote[1] = 'X';
+  }
+  for(indexi = 0; indexi < len; indexi++)
+  {
+    if(strcmp(notes[indexi],basenote) == 0)
+      index = indexi;
+  }
+  return 41 + (4 * index) + ((octave - 2) * 48);
 }
 
 int sound_composition_incomplete()
@@ -140,4 +147,4 @@ int sound_composition_incomplete()
     return 0;
   else
     return 1;
-}        
+}