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

[16.git] / src / 0croll.c

diff --git a/src/0croll.c b/src/0croll.c
index 844dc9957f8a326fbf8daceb96895ff154f309e4..151a0bf4e7173533e880042270f1da8d32dfb569 100755 (executable)
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -1,8 +1,9 @@
-//#include "modex16.h"\r
-#include "src/lib/16_vl.h"\r
+//from https://github.com/sparky4/16/commit/a19d7592507e5f7aa91f4a6b6611e021bd1a3e8d\r
+#include "16/src/lib/omodex16.h"\r
 #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
@@ -29,7 +30,7 @@ typedef struct {
 \r
 typedef struct {\r
        omap_t *map;\r
-       page_t *page;\r
+       opage_t *page;\r
        int tx; //???? appears to be the tile position on the viewable screen map\r
        int ty; //???? appears to be the tile position on the viewable screen map\r
        word dxThresh; //????\r
@@ -49,7 +50,7 @@ void omapScrollLeft(omap_view_t *mv, byte offest);
 void omapScrollUp(omap_view_t *mv, byte offset);\r
 void omapScrollDown(omap_view_t *mv, byte offset);\r
 void omapGoTo(omap_view_t *mv, int tx, int ty);\r
-void omapDrawTile(otiles_t *t, word i, page_t *page, word x, word y);\r
+void omapDrawTile(otiles_t *t, word i, opage_t *page, word x, word y);\r
 void omapDrawRow(omap_view_t *mv, int tx, int ty, word y);\r
 void omapDrawCol(omap_view_t *mv, int tx, int ty, word x);\r
 \r
@@ -62,7 +63,7 @@ void main() {
        //int ch=0x0;\r
 //     byte ch;\r
 //     int q=0;\r
-       page_t screen;//,screen2;\r
+       opage_t screen;//,screen2;\r
        omap_t map;\r
        omap_view_t mv;//, mv2;\r
        omap_view_t *draw;//, *show, *tmp;\r
@@ -75,27 +76,28 @@ 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
 \r
        /* draw the tiles */\r
        ptr = map.data;\r
-       modexEnter(1, 1, &gvar);\r
-       screen = modexDefaultPage(&screen, &gvar);\r
+       omodexEnter(1, 1, &gvar);\r
+       screen = omodexDefaultPage();\r
        screen.width += (TILEWH*2);\r
        mv.page = &screen;\r
        omapGoTo(&mv, 16, 16);\r
-//     screen2=modexNextPage(mv.page);\r
+//     screen2=omodexNextPage(mv.page);\r
 //     mv2.page = &screen2;\r
 //     omapGoTo(&mv2, 16, 16);\r
-//     modexShowPage(mv.page);\r
+//     omodexShowPage(mv.page);\r
 \r
        /* set up paging */\r
 //     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
@@ -103,48 +105,48 @@ 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
-//             modexShowPage(draw->page);\r
+//             omodexShowPage(draw->page);\r
 //             omapScrollRight(draw, 1);\r
 //             SWAP(draw, show);\r
 //             }\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
-//             modexShowPage(draw->page);\r
+//             omodexShowPage(draw->page);\r
 //             omapScrollLeft(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\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
-//             modexShowPage(draw->page);\r
+//             omodexShowPage(draw->page);\r
 //             omapScrollDown(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\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
-//             modexShowPage(draw->page);\r
+//             omodexShowPage(draw->page);\r
 //             omapScrollUp(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\r
        }\r
 \r
        //keyp(ch);\r
-       modexShowPage(draw->page);\r
+       omodexShowPage(draw->page);\r
 \r
        }\r
 \r
-       modexLeave();\r
+       omodexLeave();\r
 \r
 //     setkb(0);\r
        IN_Shutdown(&gvar);\r
@@ -312,7 +314,7 @@ omapGoTo(omap_view_t *mv, int tx, int ty) {
        mv->dyThresh = mv->map->tiles->tileHeight * 2;\r
 \r
        /* draw the tiles */\r
-       modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
+       omodexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
        py=0;\r
        i=mv->ty * mv->map->width + mv->tx;\r
        for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {\r
@@ -323,12 +325,12 @@ omapGoTo(omap_view_t *mv, int tx, int ty) {
 \r
 \r
 void\r
-omapDrawTile(otiles_t *t, word i, page_t *page, word x, word y) {\r
+omapDrawTile(otiles_t *t, word i, opage_t *page, word x, word y) {\r
        word rx;\r
        word ry;\r
        rx = (i % t->cols) * t->tileWidth;\r
        ry = (i / t->cols) * t->tileHeight;\r
-       modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
+       omodexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
 }\r
 \r
 \r