-//#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
\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
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
//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
\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
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
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
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
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
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
\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