modified: 16.exe

	modified:   16_CA.BCO
	modified:   16_HC.BCO
	modified:   16_HEAD.BCO
	modified:   16_MM.BCO
	modified:   EXMMBC.BCO
	deleted:    HEAP.16
	modified:   KITTEN.BCO
	deleted:    MMDUMP.16
	deleted:    PROFILE.16
	modified:   bakapi.exe
	modified:   bcexmm.exe
	modified:   bcexmm.prj
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttest.exe
	modified:   inputest.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   sountest.exe
	modified:   src/lib/bitmap.c
	modified:   src/lib/modex16.c
	modified:   src/pcxtest.c
	modified:   test.exe
	modified:   test2.exe
	modified:   tsthimem.exe

diff --git a/16.exe b/16.exe
index dcbdab22da42daf86452e4121909306cde781477..966efcb027e99e6f8733cbbe317216072c909a57 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/16_CA.BCO b/16_CA.BCO
index 7e4aeca7ec13df7b46047d08f4f59f10a707c414..3c235721dae530d4a753c1f9ab9f833896859413 100755 (executable)
Binary files a/16_CA.BCO and b/16_CA.BCO differ

diff --git a/16_HC.BCO b/16_HC.BCO
index cbdf386c03abebda1c3cbc41bfb224944fe268e1..03313d4e1d92556ef8554812d1623bd55c2c18dd 100755 (executable)
Binary files a/16_HC.BCO and b/16_HC.BCO differ

diff --git a/16_HEAD.BCO b/16_HEAD.BCO
index 0d23b6d1fd467f7012549596c6fae40e56185735..cc9400b7fcd8971c2ca2e732667b5cf3239e13b2 100755 (executable)
Binary files a/16_HEAD.BCO and b/16_HEAD.BCO differ

diff --git a/16_MM.BCO b/16_MM.BCO
index a68ed6bf7adbd6dc035bc615d5d4acacfb57a465..a6fbeff33596d49ecd5386047a640757ba2056dd 100755 (executable)
Binary files a/16_MM.BCO and b/16_MM.BCO differ

diff --git a/EXMMBC.BCO b/EXMMBC.BCO
index 508af7e2a1f408d464666d9501cc8608b1b226bd..48e6be3e901bbb97fe7eea3ab7918a69bfae8efb 100755 (executable)
Binary files a/EXMMBC.BCO and b/EXMMBC.BCO differ

diff --git a/HEAP.16 b/HEAP.16
deleted file mode 100755 (executable)
index 0ee8d58..0000000
--- a/HEAP.16
+++ /dev/null
@@ -1,45 +0,0 @@
-\r
-       == default ==\r
-\r
-  USED block at 1c840016 of size 66\r
-  FREE block at 1c840058 of size 18\r
-  USED block at 1c84006a of size 136\r
-  USED block at 1c8400f2 of size 20\r
-  FREE block at 1c840106 of size 7926\r
-OK - end of heap\r
-\r
-       == near ==\r
-\r
-  USED block at c8385b6 of size 12\r
-  USED block at c8385c2 of size 294\r
-  USED block at c8386e8 of size 42\r
-  USED block at c838712 of size 20\r
-  USED block at c838726 of size 20\r
-  USED block at c83873a of size 20\r
-  USED block at c83874e of size 20\r
-  USED block at c838762 of size 20\r
-  USED block at c838776 of size 30854\r
-OK - end of heap\r
-\r
-       == far ==\r
-\r
-  USED block at 1c840016 of size 66\r
-  USED block at 1c840058 of size 18\r
-  USED block at 1c84006a of size 136\r
-  USED block at 1c8400f2 of size 20\r
-  USED block at 1c840106 of size 7926\r
-OK - end of heap\r
-\r
-Memory Type         Total      Used       Free\r
-----------------  --------   --------   --------\r
-Default                   8166         222       7944\r
-Near              31302        448       30854\r
-Far               8166         222       7944\r
-----------------  --------   --------   --------\r
-coreleft = 30852\r
-farcoreleft = 38600\r
-GetFreeSize = 7768\r
-GetNearFreeSize = 30854\r
-GetFarFreeSize = 7768\r
-memavl = 30852\r
-stackavail = 15059\r

diff --git a/KITTEN.BCO b/KITTEN.BCO
index 301fdbd08b8a370a3c4dc0cef3cd77e5eca5f856..6c7fa1a67601be90de844a822c4fa9d9b18d146e 100755 (executable)
Binary files a/KITTEN.BCO and b/KITTEN.BCO differ

