#include "src/lib/dos_kb.h"\r
-#include "src/lib/mapread.c"\r
-//#include "16\lib\x\modex.h"\r
+#include "src/lib/mapread.h"\r
#include "src/lib/wtest/wtest.c"\r
#include "src/lib/planar.c"\r
//====#include "src\lib\ems.c"\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
-} tiles_t;\r
-\r
-\r
-typedef struct {\r
- byte *data;\r
- tiles_t *tiles;\r
- int width;\r
- int height;\r
-} map_t;*/\r
-\r
-\r
typedef struct {\r
map_t *map;\r
page_t *page;\r
//place holder definitions\r
//#define MAPX 200\r
//#define MAPY 150\r
-#define TRIGGX 10\r
-#define TRIGGY 9\r
+//#define TRIGGX 10\r
+//#define TRIGGY 9\r
\r
void main() {\r
size_t oldfreemem=GetFreeSize();\r
- long emmhandle;\r
+ /*long emmhandle;\r
long emsavail;\r
- char teststr[80];
+ char teststr[80];*/
word panswitch=0, panq=1, pand=0; //for panning!\r
int i;\r
static word paloffset=0;\r
map_view_t mv, mv2, mv3;\r
map_view_t *bg, *spri, *mask;//, *tmp;\r
byte *dpal, *gpal;\r
- byte *ptr, *mappalptr;\r
+ byte huge *ptr;
+ byte *mappalptr;\r
actor_t player;\r
//actor_t npc0;\r
\r
printf("Expanded memory is not present\n");\r
exit(0);\r
}\r
- \r
+\r
if(!emmok())\r
{\r
printf("Expanded memory manager is not present\n");\r
\r
/* create the map */\r
//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize());
- fprintf(stderr, "testing~\n");\r
-//testqqqq loadmap("data/test.map", &map);\r
+//0000 fprintf(stderr, "testing~\n");
+ loadmap("data/test.map", &map);
+//0000 fprintf(stderr, "yay map loaded~~\n");
//---- map = allocMap(map.width,map.height); //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());\r
//---- initMap(&map);\r
ptr = map.data;\r
mappalptr = map.tiles->data->palette;\r
/* data */\r
-//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize());\r
- ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\r
+//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize());
+ ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
- \r
+\r
/* create the planar buffer */\r
-//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize());\r
- p = planar_buf_from_bitmap(&ptmp);\r
+//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize());
+ p = planar_buf_from_bitmap(&ptmp);
//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize());\r
\r
/*if(isEMS())\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("Screen: %dx", screen.width); printf("%d\n", screen.height);\r
- printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height);\r
+ printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height);
+ //printf("map.width=%d map.height=%d map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);\r
//xmsfree(&map);\r
//xmsfree(bg);\r
//xmsfree(spri);\r
\r
/* draw the tiles */\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
+ py=0;
+ i=mv->ty * mv->map->width + mv->tx;
for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {\r
mapDrawRow(mv, tx-1, ty, py);\r
i+=mv->map->width - tx;\r
else\r
{\r
rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
- ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
+ ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
+ printf("i=%d\n", i);\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
int i;\r
\r
/* the position within the map array */\r
- i=ty * mv->map->width + tx;\r
+ i=ty * mv->map->width + tx;
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