//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
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
} 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 = ↦\r
// mv2.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
\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
\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
\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
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
\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
\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
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
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
\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
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
projects / 16.git / blobdiff