16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/16/modex16/0croll.c b/16/modex16/0croll.c
new file mode 100755 (executable)
index 0000000..4ea630f
--- /dev/null
+++ b/16/modex16/0croll.c
@@ -0,0 +1,371 @@
+//from https://github.com/sparky4/16/commit/7872dbf5d0240f01177588bd7966c3e042ced554\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
+\r
+//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
+\r
+typedef struct {\r
+       bitmap_t *data;\r
+       word tileHeight;\r
+       word tileWidth;\r
+       unsigned int rows;\r
+       unsigned int cols;\r
+       unsigned int tilex,tiley; // tile position on the map\r
+} otiles_t;\r
+\r
+\r
+typedef struct {\r
+       byte    *data;\r
+       otiles_t *tiles;\r
+       int width;\r
+       int height;\r
+} omap_t;\r
+\r
+\r
+typedef struct {\r
+       omap_t *map;\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
+       word dyThresh; //????\r
+} omap_view_t;\r
+\r
+struct {\r
+       int tx; //player position on the viewable map\r
+       int ty; //player position on the viewable map\r
+} player;\r
+\r
+\r
+omap_t allocMap(int w, int h);\r
+void oinitMap(omap_t *map);\r
+void omapScrollRight(omap_view_t *mv, byte offset);\r
+void omapScrollLeft(omap_view_t *mv, byte offest);\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, 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
+//#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
+void main() {\r
+       static global_game_variables_t gvar;\r
+//     int show1=1;\r
+//     int tx, ty;\r
+//     int x, y;\r
+       //int ch=0x0;\r
+//     byte ch;\r
+//     int q=0;\r
+       opage_t screen;//,screen2;\r
+       omap_t map;\r
+       omap_view_t mv;//, mv2;\r
+       omap_view_t *draw;//, *show, *tmp;\r
+       byte *ptr;\r
+\r
+       //default player position on the viewable map\r
+       player.tx = 10;\r
+       player.ty = 8;\r
+\r
+//     setkb(1);\r
+       IN_Startup(&gvar);\r
+       /* create the map */\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
+       omodexEnter(1, 1, &gvar);\r
+       screen = omodexDefaultPage();\r
+       screen.width += (TILEWH*2);\r
+       mv.page = &screen;\r
+       omapGoTo(&mv, 16, 16);\r
+//     screen2=omodexNextPage(mv.page);\r
+//     mv2.page = &screen2;\r
+//     omapGoTo(&mv2, 16, 16);\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
+       while(!gvar.in.inst->Keyboard[sc_Escape]) {\r
+       //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
+       if(gvar.in.inst->Keyboard[77]){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               omapScrollRight(draw, 1);\r
+//             omodexShowPage(draw->page);\r
+//             omapScrollRight(draw, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
+       }\r
+\r
+       if(gvar.in.inst->Keyboard[75]){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               omapScrollLeft(draw, 1);\r
+//             omodexShowPage(draw->page);\r
+//             omapScrollLeft(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
+       }\r
+\r
+       if(gvar.in.inst->Keyboard[80]){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               omapScrollDown(draw, 1);\r
+//             omodexShowPage(draw->page);\r
+//             omapScrollDown(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
+       }\r
+\r
+       if(gvar.in.inst->Keyboard[72]){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               omapScrollUp(draw, 1);\r
+//             omodexShowPage(draw->page);\r
+//             omapScrollUp(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
+       }\r
+\r
+       //keyp(ch);\r
+       omodexShowPage(draw->page);\r
+\r
+       }\r
+\r
+       omodexLeave();\r
+\r
+//     setkb(0);\r
+       IN_Shutdown(&gvar);\r
+}\r
+\r
+\r
+omap_t\r
+allocMap(int w, int h) {\r
+       omap_t result;\r
+\r
+       result.width =w;\r
+       result.height=h;\r
+       result.data = malloc(sizeof(byte) * w * h);\r
+\r
+       return result;\r
+}\r
+\r
+\r
+void\r
+oinitMap(omap_t *map) {\r
+       /* just a place holder to fill out an alternating pattern */\r
+       int x, y;\r
+       int i;\r
+       int tile = 1;\r
+       map->tiles = malloc(sizeof(otiles_t));\r
+\r
+       /* create the tile set */\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 = malloc((TILEWH*2)*TILEWH);\r
+       map->tiles->tileHeight = TILEWH;\r
+       map->tiles->tileWidth =TILEWH;\r
+       map->tiles->rows = 1;\r
+       map->tiles->cols = 2;\r
+\r
+       i=0;\r
+       for(y=0; y<TILEWH; y++) {\r
+       for(x=0; x<(TILEWH*2); x++) {\r
+               if(x<TILEWH)\r
+                 map->tiles->data->data[i] = 0x24;\r
+               else\r
+                 map->tiles->data->data[i] = 0x34;\r
+               i++;\r
+       }\r
+       }\r
+\r
+       i=0;\r
+       for(y=0; y<map->height; y++) {\r
+               for(x=0; x<map->width; x++) {\r
+                       map->data[i] = tile;\r
+                       tile = tile ? 0 : 1;\r
+                       i++;\r
+               }\r
+               tile = tile ? 0 : 1;\r
+       }\r
+}\r
+\r
+\r
+void\r
+omapScrollRight(omap_view_t *mv, byte offset) {\r
+       word x;//, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dx += offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dx >= mv->dxThresh ) {\r
+       /* go forward one tile */\r
+       mv->tx++;\r
+       /* Snap the origin forward */\r
+       mv->page->data += 4;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+\r
+\r
+       /* draw the next column */\r
+       x= SCREEN_WIDTH + mv->map->tiles->tileWidth;\r
+               omapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
+       }\r
+}\r
+\r
+\r
+void\r
+omapScrollLeft(omap_view_t *mv, byte offset) {\r
+       //word x, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dx -= offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dx == 0) {\r
+       /* go backward one tile */\r
+       mv->tx--;\r
+\r
+       /* Snap the origin backward */\r
+       mv->page->data -= 4;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+\r
+       /* draw the next column */\r
+               omapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
+       }\r
+}\r
+\r
+\r
+void\r
+omapScrollUp(omap_view_t *mv, byte offset) {\r
+       word /*x,*/ y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dy -= offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dy == 0 ) {\r
+       /* go down one tile */\r
+       mv->ty--;\r
+       /* Snap the origin downward */\r
+       mv->page->data -= mv->page->width*4;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+\r
+\r
+       /* draw the next row */\r
+       y= 0;\r
+               omapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
+       }\r
+}\r
+\r
+\r
+void\r
+omapScrollDown(omap_view_t *mv, byte offset) {\r
+       word /*x,*/ y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dy += offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dy >= mv->dyThresh ) {\r
+       /* go down one tile */\r
+       mv->ty++;\r
+       /* Snap the origin downward */\r
+       mv->page->data += mv->page->width*4;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+\r
+\r
+       /* draw the next row */\r
+       y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;\r
+               omapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
+       }\r
+\r
+}\r
+\r
+\r
+void\r
+omapGoTo(omap_view_t *mv, int tx, int ty) {\r
+       int /*px,*/ py;\r
+       unsigned int i;\r
+\r
+       /* set up the coordinates */\r
+       mv->tx = tx;\r
+       mv->ty = ty;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+\r
+       /* set up the thresholds */\r
+       mv->dxThresh = mv->map->tiles->tileWidth * 2;\r
+       mv->dyThresh = mv->map->tiles->tileHeight * 2;\r
+\r
+       /* draw the tiles */\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
+               omapDrawRow(mv, tx-1, ty, py);\r
+       i+=mv->map->width - tx;\r
+       }\r
+}\r
+\r
+\r
+void\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
+       omodexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
+}\r
+\r
+\r
+void\r
+omapDrawRow(omap_view_t *mv, int tx, int ty, word y) {\r
+       word x;\r
+       int i;\r
+\r
+       /* the position within the map array */\r
+       i=ty * mv->map->width + tx;\r
+       for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
+       if(i>=0) {\r
+               /* we are in the map, so copy! */\r
+               omapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+       }\r
+       i++; /* next! */\r
+       }\r
+}\r
+\r
+\r
+void\r
+omapDrawCol(omap_view_t *mv, int tx, int ty, word x) {\r
+       int y;\r
+       int i;\r
+\r
+       /* location in the map array */\r
+       i=ty * mv->map->width + tx;\r
+\r
+       /* We'll copy all of the columns in the screen,\r
+          i + 1 row above and one below */\r
+       for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
+       if(i>=0) {\r
+               /* we are in the map, so copy away! */\r
+               omapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+       }\r
+       i += mv->map->width;\r
+       }\r
+}\r

