From: sparky4 <sparky4@cock.li>
Date: Sat, 15 Apr 2017 16:52:56 +0000 (-0500)
Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b02928aa0adbb1c5b0b594d038b9981f579f5a26;p=16.git

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory is quite buggy on real machines. i need to debug it and fix added a struct printer[gvar.mm is FUCKING HUGE 14402 bytes FAT\!]16_rf now compiles BT UNKNOWN ON WHAT IT DOSE\! text box creates a ghost because page 1 do not have bg info thus it is stored and saved.... wwww fizzfade being worked on and no idea how to make it work...[xcroll is fixed resuming fizzfade testings] also imf to xcroll is not work [did some testing wwww and added 0croll.c the original one and it do not work.. damn it\!]
---

diff --git a/makefile b/makefile
index 75fc0af8..62f3ad5d 100755
--- 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 aabb518b..fd30dbb1 100755
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -3,6 +3,7 @@
 #include "16/src/lib/bitmap.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <malloc.h>
 //#include "dos_kb.h"
 #define SCREEN_WIDTH 320
 #define SCREEN_HEIGHT 240
@@ -75,7 +76,7 @@ void main() {
 //	setkb(1);
 	IN_Startup(&gvar);
 	/* create the map */
-	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
+	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
 	oinitMap(&map);
 	mv.map = &map;
 //	mv2.map = &map;
@@ -96,6 +97,7 @@ void main() {
 //	show = &mv;
 //	draw = &mv2;
 	draw = &mv;
+//IN_StartAck (&gvar); while (!IN_CheckAck (&gvar)){ } omodexLeave(); IN_Shutdown(&gvar); exit(0);
 
 	//TODO: set player position data here according to the viewable map screen thingy
 
@@ -157,7 +159,7 @@ allocMap(int w, int h) {
 
 	result.width =w;
 	result.height=h;
-	result.data = malloc(sizeof(byte) * w * h);
+	result.data = _fmalloc(sizeof(byte) * w * h);
 
 	return result;
 }
@@ -169,13 +171,13 @@ oinitMap(omap_t *map) {
 	int x, y;
 	int i;
 	int tile = 1;
-	map->tiles = malloc(sizeof(otiles_t));
+	map->tiles = _fmalloc(sizeof(otiles_t));
 
 	/* create the tile set */
-	map->tiles->data = malloc(sizeof(bitmap_t));
+	map->tiles->data = _fmalloc(sizeof(bitmap_t));
 	map->tiles->data->width = (TILEWH*2);
 	map->tiles->data->height= TILEWH;
-	map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+	map->tiles->data->data = _fmalloc((TILEWH*2)*TILEWH);
 	map->tiles->tileHeight = TILEWH;
 	map->tiles->tileWidth =TILEWH;
 	map->tiles->rows = 1;