modified: makefile

	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/makefile b/makefile
index a6a4be18d75a83fd1dae09b88885d087780769af..0a47caf606ba3574f6ae846644e425ea71b4324f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,10 +1,10 @@
-FLAGS=-0 -d2 
-SRC=src\
+FLAGS=-0 -d2 \r
+SRC=src\\r
 SRCLIB=$(SRC)lib\\r
 all: test.exe pcxtest.exe test2.exe scroll.exe\r
 \r
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj\r
-       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj\r
+       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj 16\lib\x\modex.lib\r
 scroll.obj: $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
 test.exe: test.obj modex16.obj bitmap.obj\r

diff --git a/scroll.exe b/scroll.exe
index 43479f22f1f47eb5a0e3f2c8d6168e59f7e736b9..ba9037f20a99eeb8e3d5d2acffd28b5a9ecde875 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index d382bff248659a30d14bace609d092c13d91fd8b..b91adf7db218ff5e583009d4e96c867808c92458 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -2,13 +2,14 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include "src\lib\dos_kb.h"\r
+#include "16\lib\x\modex.h"\r
 #include "src\lib\wtest\wtest.c"\r
 #include "src\lib\ems.c"\r
 \r
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-
-int emmhandle,ist;
-
+//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
+\r
+int emmhandle,ist;\r
+\r
 typedef struct {\r
        bitmap_t *data;\r
        word tileHeight;\r
@@ -45,7 +46,7 @@ typedef struct {
        int setx; //NOT USED YET! player sprite sheet set on the image x\r
        int sety; //NOT USED YET! player sprite sheet set on the image y\r
        word q; //loop variable\r
-       word d; //direction
+       word d; //direction\r
        bitmap_t data; //supposively the sprite sheet data\r
        int hp; //hitpoints of the player\r
 } actor_t;\r
@@ -68,15 +69,15 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //#define LOOPMAX (TILEWH/SPEED)\r
 \r
 //place holder definitions\r
-#define MAPX 40\r
-#define MAPY 30\r
+#define MAPX 200\r
+#define MAPY 150\r
 #define TRIGGX 10\r
-#define TRIGGY 9
-
+#define TRIGGY 9\r
+\r
 void main() {\r
        bitmap_t ptmp;//, npctmp; // player sprite\r
        const char *cpus;\r
-       static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+       static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
        page_t screen, screen2, screen3;\r
        map_t map;\r
        map_view_t mv, mv2, mv3;\r
@@ -85,52 +86,52 @@ void main() {
        byte *ptr;\r
        actor_t player;\r
        //actor_t npc0;\r
-
-       if(isEMS() || checkEMS()){ printf("%d\n", coretotalEMS()); emmhandle = mallocEMS(coretotalEMS()); }
+\r
+       if(isEMS() || checkEMS()){ printf("%d\n", coretotalEMS()); emmhandle = mallocEMS(coretotalEMS()); }\r
 \r
        /* create the map */\r
        map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
-       //if(isEMS()) printf("%d tesuto\n", coretotalEMS());
+       //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
        initMap(&map);\r
        mv.map = &map;\r
        mv2.map = &map;\r
-       mv3.map = &map;
-
+       mv3.map = &map;\r
+\r
        /* draw the tiles */\r
        ptr = map.data;\r
        /* data */\r
        ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
-       //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
-
-       /*if(isEMS())
-       {
-               XMOVE mm;
-               mm.length=sizeof(map);
-               mm.sourceH=0;
-               mm.sourceOff=(long)&map;
-               mm.destH=emmhandle;
-               mm.destOff=1;
-               //halp!
-               ist = move_emem(&mm);
-               printf("%d\n", coretotalEMS());
-               if(!ist){ dealloc_emem(emmhandle); exit(5); }
-               //printf("%d\n", emmhandle);
-       }
-
-       if(isEMS())
-       {
-               XMOVE mm;
-               mm.length=emmhandle;
-               mm.sourceH=0;
-               mm.sourceOff=(long)&ptmp;
-               mm.destH=emmhandle;
-               mm.destOff=0;
-               //halp!
-               ist = move_emem(&mm);
-               printf("%d\n", coretotalEMS());
-               if(!ist){ dealloc_emem(emmhandle); exit(5); }
-               //printf("%d\n", emmhandle);
-       }
+       //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
+\r
+       /*if(isEMS())\r
+       {\r
+               XMOVE mm;\r
+               mm.length=sizeof(map);\r
+               mm.sourceH=0;\r
+               mm.sourceOff=(long)&map;\r
+               mm.destH=emmhandle;\r
+               mm.destOff=1;\r
+               //halp!\r
+               ist = move_emem(&mm);\r
+               printf("%d\n", coretotalEMS());\r
+               if(!ist){ dealloc_emem(emmhandle); exit(5); }\r
+               //printf("%d\n", emmhandle);\r
+       }\r
+\r
+       if(isEMS())\r
+       {\r
+               XMOVE mm;\r
+               mm.length=emmhandle;\r
+               mm.sourceH=0;\r
+               mm.sourceOff=(long)&ptmp;\r
+               mm.destH=emmhandle;\r
+               mm.destOff=0;\r
+               //halp!\r
+               ist = move_emem(&mm);\r
+               printf("%d\n", coretotalEMS());\r
+               if(!ist){ dealloc_emem(emmhandle); exit(5); }\r
+               //printf("%d\n", emmhandle);\r
+       }\r
 */\r
        /* save the palette */\r
        pal  = modexNewPal();\r
@@ -495,7 +496,7 @@ void main() {
        modexFadeOff(4, ptmp.palette);\r
        modexPalBlack();\r
        modexLeave();\r
-       setkb(0);
+       setkb(0);\r
        //system("mem /E /P");\r
        printf("Project 16 scroll.exe\n");\r
        printf("tx: %d\n", bg->tx);\r
@@ -512,18 +513,18 @@ void main() {
        printf("player.d: %d\n", player.d);\r
        printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
        printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
-       printf("\n");
-       //xmsfree(&map);
-       //xmsfree(bg);
-       //xmsfree(spri);
-       //xmsfree(mask);
-       //xmsreport();
-       if(isEMS())
-       {
-               printf("%d\n", get_emem());
-               printf("%d\n", coretotalEMS());
-               dealloc_emem(emmhandle);
-               printf("%d\n", coretotalEMS());
+       printf("\n");\r
+       //xmsfree(&map);\r
+       //xmsfree(bg);\r
+       //xmsfree(spri);\r
+       //xmsfree(mask);\r
+       //xmsreport();\r
+       if(isEMS())\r
+       {\r
+               printf("%d\n", get_emem());\r
+               printf("%d\n", coretotalEMS());\r
+               dealloc_emem(emmhandle);\r
+               printf("%d\n", coretotalEMS());\r
        }\r
        switch(detectcpu())\r
        {\r
@@ -544,21 +545,21 @@ allocMap(int w, int h) {
 \r
        result.width =w;\r
        result.height=h;\r
-       result.data = malloc(sizeof(byte) * w * h);
+       result.data = malloc(sizeof(byte) * w * h);\r
        //result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);\r
-       /*if(isEMS() || checkEMS())
-       {
-               XMOVE mm;
-               //emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
-               mm.length=sizeof(result);
-               mm.sourceH=0;
-               mm.sourceOff=ptr2long(&result);
-               mm.destH=emmhandle;
-               mm.destOff=0;
-               ist = move_emem(&mm);
-               if(!ist){ dealloc_emem(emmhandle); exit(5); }
-               printf("%d\n", coretotalEMS());
-       }*/
+       /*if(isEMS() || checkEMS())\r
+       {\r
+               XMOVE mm;\r
+               //emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))\r
+               mm.length=sizeof(result);\r
+               mm.sourceH=0;\r
+               mm.sourceOff=ptr2long(&result);\r
+               mm.destH=emmhandle;\r
+               mm.destOff=0;\r
+               ist = move_emem(&mm);\r
+               if(!ist){ dealloc_emem(emmhandle); exit(5); }\r
+               printf("%d\n", coretotalEMS());\r
+       }*/\r
 \r
        return result;\r
 }\r
@@ -571,19 +572,19 @@ initMap(map_t *map) {
        int tile = 1;\r
        //if(!isEMS() || !checkEMS())\r
                map->tiles = malloc(sizeof(tiles_t));\r
-       //else
+       //else\r
        //      map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
 \r
        /* create the tile set */\r
        //if(!isEMS() || !checkEMS())\r
                map->tiles->data = malloc(sizeof(bitmap_t));\r
-       //else
+       //else\r
        //      map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
        map->tiles->data->width = (TILEWH*2);\r
        map->tiles->data->height= TILEWH;\r
        //if(!isEMS() || !checkEMS())\r
                map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
-       //else
+       //else\r
        //      map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
        map->tiles->tileHeight = TILEWH;\r
        map->tiles->tileWidth =TILEWH;\r
@@ -737,6 +738,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
        word ry;\r
        rx = (i % t->cols) * t->tileWidth;\r
        ry = (i / t->cols) * t->tileHeight;\r
+       //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);\r
        modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
 }\r
 \r