diff --git a/16/modex16/dos_kb.h b/16/modex16/dos_kb.h
index ea81462a518ad101fbc333dea091c6e249538cbc..854632b183306c754d1b5b0bcbaeea7dfdf3307b 100755 (executable)
--- a/16/modex16/dos_kb.h
+++ b/16/modex16/dos_kb.h
@@ -1,6 +1,6 @@
 #ifndef _DOSLIB_KB_H_\r
 #define _DOSLIB_KB_H_\r
-#include "lib\lib_com.h"\r
+#include "16/modex16/lib/lib_com.h"\r
 \r
 /* Maximum number of scan codes on keyboard controllers */\r
 #define NUM_SCANCODES   128\r

diff --git a/makefile b/makefile
index 22212468f0c4028521b541299f515937ca069f2a..5c21b2ad782cbf256212191df6b5a115e5543cae 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -83,6 +83,8 @@ MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
 DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
+OLDMODEX16LIBDIR=16/modex16
+#16/$(SRCLIB)
 
 DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
 DOSLIB_DOS=$(DOSLIBDIR)/hw/dos
@@ -414,18 +416,22 @@ ll.$(OBJ):                $(SRCLIB)/ll.c  $(SRCLIB)/ll.h
 #
 # old 16 lib
 #
-0croll.exe:    0croll.$(OBJ) $(OLDLIBOBJS) omodex16.$(OBJ) 16_ino.$(OBJ)
-       wcl -0 $(WCLQ) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_ino.$(OBJ)
+0croll.exe:    0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# $(OLDLIBOBJS) omodex16.$(OBJ)# 16_ino.$(OBJ)
+       wcl -0 $(WCLQ) 0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# omodex16.$(OBJ) bitmap.$(OBJ)# 16_ino.$(OBJ)
 0croll.$(OBJ): $(SRC)/0croll.c
        wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c src/0croll.c