diff --git a/MMDUMP.16 b/MMDUMP.16
deleted file mode 100755 (executable)
index 6b18656..0000000
Binary files a/MMDUMP.16 and /dev/null differ

diff --git a/PROFILE.16 b/PROFILE.16
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/bakapi.exe b/bakapi.exe
index 1758a97ffc99dd2d605e4fdc39a656f3637f9b2c..0e63e6b8b90978d020b592bc520d8f251fba3ad9 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/bcexmm.exe b/bcexmm.exe
index a1df0042543a9610cab191f0dd12244b323eeeaf..b34462013a04f6ac13b9c278570add49c3ebb138 100755 (executable)
Binary files a/bcexmm.exe and b/bcexmm.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index 7d7c7b61a901fda5c4819964a30ea419a83c7657..d490131a3eebe3e57abe2b33c3822492e56907ae 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/exmmtest.exe b/exmmtest.exe
index d274f3dda342612e97f9492077768d12e9b5df6a..6662ebe29189aa2471ace03bafe46f535e6e08f8 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index fd8b5774883ba903197b1544010eff1efe8c070e..5e69999c274ef3343fb967a01f9492d14e94c28f 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index e81edb501e8b96b0f48751387d23a85734dad79b..b63fb5bd433833277dba9e44ffb69d3b6dd91a46 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 130f28d51b73c9b4735aac3605b89af24756d71f..a2fcbcd34049c1c2b7abf1ec37fab11a7211ae8c 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 66fd13c9bff79d04f509ba29c345b96dec9c5a21..1552031f6abfffc767eff0adadb33bb6000c980f 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 648ec1efefbea510e162861a8610c44029be447b..3c1e32e2bd513353f0ee6dff918b7ec12ed5cdbc 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 492749c13a2991d91c4d68828c98caaeb1e13bb9..adcd3b89bf5302ab6d45d514ea3f99f3887c88b4 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index fdd02e25198d38faacfeec1203f4a614b0193221..579a8b32392072f14e2061d57e7347c4d07ef88a 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 291f39e5779e39df49ef6d9d331a802c20ce20d1..5187e055f599c5140c48deb33d4ffc3e63f16183 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/sountest.exe b/sountest.exe
index 6ad59991cbc9b0e767537afae5fb70f4cd751120..9194021d0ef37a9a27f9c88e3d6251e83d5911e8 100755 (executable)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 5e65195e9ec0391bbb8cf1cbcc856d26918868ea..85f85b1ba9f6bc9502f28dfede0b7f4c8ce5918d 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,28 +1,28 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
 #include <stdio.h>\r
-#include <stdlib.h>
-#include <malloc.h>
+#include <stdlib.h>\r
+#include <malloc.h>\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/modex16.h"\r
 \r
