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

diff --git a/0croll.oob b/0croll.oob
new file mode 100755 (executable)
index 0000000..ebac807
Binary files /dev/null and b/0croll.oob differ

diff --git a/16/src/lib/bitmap.c b/16/src/lib/bitmap.c
index 4e48cab20ab58206683d0e6c765e0910a236d52b..caeb0111a8e3fc86252e275605d33f903463c0ad 100755 (executable)
--- a/16/src/lib/bitmap.c
+++ b/16/src/lib/bitmap.c
@@ -184,7 +184,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
        ts.palette = result.palette;\r
 \r
        /* allocate the pixel storage for the tiles */\r
-       ts.data = _fmalloc(sizeof(byte*) * ts.ntiles);\r
+       ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
        //ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
        for(i=1; i < ts.ntiles; i++) {\r
                ts.data[i] = ts.data[i-1] + twidth * theight;\r

diff --git a/16_in.oob b/16_in.oob
new file mode 100755 (executable)
index 0000000..70b72b5
Binary files /dev/null and b/16_in.oob differ

diff --git a/README.md b/README.md
index 38455eff43771bee3bf2f9ff0617e5e59fb70772..d154b11f87f0c69c96c67cfa2253447e01319370 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@ Open watcom to compile the code of project 16
 \r
 ### Directory Structure!\r
 \r
-16.exe = actual planned game executable!  \r
-/ = root of project where executables are at  \r
-16/ = experimental branch and example codes  \r
-16/modex16/ = pngwen's code archived~  \r
-src/ = source of project~  \r
-doc/ = documentation of the project~  \r
+16.exe = actual planned game executable!\r
+/ = root of project where executables are at\r
+16/ = experimental branch and example codes\r
+16/modex16/ = pngwen's code archived~\r
+src/ = source of project~\r
+doc/ = documentation of the project~\r
 doc/faq.txt = frequently asked questions file!\r
 \r
 ### To compile:\r
@@ -19,3 +19,7 @@ You need Open Watcom stable to compile and just run wmake
 \r
 ###TODO\r
 https://github.com/sparky4/16/blob/master/TODO.md\r
+\r
+       project 16 is in deep dump right now\r
+       it is leaving the pre alpha state and heading into alpha state www\r
+       which means cache manager work but... it needs much rewriting for the new file formats\r

diff --git a/bitmap.oob b/bitmap.oob
new file mode 100755 (executable)
index 0000000..22efeea
Binary files /dev/null and b/bitmap.oob differ

diff --git a/makefile b/makefile
index 62f3ad5d29fcc8ff1c8a6c9027c5f7cc5d8d4fed..75fc0af8c3be9171d992a322c68ec256bb4b2d64 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/mk0croll.wat b/mk0croll.wat
new file mode 100755 (executable)
index 0000000..bfda6ec
--- /dev/null
+++ b/mk0croll.wat
@@ -0,0 +1,22 @@
+OBJ=obj\r
+FLAGS=-0 -i"src/lib/doslib" -fo=.$(OBJ)\r
+\r
+all: 0croll.exe\r
+\r
+0croll.exe: 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_in.$(OBJ)\r
+       wcl $(FLAGS) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_in.$(OBJ)\r
+0croll.$(OBJ): src/0croll.c\r
+       wcl $(FLAGS) -c src/0croll.c\r
+\r
+16_in.$(OBJ): src/lib/16_in.h src/lib/16_in.c\r
+       wcl $(FLAGS) -c src/lib/16_in.c\r
+\r
+omodex16.$(OBJ): 16/src/lib/omodex16.h 16/src/lib/omodex16.c\r
+       wcl $(FLAGS) -c 16/src/lib/omodex16.c\r
+\r
+bitmap.$(OBJ): 16/src/lib/bitmap.h 16/src/lib/bitmap.c\r
+       wcl $(FLAGS) -c 16/src/lib/bitmap.c\r
+\r
+clean:\r
+       rm *.$(OBJ)\r
+       rm *.exe\r

diff --git a/omodex16.oob b/omodex16.oob
new file mode 100755 (executable)
index 0000000..977525a
Binary files /dev/null and b/omodex16.oob differ

diff --git a/src/0croll.c b/src/0croll.c
index fd30dbb1f08147cdac23cf8ec3be3e10d971d72a..151a0bf4e7173533e880042270f1da8d32dfb569 100755 (executable)
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -105,7 +105,7 @@ void main() {
        //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since omapS are actually square\r
        //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
        //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
-       while(!gvar.in.inst->Keyboard[77]){\r
+       while(gvar.in.inst->Keyboard[77]){\r
 //             for(q=0; q<TILEWH; q++) {\r
                omapScrollRight(draw, 1);\r
 //             omodexShowPage(draw->page);\r
@@ -114,7 +114,7 @@ void main() {
 //             }\r
        }\r
 \r
-       while(!gvar.in.inst->Keyboard[75]){\r
+       while(gvar.in.inst->Keyboard[75]){\r
 //             for(q=0; q<TILEWH; q++) {\r
                omapScrollLeft(draw, 1);\r
 //             omodexShowPage(draw->page);\r
@@ -123,7 +123,7 @@ void main() {
 //             }\r
        }\r
 \r
-       while(!gvar.in.inst->Keyboard[80]){\r
+       while(gvar.in.inst->Keyboard[80]){\r
 //             for(q=0; q<TILEWH; q++) {\r
                omapScrollDown(draw, 1);\r
 //             omodexShowPage(draw->page);\r
@@ -132,7 +132,7 @@ void main() {
 //             }\r
        }\r
 \r
-       while(!gvar.in.inst->Keyboard[72]){\r
+       while(gvar.in.inst->Keyboard[72]){\r
 //             for(q=0; q<TILEWH; q++) {\r
                omapScrollUp(draw, 1);\r
 //             omodexShowPage(draw->page);\r
@@ -159,7 +159,7 @@ allocMap(int w, int h) {
 \r
        result.width =w;\r
        result.height=h;\r
-       result.data = _fmalloc(sizeof(byte) * w * h);\r
+       result.data = malloc(sizeof(byte) * w * h);\r
 \r
        return result;\r
 }\r
@@ -171,13 +171,13 @@ oinitMap(omap_t *map) {
        int x, y;\r
        int i;\r
        int tile = 1;\r
-       map->tiles = _fmalloc(sizeof(otiles_t));\r
+       map->tiles = malloc(sizeof(otiles_t));\r
 \r
        /* create the tile set */\r
-       map->tiles->data = _fmalloc(sizeof(bitmap_t));\r
+       map->tiles->data = malloc(sizeof(bitmap_t));\r
        map->tiles->data->width = (TILEWH*2);\r
        map->tiles->data->height= TILEWH;\r
-       map->tiles->data->data = _fmalloc((TILEWH*2)*TILEWH);\r
+       map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
        map->tiles->tileHeight = TILEWH;\r
        map->tiles->tileWidth =TILEWH;\r
        map->tiles->rows = 1;\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 0f0c74f79af05ae5107a28ed49e89d7cce172dff..6f6f788573fbaaaeef213316bb97f6c06dcc0775 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -20,9 +20,9 @@
  *\r
  */\r
 \r
-#if !defined(__LARGE__) && !defined(__COMPACT__) && !defined(__HUGE__)\r
-#error Invalid memory model for compiling project 16\r
-#endif\r
+//#if !defined(__LARGE__) && !defined(__COMPACT__) && !defined(__HUGE__)\r
+//#error Invalid memory model for compiling project 16\r
+//#endif\r
 \r
 #if !defined(__i86__) && defined(__i386__)\r
 #error i8088 only\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 69400af6d68a7c20510cf00374e3f27ba261ebbc..2388e6cde6d3bda5bb253198a853506e4f27d0bd 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 69400af6d68a7c20510cf00374e3f27ba261ebbc
+Subproject commit 2388e6cde6d3bda5bb253198a853506e4f27d0bd

diff --git a/src/util/shbat/boop.sh b/src/util/shbat/boop.sh
index 0ef32da5321f23984ddfca7d6e57eed2161e34a4..c0348e309b5710933b8734b97198ec2046ef681f 100755 (executable)
--- a/src/util/shbat/boop.sh
+++ b/src/util/shbat/boop.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 git commit -a -m "$1"
-#git push x4 master
+git push x4 master
 git push origin master
 git push jp master
 git push sf master