-16render.$(OBJ):       16/$(SRCLIB)/16render.c 16/$(SRCLIB)/16render.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/16render.c
-bitmap.$(OBJ): 16/$(SRCLIB)/bitmap.c   16/$(SRCLIB)/bitmap.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/bitmap.c
-omodex16.$(OBJ):       16/$(SRCLIB)/omodex16.c 16/$(SRCLIB)/omodex16.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/omodex16.c
-16_ino.$(OBJ): $(SRCLIB)/16_in.c       $(SRCLIB)/16_in.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
+#16render.$(OBJ):      $(OLDMODEX16LIBDIR)/16render.c  $(OLDMODEX16LIBDIR)/16render.h
+#      wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/16render.c
+bitmap.$(OBJ): $(OLDMODEX16LIBDIR)/bitmap.c    $(OLDMODEX16LIBDIR)/bitmap.h
+       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/bitmap.c
+#omodex16.$(OBJ):      $(OLDMODEX16LIBDIR)/omodex16.c  $(OLDMODEX16LIBDIR)/omodex16.h
+#      wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/omodex16.c
+modex16.$(OBJ):        $(OLDMODEX16LIBDIR)/modex16.c   $(OLDMODEX16LIBDIR)/modex16.h
+       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/modex16.c
+#16_ino.$(OBJ):        $(SRCLIB)/16_in.c       $(SRCLIB)/16_in.h
+#      wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
+dos_kb.$(OBJ): $(OLDMODEX16LIBDIR)/dos_kb.c    $(OLDMODEX16LIBDIR)/dos_kb.h
+       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/dos_kb.c
 
 #
 #other~