@@ -98,7 +98,7 @@ bitmapLoadPcx(char *filename) {
     bitmap_t result;\r
     dword bufSize;\r
     int index;\r
-    byte count, val;
+    byte count, val;\r
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
@@ -108,23 +108,23 @@ bitmapLoadPcx(char *filename) {
     }\r
 \r
     /* load the first part of the pcx file */\r
-    loadPcxStage1(file, &result);
+    loadPcxStage1(file, &result);\r
 \r
-       /* allocate the buffer */
+       /* allocate the buffer */\r
        //printf("%zu\n", _memmax());\r
-       bufSize = (/*(dword)*/result.width * result.height);
-       result.data = malloc(bufSize);
-//     result.data = (byte far *)_fmalloc(bufSize);
-//     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));
-       /*printf("&bufSize=%p\n", &bufSize);
-       printf("&result.data=%p\n", result.data);
-       printf("Size of block is %zu bytes\n", _msize(result.data));
-       printf("Size of bufSize is %zu bytes\n", bufSize);
-       printf("Size of result.width is %zu \n", result.width);
-       printf("Size of result.height is %zu \n", result.height);
-       printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/
-       //exit(0);
-       if(!result.data) {
+       bufSize = (/*(dword)*/result.width * result.height);\r
+       result.data = malloc(bufSize);\r
+//     result.data = (byte far *)_fmalloc(bufSize);\r
+//     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));\r
+       /*printf("&bufSize=%p\n", &bufSize);\r
+       printf("&result.data=%p\n", result.data);\r
+       printf("Size of block is %zu bytes\n", _msize(result.data));\r
+       printf("Size of bufSize is %zu bytes\n", bufSize);\r
+       printf("Size of result.width is %zu \n", result.width);\r
+       printf("Size of result.height is %zu \n", result.height);\r
+       printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/\r
+       //exit(0);\r
+       if(!result.data) {\r
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r
                fclose(file);\r
                exit(-1);\r
@@ -142,7 +142,7 @@ bitmapLoadPcx(char *filename) {
                val = count;\r
                count = 1;\r
        }\r
-
+\r
        /* write the pixel the specified number of times */\r
        for(; count && index < bufSize; count--,index++)  {\r
                result.data[index] = val;\r

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 27ad067757bf51701e7c4775c43e015a2daf2cae..e3e70397b36b4241f4240b2c318d10449151a97e 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -314,7 +314,7 @@ void
 modexDrawBmpRegion(page_t *page, int x, int y,\r
                    int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
     word poffset = (word) page->data  + y*(page->width/4) + x/4;\r
-    byte *data = bmp->data;//+bmp->offset;\r
+    byte far *data = bmp->data;//+bmp->offset;\r
     word bmpOffset = (word) data + ry * bmp->width + rx;\r
     word width = rw;\r
     word height = rh;\r
@@ -325,9 +325,9 @@ modexDrawBmpRegion(page_t *page, int x, int y,
     word rowCounter;\r
     byte planeCounter = 4;\r
 \r
-       printf("bmp->data=%Fp\n",bmp->data);\r
+/*     printf("bmp->data=%Fp\n",bmp->data);\r
        printf("*bmp->data=%Fp\n",*(bmp->data));\r
-       printf("&bmp->data=%Fp\n",&(bmp->data));\r
+       printf("&bmp->data=%Fp\n",&(bmp->data));*/\r
 \r
         //code is a bit slow here\r
     __asm {\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index be51733b77ce894dbeafdbdbcf4e517ea9ed6801..07a4795d487aac8355418a993378365fb7702030 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -87,7 +87,7 @@ void main() {
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawBmp(&page, 20, 20, &bmp);\r
-               modexDrawBmp(&page, 100, 100, &bmp);\r
+               modexDrawBmp(&page, 160, 120, &bmp);\r
        //}\r
        t1 = (*clockw-start) /18.2;\r
 \r
@@ -108,7 +108,7 @@ void main() {
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawSprite(&page, 20, 20, &bmp);\r
-               modexDrawSprite(&page, 100, 100, &bmp);\r
+               modexDrawSprite(&page, 160, 120, &bmp);\r
        //}\r
        //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));\r
        //modexDrawBmp(&page, 0, 0, &bmp);\r
@@ -117,15 +117,18 @@ void main() {
                //DrawPBuf(&page, 0, 0, p, 0);\r
        }\r
        modexLeave();\r
-       printf("main=%Fp\n", &i);\r
+       /*printf("\nmain=%Fp\n\n", &i);\r
+       printf("bmp.data=%Fp\n", bmp.data);\r
+       printf("*bmp.data=%Fp\n", *(bmp.data));\r
+       printf("&bmp.data=%Fp\n", &(bmp.data));\r
 \r
        printf("\n%d\n", sizeof(p->plane));\r
-       printf("%d\n", sizeof(bmp));\r
+       printf("%d\n", sizeof(bmp));*/\r
 \r
        /*for(i=0; i<(320*240); i++)\r
        {\r
                fprintf(stdout, "%d", bmp.data[i]);\r
-               if(i%320==0) fprintf(stdout, "\n");\r
+               if(i%bmp.width==0) fprintf(stdout, "\n");\r
        }*/\r
        printf("CPU to VGA: %f\n", t1);\r
        printf("VGA to VGA: %f\n", t2);\r

diff --git a/test.exe b/test.exe
index ca406739e4612d6f2c7ec396fd573343a7d7d257..f4555a7229213fe18d7e7edffc80109804d3bb41 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 79e5e10d9d252e5f3b77d4c9cf46cf8a26a2ff9e..d8899cf7119b0f5ec9dbc3c0bd025f028b642e7e 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tsthimem.exe b/tsthimem.exe
index a427bff2fba65d0b7b909df3dc1cfe76f26bc0f4..4287f6736b823c8f5331ec017136e0c8b12e21d1 100755 (executable)
Binary files a/tsthimem.exe and b/tsthimem.exe differ