From 4fd5fa0123da44f060e376d5b0d9d5624518e53b Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:04:23 +0000
Subject: [PATCH] Clean up setup, draw player and stars (and tick stars), tick
 handling, buffer handling and line drawing.

---
 !RunImage,ff8 | Bin 4664 -> 5660 bytes
 Makefile,fe1  |  33 +++++++++------
 c/CTheEscape  | 110 ++++++++++++++++++++++++++++++++++++++++++++++++--
 c/Graphics    |  40 +++++++++++++++++-
 4 files changed, 166 insertions(+), 17 deletions(-)

diff --git a/!RunImage,ff8 b/!RunImage,ff8
index 95a74c37c371412de0be8c4e50c79cc5f46379b7..a1ffd2b576d8784b963162c48332523cf6aff9e0 100644
GIT binary patch
delta 2246
zcmZ8jZERCj7=G{V$F{P$J2!~9v6i_>V+1-v0vL%M3PC}bK==VNHtleeIchg>i!<$@
z3?zK4yKKV`vJ-#kP@*$aqiA#q5`mCt2pT?S=<Vg;x@s7SCd8=qIqfan^d@i4d7tMw
z?|ILAKH4uU-+i=#h-t#|i4x~6lqe#)<(^LTC#64kaipSdvA?CEvoWx>t*O~hzMX;A
z9qBHa@D`yr`2pcaLS?}XR{EN}Ot%u#+hs~zcOHpJ=y#z%j=qe3C;C^=x1hfZ{a?@*
z`Zo0Yg<p6iR)y@y#WdjBSr5}Ch3RjB`w3im7AJ%219#TTg8DfKW@HJ(-~$kx23MHH
ziNSlo&0NFuZ@}kd@nY=j;J*MzS)3Rv7CEq%>7RhVBdZnC{dp~bPQbmbN>Xt_BfJF&
z{vMFHI$J8v+X6&|7fbOQ;r)#OM}b@we8CzZt1#jakc&c7v;s&SG}5YYY%kDrLKj>L
zG~i{reRVk233Lp8re>?2V7dkAEd;g;+*etg72I54k70Zc#<xN<V$zg&(lxIHcFmaC
z2h9ifG&3|CM4|?z0L!0cdL0Bqsnm*rEJSD-32y{CaBrBlz!>EKw$0Ey1I;0mrrelb
z0v0wj%b^LIG?_SeB<zl%Sp*GsD|ojKLL|2E7DN+<Xg)*%Qy?ESqE<JdsRFk>ixaiF
z4(?%aGv_hgHjC-6!XLzO@Ic!w^yJZ%;mvt{z?R4*lz4&CXHF20$W+>avtiv9EOQO<
zGG&NcDZ)wW`;A-?zRb-uS&8tP2blJxM3Y_pL}y_yHN4We)fZ@ZZEIV5L!gZmqGZ7s
z(>#~w#;qf(V-DJ)Ew`la+u~Zpl=entrI$;HBVv_%x?|+(<uc-@<{%c-ijlZP;aJj3
zv1;0&-%cj4dWJX0%La%-SZIixoRl#x_EkdbLo1^tv=+1|2ET7=L`x;t-u&YBtmLMy
z-AfJ^HT4*TdWU#Z$jJ-e2qH*5UI%G^lxneRWOvf@CRU<OSd^M*x3UZ?7~?f1OcRsI
z)XOQCX<isnt)5489xF~D8O@f@bO-u)UBI2;HCCocXl4HyZmB=R&5Mj-ky9USj=O`I
zvbHt0@AMm~<LN3fO6xb3_LiK^-qqmbZquZHV7tYn*5`Vn=82t#rm%qNH=vP~bW#>1
zl}RQjN}fPAev~{_!c-zec#%_kOQr;VL;_cm$pkf(#*ZbFlXpvwgfn`@q(2S)gxASW
z(osG_VSX7&oJ9K_Ui<H1gURH=#0~_kgAIGbcz{2PONuv|PeVL)P;kH%O!k9JljEpV
zRkLfZtEySuXPq_weFPVQ%5bjn+9zz#It;%R?K#A}1p60>uJ;GjYt||$qDr=hs>E|g
zG>971>Pqb(jy`>eQ>0ZR!eEMH`f2rPTj}(}hIb0BmG;J{muaJFr>!(^x50d@9=9!$
zs@0!ua~yM!r5jn+_N#XLI=Q1?-DF=8{0|o>b!S?dTN_P<N}3Ag!dhe;KZ_T;=wkYK
zy^~w0Cr+*&e#7tNIWDHzk>PTzbrSc*hE`y+sb?bB+ru;56l#TEx5<hz+?5LlW0loT
zJEyTd{F3^)-MM7tY=lLac^G~XvSPILMYvwn&3)kP@Gk(*N84fGUBF5G)xOqlENwx~
zO*uNCKA5{kj`okfoV!kzfA3enb@XKf8>ek@{Phl2ic)m#Q%_CXEftO~&0jCAem+7}
z)<+b5o9Lh8L^4Fe7fRtjbpnSDUnrEu#Eb&Ve8NvX3n8M>XaTdRQw3HvRFqr(_z|MZ
zhl$2v;uBF_uu7P_PyMuLJ^opch<gxr3^p7By3Q*B&U|8O-vOc~SPRS#Yln5fx?mw#
M7`7jF5Y`L(A0X&-mH+?%

delta 1339
zcmZvcZAcVR6o$`?tIn>bYr2H^v0`Zmp{pp0P#IKUexebkB_U!&P$Cipg<`AyFh6#$
zD4Nhsq*nVOX^F4~LPZ7z_9H2hVs~0Ijf@DAknFwdEN!s^XXl*veeSt4XJ&SI-^`w5
zBJL6qPPDcv(^?eKx&uGGw0+d?v?bTtX5tImg2+h)T-6a*M<iPNVD52C$j6Z{A(xTg
zMgA6f5b{yvi^v6k8~I~VNA|cY*()hJ?HQ^CRK?hmlDG?$Yu>_D*~ry7c=H8ZeGdPy
zm!1*pQSA>v--j1l%GFu;IbM1U$~3C<0JOOB{xYskz)$tkLr}(0nFG)aUKV<fz~AMi
zJE1UC#sIVx-Y@j-gRcm><qDJ{tnY$C0ai4_uf+<f$m(tf^AolIG$c&pJhUcEBc#~s
zz6|E8A5(OYt3hDupk0FZ>0hr!)xoTRn2!dbXmA10dp{_~g3ZBHKzpZMNIjU>eoQbJ
z@mLC>C6;it7XC{=UpzL^;}EoL>?7l5PJnqLwfw!CEUif%pau;(2FU5xC{b&a0nMs0
zN5D+_F}^;j(55ve7mRr3zR3wjTu?#_#1#$70L1;EdO%`yG0;-r4gTke$?bra3NJRD
ztHB9ey@zk)DIQ}j^a;U}MKwBV^mEY8qOK#ZidR+WRT9O?cO+J=YhaC`@wu%sIR~*m
z9!xXNA?Pc<x$nQX){Jz^Q%=2}Y4M7{Cr8ca%El&g*oZkpQ>1gu6}mem$LkJwBq~>p
z<pUla(KxQsm5ELlwUswnni6Mf&?-C5I%;=QFL!malS-VvT5~$sRV7!_vxmxF!<Iy=
z*ohWwY+0$0H*73lf7G-HHF*w$d~w75z+(2$+%-=<3pSYbZ<5R&OwN_gP8-TXw3U;F
zWjW8zhQdnaP21FJScNPrc6K1b?gJJhstqLrM6KAV&&u*6+obiWN0F6M@lqGja5qt2
zKhbfFNX8$Js0AtN;ZdS39IdU}n%GfjzC+Y`c6jio&P4Gb))=L;o0P=aPNFKrDTFvg
tQ;rx#IJ#M;sfZPrqO(Qsj~zrSh%bn5h#!az#3q8S6X_5NA{=2v`~k+M3Df`p

diff --git a/Makefile,fe1 b/Makefile,fe1
index 44b226f..ced36f4 100644
--- a/Makefile,fe1
+++ b/Makefile,fe1
@@ -25,25 +25,34 @@ Linkflags = -aif -o $@
         cc $(ccflags) -o @.o.Input @.c.Input
 
 # Dynamic dependencies:
-o.Graphics:	c.Graphics
-o.Graphics:	C:h.swis
-o.Graphics:	C:h.kernel
-o.Graphics:	C:h.kernel
 o.Sound:	c.Sound
 o.Sound:	C:h.swis
 o.Sound:	C:h.kernel
 o.Sound:	C:h.kernel
 o.Sound:	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
+o.Graphics:	c.Graphics
+o.Graphics:	C:h.swis
+o.Graphics:	C:h.kernel
+o.Graphics:	C:h.kernel
+o.Graphics:	c.Graphics
+o.Graphics:	C:h.swis
+o.Graphics:	C:h.kernel
+o.Graphics:	C:h.kernel
+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.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 28396d8..6e45743 100644
--- a/c/CTheEscape
+++ b/c/CTheEscape
@@ -14,6 +14,41 @@ unsigned char *buffer;
 extern struct CompositionElement composition[128];
 extern int current_element;
 
+#define DISPLAY_MODE 28
+#define DISPLAY_X 1280
+#define DISPLAY_Y 960
+
+#define PLAYER_Y_START 100
+
+#define MAX_NPCS 5
+#define MAX_STARS 49
+
+enum sprite_e{player_ship, durno_ship,player_shipl,player_shipr};
+char *sprites[] = {"player_ship","durno_ship","player_shipl","player_shipr"};
+
+struct EntityLocation_s {
+  short int X,Y;
+};
+
+struct NPC_s {
+  struct EntityLocation_s location;
+  enum sprite_e sprite;
+  unsigned char velocity;
+};
+
+struct Player_s {
+  struct EntityLocation_s location;
+  enum sprite_e sprite;
+  unsigned char velocity;
+};
+
+struct NPC_s NPCS[MAX_NPCS];
+struct Player_s Player;
+struct EntityLocation_s Stars[MAX_STARS];
+
+int tick = 0;
+int lasttick = 0;
+extern int screen;
 void intro()
 {
   int currentstart = 0;
@@ -89,16 +124,83 @@ void intro()
   }
 }
 
+void game_draw_player()
+{
+  draw_sprite(sprites[Player.sprite], Player.location.X, Player.location.Y);
+}
+void game_draw_stars()
+{
+  unsigned char i;
+  for(i = 0; i <= MAX_STARS; i++)
+  {
+    draw_line(Stars[i].X,Stars[i].Y,Stars[i].X,Stars[i].Y+30);
+  }
+}
+
+void game_setup_player()
+{
+  Player.location.X = DISPLAY_X/2;
+  Player.location.Y = PLAYER_Y_START;
+  Player.sprite = player_ship;
+}
+
+void game_tick_stars()
+{
+  unsigned char i;
+  for(i = 0; i <= MAX_STARS; i++)
+  {
+    Stars[i].Y -= (tick - lasttick) * 2;
+    if(Stars[i].Y <= 0)
+    {
+      Stars[i].X = rand() % DISPLAY_X;
+      Stars[i].Y = DISPLAY_Y;
+    }
+  }
+}
+
+void game_setup_stars()
+{
+  unsigned char i;
+  for(i = 0; i <= MAX_STARS; i++)
+  {
+    Stars[i].X = rand() % DISPLAY_X;
+    Stars[i].Y = rand() % DISPLAY_Y;
+  }
+}
+
+void game_setup()
+{
+  game_setup_stars();
+  game_setup_player();
+}
+
+void game_tick()
+{
+  lasttick = tick;
+  tick = clock();
+  screen_flipbuffer();
+  screen_clear();
+  game_tick_stars();
+  game_draw_stars();
+  game_draw_player();
+  printf("%i - %i",tick - lasttick,screen);
+}
+
 int main(int argc, char *argv[])
 {
   sound_on();
-  
-  // mode 28 80x60 640x480 16 colours
-  display_mode(28);
+
+  display_mode(DISPLAY_MODE);
   load_sprites("Spr");
 
-  intro();
+  //intro();
 
+  display_mode(DISPLAY_MODE);
+
+  game_setup();
+  
+  while(1)
+    game_tick();
   free(buffer);
 
   return 0;
diff --git a/c/Graphics b/c/Graphics
index 9ae2c18..5f212ef 100644
--- a/c/Graphics
+++ b/c/Graphics
@@ -7,7 +7,7 @@ extern _kernel_swi_regs inreg;
 extern _kernel_swi_regs outreg;
 
 extern unsigned char *buffer;
-
+unsigned char screen = 1;
 
 // Loads sprite file into buffer
 void load_sprites(char* filename)
@@ -66,6 +66,17 @@ void display_mode(int mode)
   _kernel_swi(OS_ScreenMode,&inreg,&outreg);
 }
 
+void draw_line(int x1,int y1,int x2,int y2)
+{
+  inreg.r[0] = 4;
+  inreg.r[1] = x1;
+  inreg.r[2] = y1;
+  _kernel_swi(OS_Plot,&inreg,&outreg);
+  inreg.r[0] = 5;
+  inreg.r[1] = x2;
+  inreg.r[2] = y2;
+  _kernel_swi(OS_Plot,&inreg,&outreg);
+}
 void draw_sprite(char* spritename,int x, int y)
 {
   // SpriteOp 34 to put sprite at a location
@@ -77,3 +88,30 @@ void draw_sprite(char* spritename,int x, int y)
   inreg.r[5] = 8; // GCOL dest=source and sprite mask
   _kernel_swi(OS_SpriteOp,&inreg,&outreg);
 }
+
+void screen_flipbuffer()
+{
+   inreg.r[0] = 19;
+  _kernel_swi(OS_Byte,&inreg,&outreg);
+  
+/*   inreg.r[0] = 114;
+   inreg.r[1] = 1;
+  _kernel_swi(OS_Byte,&inreg,&outreg);
+
+   inreg.r[0] = 113;
+   inreg.r[1] = screen;
+  _kernel_swi(OS_Byte,&inreg,&outreg);
+  
+  screen++;
+  if(screen > 3)
+    screen = 1;
+  inreg.r[0] = 112;
+  inreg.r[1] = screen;
+  _kernel_swi(OS_Byte,&inreg,&outreg);*/
+}
+
+void screen_clear()
+{
+    inreg.r[0] = 12;
+  _kernel_swi(OS_WriteC,&inreg,&outreg);
+}