diff --git a/src/0croll.c b/src/0croll.c
index 4ea630f83392d8ae916767a216916ded8c7d97dc..ea26363cf1e36c84b929d4f3af735dc0a77f9fce 100755 (executable)
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -1,12 +1,8 @@
 //from https://github.com/sparky4/16/commit/7872dbf5d0240f01177588bd7966c3e042ced554\r
-#include "16/src/lib/omodex16.h"\r
-#include "16/src/lib/bitmap.h"\r
+#include "16/modex16/modex16.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
+#include "16/modex16/dos_kb.h"\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
@@ -17,25 +13,25 @@ typedef struct {
        unsigned int rows;\r
        unsigned int cols;\r
        unsigned int tilex,tiley; // tile position on the map\r
-} otiles_t;\r
+} tiles_t;\r
 \r
 \r
 typedef struct {\r
        byte    *data;\r
-       otiles_t *tiles;\r
+       tiles_t *tiles;\r
        int width;\r
        int height;\r
-} omap_t;\r
+} map_t;\r
 \r
 \r
 typedef struct {\r
-       omap_t *map;\r
-       opage_t *page;\r
+       map_t *map;\r
+       page_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
        word dyThresh; //????\r
-} omap_view_t;\r
+} map_view_t;\r
 \r
 struct {\r
        int tx; //player position on the viewable map\r
@@ -43,119 +39,116 @@ struct {
 } player;\r
 \r
 \r
-omap_t allocMap(int w, int h);\r
-void oinitMap(omap_t *map);\r
-void omapScrollRight(omap_view_t *mv, byte offset);\r
-void omapScrollLeft(omap_view_t *mv, byte offest);\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, 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
+map_t allocMap(int w, int h);\r
+void initMap(map_t *map);\r
+void mapScrollRight(map_view_t *mv, byte offset);\r
+void mapScrollLeft(map_view_t *mv, byte offest);\r
+void mapScrollUp(map_view_t *mv, byte offset);\r
+void mapScrollDown(map_view_t *mv, byte offset);\r
+void mapGoTo(map_view_t *mv, int tx, int ty);\r
+void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
+void mapDrawRow(map_view_t *mv, int tx, int ty, word y);\r
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);\r
 \r
