From 0c55d051772c2a301d759b98ef7b8bf03751ea18 Mon Sep 17 00:00:00 2001
From: Adam Greenwood-Byrne <adam@isometim.es>
Date: Tue, 9 Mar 2021 22:16:25 +0000
Subject: [PATCH] Fixed bug in heap manager - forgot to initialise freeptr

---
 part12-wgt/{ => examples}/wgt08.c | 64 ++++++++++++++++---------------
 part12-wgt/lib/mem.c              |  2 +
 2 files changed, 35 insertions(+), 31 deletions(-)
 rename part12-wgt/{ => examples}/wgt08.c (52%)

diff --git a/part12-wgt/wgt08.c b/part12-wgt/examples/wgt08.c
similarity index 52%
rename from part12-wgt/wgt08.c
rename to part12-wgt/examples/wgt08.c
index e233f1d..2061710 100644
--- a/part12-wgt/wgt08.c
+++ b/part12-wgt/examples/wgt08.c
@@ -1,4 +1,5 @@
 #include "wgt.h"
+#include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
 
@@ -51,47 +52,48 @@ void getch(void) {
 
 void wgt08()
 {
-  short x;
+    short x;
 
-  vga256 ();
-  wcls (vgapal[0]);
+    mem_init();
+    vga256 ();
+    wcls (vgapal[0]);
 
-  wsetcolor (vgapal[1]);
-  wcircle (960, 540, 270);               /* try filling a circle */
-  getch ();
+    wsetcolor (vgapal[1]);
+    wcircle (960, 540, 270);           /* try filling a circle */
+    getch ();
 
-  wsetcolor (vgapal[40]);
-  wregionfill (960, 540);
-  wsetcolor (vgapal[170]);
-  wregionfill (0, 0);
+    wsetcolor (vgapal[40]);
+    wregionfill (960, 540);
+    wsetcolor (vgapal[170]);
+    wregionfill (0, 0);
 
-  getch ();
+    getch ();
 
-  wcls (0);
-  for (x = 1; x < 10000; x++)     /* try filling 10,000 random pixels */
-  {
-    wsetcolor (vgapal[rand() % 255]);
-    wputpixel (rand() % 1920, rand() % 1080);
-  }
+    wcls (0);
+    for (x = 1; x < 10000; x++)        /* try filling 10,000 random pixels */
+    {
+        wsetcolor (vgapal[rand() % 255]);
+        wputpixel (rand() % 1920, rand() % 1080);
+    }
 
-  getch ();
-  wsetcolor (vgapal[40]);
-  wclip (300, 270, 1500, 810);       /* fill works with clipping too! */
-  wregionfill (960, 540);
+    getch ();
+    wsetcolor (vgapal[40]);
+    wclip (300, 270, 1500, 810);       /* fill works with clipping too! */
+    wregionfill (960, 540);
 
-  wsetcolor (vgapal[7]);
-  wclip (60, 54, 240, 216);
-  wregionfill (120, 108);
+    wsetcolor (vgapal[7]);
+    wclip (60, 54, 240, 216);
+    wregionfill (120, 108);
 
-  wsetcolor (vgapal[9]);
-  wclip (1560, 864, 1800, 1026);
-  wregionfill (1620, 918);
+    wsetcolor (vgapal[9]);
+    wclip (1560, 864, 1800, 1026);
+    wregionfill (1620, 918);
 
-  wsetcolor (vgapal[10]);
-  wclip (0, 0, 1919, 1079);
-  wregionfill (0, 0);
+    wsetcolor (vgapal[10]);
+    wclip (0, 0, 1919, 1079);
+    wregionfill (0, 0);
 
-  getch ();
+    getch ();
 }
 
 void main()
diff --git a/part12-wgt/lib/mem.c b/part12-wgt/lib/mem.c
index ac509fc..1190709 100644
--- a/part12-wgt/lib/mem.c
+++ b/part12-wgt/lib/mem.c
@@ -19,6 +19,8 @@ void mem_init()
       HEAP_START += 8 - ((long)&HEAP_START % 8);
    }
    HEAP_END = (unsigned char *)(HEAP_START + HEAP_SIZE);
+
+   freeptr = HEAP_START;
 }
 
 void *malloc(unsigned int size)