p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

diff --git a/makefile b/makefile
index 75fc0af8c3be9171d992a322c68ec256bb4b2d64..62f3ad5d29fcc8ff1c8a6c9027c5f7cc5d8d4fed 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -512,7 +512,7 @@ www: .symbolic
        @wmake -s -h wwwext
 
 wwwext: .symbolic
-       @wmake -s -h wwwext1
+#      @wmake -s -h wwwext1
        @wmake -s -h wwwext2
 
 wwwext1: .symbolic

diff --git a/src/0croll.c b/src/0croll.c
index aabb518bd7eb4ccd6fa05647b2e5f378041b0edf..fd30dbb1f08147cdac23cf8ec3be3e10d971d72a 100755 (executable)
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -3,6 +3,7 @@
 #include "16/src/lib/bitmap.h"\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <malloc.h>\r
 //#include "dos_kb.h"\r
 #define SCREEN_WIDTH 320\r
 #define SCREEN_HEIGHT 240\r
@@ -75,7 +76,7 @@ void main() {
 //     setkb(1);\r
        IN_Startup(&gvar);\r
        /* create the map */\r
-       map = allocMap(160,120); //20x15 is the resolution of the screen you can make omapS smaller than 20x15 but the null space needs to be drawn properly\r
+       map = allocMap(40,30); //20x15 is the resolution of the screen you can make omapS smaller than 20x15 but the null space needs to be drawn properly\r
        oinitMap(&map);\r
        mv.map = &map;\r
 //     mv2.map = &map;\r
@@ -96,6 +97,7 @@ void main() {
 //     show = &mv;\r
 //     draw = &mv2;\r
        draw = &mv;\r
+//IN_StartAck (&gvar); while (!IN_CheckAck (&gvar)){ } omodexLeave(); IN_Shutdown(&gvar); exit(0);\r
 \r
        //TODO: set player position data here according to the viewable map screen thingy\r
 \r
@@ -157,7 +159,7 @@ allocMap(int w, int h) {
 \r
        result.width =w;\r
        result.height=h;\r
-       result.data = malloc(sizeof(byte) * w * h);\r
+       result.data = _fmalloc(sizeof(byte) * w * h);\r
 \r
        return result;\r
 }\r
@@ -169,13 +171,13 @@ oinitMap(omap_t *map) {
        int x, y;\r
        int i;\r
        int tile = 1;\r
-       map->tiles = malloc(sizeof(otiles_t));\r
+       map->tiles = _fmalloc(sizeof(otiles_t));\r
 \r
        /* create the tile set */\r
-       map->tiles->data = malloc(sizeof(bitmap_t));\r
+       map->tiles->data = _fmalloc(sizeof(bitmap_t));\r
        map->tiles->data->width = (TILEWH*2);\r
        map->tiles->data->height= TILEWH;\r
-       map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
+       map->tiles->data->data = _fmalloc((TILEWH*2)*TILEWH);\r
        map->tiles->tileHeight = TILEWH;\r
        map->tiles->tileWidth =TILEWH;\r
        map->tiles->rows = 1;\r