#include "src/lib/dos_kb.h"\r
-#include "src/lib/mapread.c"\r
+#include "src/lib/mapread.h"\r
//#include "16\lib\x\modex.h"\r
#include "src/lib/wtest/wtest.c"\r
#include "src/lib/planar.c"\r
//====#include "src\lib\ems.c"\r
+
+//#define LOADDATA
\r
//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
\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
\r
/* create the map */\r
-//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize());\r
- loadmap("data/test.map", &map);\r
+//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize());
+//0000 #ifdef LOADDATA
+ fprintf(stderr, "testing~\n");
+ loadmap("data/test.map", &map);
+ fprintf(stderr, "yay map loaded~~\n");
+//0000 #endif\r
//---- 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());
+#ifdef LOADDATA\r
+ ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+#endif\r
//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\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());
+#ifdef LOADDATA\r
+ p = planar_buf_from_bitmap(&ptmp);
+#endif\r
//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize());\r
\r
/*if(isEMS())\r
//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
- #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
+ #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+
+ //modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color!\r
/*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
\r
if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;\r
{\r
if(player.d == 0){ player.d = 2; }\r
if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
- !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
+ !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
player.q++;\r
} else { player.q = 1; player.d = 0; player.tx++; }\r
}\r
- else if(player.tx < map.width && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+ else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
{\r
if(player.d == 0){ player.d = 4; }\r
if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
- !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
+ !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
player.q++;\r
} else { player.q = 1; player.d = 0; player.tx--; }\r
}\r
- else if(player.tx > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
+ else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
{\r
if(player.d == 0){ player.d = 3; }\r
if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
- !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection!\r
+ !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection!\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
player.q++;\r
} else { player.q = 1; player.d = 0; player.ty++; }\r
}\r
- else if(player.ty < map.height && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+ else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
{\r
if(player.d == 0){ player.d = 1; }\r
if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
- !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection!\r
+ !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection!\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
player.q++;\r
} else { player.q = 1; player.d = 0; player.ty--; }\r
}\r
- else if(player.ty > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
+ else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\r
player.triggerx = player.tx;\r
player.triggery = player.ty-1;\r
}\r
- //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
}else{
//88 switch!
//right movement\r
} else { panq = 1; pand = 0; }\r
}
}\r
- if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
+ //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+ if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
{\r
short i;\r
for(i=800; i>=400; i--)\r
mov ah,31h\r
int 21h\r
}\r
- }\r
+ }
+
+ if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync!
+\r
}\r
\r
/* fade back to text mode */\r
modexFadeOff(4, gpal);\r
modexLeave();\r
setkb(0);\r
- //system("mem /E /P");\r
printf("Project 16 scroll.exe\n");\r
printf("tx: %d\n", bg->tx);\r
printf("ty: %d\n", bg->ty);
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
//if(i==0) i=2;\r
if(i==0)\r
{\r
- //wwww\r
+ //wwww
+ modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!\r
}\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
projects / 16.git / blobdiff