+#define TILEWH 16\r
+#define QUADWH (TILEWH/4)\r
 //#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
 void main() {\r
-       static global_game_variables_t gvar;\r
 //     int show1=1;\r
-//     int tx, ty;\r
-//     int x, y;\r
+       int tx, ty;\r
+       int x, y;\r
        //int ch=0x0;\r
 //     byte ch;\r
-//     int q=0;\r
-       opage_t screen;//,screen2;\r
-       omap_t map;\r
-       omap_view_t mv;//, mv2;\r
-       omap_view_t *draw;//, *show, *tmp;\r
+       int q=0;\r
+       page_t screen;//,screen2;\r
+       map_t map;\r
+       map_view_t mv;//, mv2;\r
+       map_view_t *draw;//, *show, *tmp;\r
        byte *ptr;\r
 \r
        //default player position on the viewable map\r
        player.tx = 10;\r
        player.ty = 8;\r
 \r
-//     setkb(1);\r
-       IN_Startup(&gvar);\r
+       setkb(1);\r
        /* create the map */\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
+       map = allocMap(160,120); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
+       initMap(&map);\r
        mv.map = &map;\r
 //     mv2.map = &map;\r
 \r
        /* draw the tiles */\r
        ptr = map.data;\r
-       omodexEnter(1, 1, &gvar);\r
-       screen = omodexDefaultPage();\r
+       modexEnter();\r
+       screen = modexDefaultPage();\r
        screen.width += (TILEWH*2);\r
        mv.page = &screen;\r
-       omapGoTo(&mv, 16, 16);\r
-//     screen2=omodexNextPage(mv.page);\r
+       mapGoTo(&mv, 16, 16);\r
+//     screen2=modexNextPage(mv.page);\r
 //     mv2.page = &screen2;\r
-//     omapGoTo(&mv2, 16, 16);\r
-//     omodexShowPage(mv.page);\r
+//     mapGoTo(&mv2, 16, 16);\r
+//     modexShowPage(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
-       while(!gvar.in.inst->Keyboard[sc_Escape]) {\r
-       //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since omapS are actually square\r
+       while(!keyp(1)) {\r
+       //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since maps 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
-       if(gvar.in.inst->Keyboard[77]){\r
+       if(keyp(77)){\r
 //             for(q=0; q<TILEWH; q++) {\r
-               omapScrollRight(draw, 1);\r
-//             omodexShowPage(draw->page);\r
-//             omapScrollRight(draw, 1);\r
+               mapScrollRight(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollRight(draw, 1);\r
 //             SWAP(draw, show);\r
 //             }\r
        }\r
 \r
-       if(gvar.in.inst->Keyboard[75]){\r
+       if(keyp(75)){\r
 //             for(q=0; q<TILEWH; q++) {\r
-               omapScrollLeft(draw, 1);\r
-//             omodexShowPage(draw->page);\r
-//             omapScrollLeft(show, 1);\r
+               mapScrollLeft(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollLeft(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\r
        }\r
 \r
-       if(gvar.in.inst->Keyboard[80]){\r
+       if(keyp(80)){\r
 //             for(q=0; q<TILEWH; q++) {\r
-               omapScrollDown(draw, 1);\r
-//             omodexShowPage(draw->page);\r
-//             omapScrollDown(show, 1);\r
+               mapScrollDown(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollDown(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\r
        }\r
 \r
-       if(gvar.in.inst->Keyboard[72]){\r
+       if(keyp(72)){\r
 //             for(q=0; q<TILEWH; q++) {\r
-               omapScrollUp(draw, 1);\r
-//             omodexShowPage(draw->page);\r
-//             omapScrollUp(show, 1);\r
+               mapScrollUp(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollUp(show, 1);\r
 //             SWAP(draw, show);\r
 //             }\r
        }\r
 \r
        //keyp(ch);\r
-       omodexShowPage(draw->page);\r
+       modexShowPage(draw->page);\r
 \r
        }\r
 \r
-       omodexLeave();\r
-\r
-//     setkb(0);\r
-       IN_Shutdown(&gvar);\r
+       modexLeave();\r
+       setkb(0);\r
 }\r
 \r
 \r
-omap_t\r
+map_t\r
 allocMap(int w, int h) {\r
-       omap_t result;\r
+       map_t result;\r
 \r
        result.width =w;\r
        result.height=h;\r
@@ -166,12 +159,12 @@ allocMap(int w, int h) {
 \r
 \r
 void\r
-oinitMap(omap_t *map) {\r
+initMap(map_t *map) {\r
        /* just a place holder to fill out an alternating pattern */\r
        int x, y;\r
        int i;\r
        int tile = 1;\r
-       map->tiles = malloc(sizeof(otiles_t));\r
+       map->tiles = malloc(sizeof(tiles_t));\r
 \r
        /* create the tile set */\r
        map->tiles->data = malloc(sizeof(bitmap_t));\r
@@ -207,8 +200,8 @@ oinitMap(omap_t *map) {
 \r
 \r
 void\r
-omapScrollRight(omap_view_t *mv, byte offset) {\r
-       word x;//, y;  /* coordinate for drawing */\r
+mapScrollRight(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dx += offset;\r
@@ -224,14 +217,14 @@ omapScrollRight(omap_view_t *mv, byte offset) {
 \r
        /* draw the next column */\r
        x= SCREEN_WIDTH + mv->map->tiles->tileWidth;\r
-               omapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
+               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
        }\r
 }\r
 \r
 \r
 void\r
-omapScrollLeft(omap_view_t *mv, byte offset) {\r
-       //word x, y;  /* coordinate for drawing */\r
+mapScrollLeft(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dx -= offset;\r
@@ -246,14 +239,14 @@ omapScrollLeft(omap_view_t *mv, byte offset) {
        mv->page->dx = mv->map->tiles->tileWidth;\r
 \r
        /* draw the next column */\r
-               omapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
+               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
        }\r
 }\r
 \r
 \r
 void\r
-omapScrollUp(omap_view_t *mv, byte offset) {\r
-       word /*x,*/ y;  /* coordinate for drawing */\r
+mapScrollUp(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dy -= offset;\r
@@ -269,14 +262,14 @@ omapScrollUp(omap_view_t *mv, byte offset) {
 \r
        /* draw the next row */\r
        y= 0;\r
-               omapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
+               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
        }\r
 }\r
 \r
 \r
 void\r
-omapScrollDown(omap_view_t *mv, byte offset) {\r
-       word /*x,*/ y;  /* coordinate for drawing */\r
+mapScrollDown(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dy += offset;\r
@@ -292,15 +285,15 @@ omapScrollDown(omap_view_t *mv, byte offset) {
 \r
        /* draw the next row */\r
        y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;\r
-               omapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
+               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
        }\r
 \r
 }\r
 \r
 \r
 void\r
-omapGoTo(omap_view_t *mv, int tx, int ty) {\r
-       int /*px,*/ py;\r
+mapGoTo(map_view_t *mv, int tx, int ty) {\r
+       int px, py;\r
        unsigned int i;\r
 \r
        /* set up the coordinates */\r
@@ -314,28 +307,28 @@ omapGoTo(omap_view_t *mv, int tx, int ty) {
        mv->dyThresh = mv->map->tiles->tileHeight * 2;\r
 \r
        /* draw the tiles */\r
-       omodexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
+       modexClearRegion(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
-               omapDrawRow(mv, tx-1, ty, py);\r
+               mapDrawRow(mv, tx-1, ty, py);\r
        i+=mv->map->width - tx;\r
        }\r
 }\r
 \r
 \r
 void\r
-omapDrawTile(otiles_t *t, word i, opage_t *page, word x, word y) {\r
+mapDrawTile(tiles_t *t, word i, page_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
-       omodexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
+       modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
 }\r
 \r
 \r
 void\r
-omapDrawRow(omap_view_t *mv, int tx, int ty, word y) {\r
+mapDrawRow(map_view_t *mv, int tx, int ty, word y) {\r
        word x;\r
        int i;\r
 \r
@@ -344,7 +337,7 @@ omapDrawRow(omap_view_t *mv, int tx, int ty, word y) {
        for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
        if(i>=0) {\r
                /* we are in the map, so copy! */\r
-               omapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
        }\r
        i++; /* next! */\r
        }\r
@@ -352,7 +345,7 @@ omapDrawRow(omap_view_t *mv, int tx, int ty, word y) {
 \r
 \r
 void\r
-omapDrawCol(omap_view_t *mv, int tx, int ty, word x) {\r
+mapDrawCol(map_view_t *mv, int tx, int ty, word x) {\r
        int y;\r
        int i;\r
 \r
@@ -364,7 +357,7 @@ omapDrawCol(omap_view_t *mv, int tx, int ty, word x) {
        for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
        if(i>=0) {\r
                /* we are in the map, so copy away! */\r
-               omapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
        }\r
        i += mv->map->width;\r
        }\r