-#include "src\lib\dos_kb.h"
-#include "src\lib\mapread.c"\r
+#include "src/lib/dos_kb.h"\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"
+#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
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
void qclean();\r
+void pdump(map_view_t *pee);\r
void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);\r
\r
#define TILEWH 16\r
-#define QUADWH (TILEWH/4)\r
+#define QUADWH TILEWH/2\r
#define SPEED 4\r
//#define LOOPMAX (TILEWH/SPEED)\r
\r
#define TRIGGY 9\r
\r
void main() {\r
+ size_t oldfreemem=GetFreeSize();\r
long emmhandle;\r
long emsavail;\r
- char teststr[80];\r
+ char teststr[80];
+ word panswitch=0, panq=1, pand=0; //for panning!\r
int i;\r
+ static word paloffset=0;\r
bitmap_t ptmp;//, npctmp; // player sprite\r
planar_buf_t *p;\r
const char *cpus;\r
map_t map;\r
map_view_t mv, mv2, mv3;\r
map_view_t *bg, *spri, *mask;//, *tmp;\r
- byte *pal;\r
- byte *ptr;\r
+ byte *dpal, *gpal;\r
+ byte *ptr, *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
exit(0);\r
}\r
- \r
+\r
emsavail = emmavail();\r
if(emsavail == -1)\r
{\r
exit(0);\r
}*/\r
\r
- /* create the map */
- loadmap("data/test.map", &map/*, 0*/);
-// 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
+ /* create the map */\r
+//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize());
+ fprintf(stderr, "testing~\n");\r
+ loadmap("data/test.map", &map);
+ fprintf(stderr, "yay map loaded~~\n");\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
+//---- initMap(&map);\r
mv.map = ↦\r
mv2.map = ↦\r
mv3.map = ↦\r
\r
/* draw the tiles */\r
ptr = map.data;\r
+ mappalptr = map.tiles->data->palette;\r
/* data */\r
- ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
+//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize());\r
+ ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\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 @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize());\r
\r
/*if(isEMS())\r
{\r
//printf("%d\n", emmhandle);\r
}\r
*/\r
+\r
/* save the palette */\r
- pal = modexNewPal();\r
- modexPalSave(pal);\r
- modexFadeOff(4, pal);\r
- modexPalBlack();\r
+ dpal = modexNewPal();\r
+ modexPalSave(dpal);\r
+ modexFadeOff(4, dpal);\r
\r
setkb(1);\r
modexEnter();\r
- modexPalBlack();\r
- modexPalUpdate(ptmp.palette);\r
- modexFadeOn(4, ptmp.palette);\r
+ modexPalBlack(); //reset the palette~\r
+// printf("Total used @ before palette initiation: %zu\n", oldfreemem-GetFreeSize());\r
+ ptmp.offset=(paloffset/3);\r
+ modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+ //printf(" %d\n", sizeof(ptmp.data));\r
+ //printf("1: %d\n", paloffset);\r
+ map.tiles->data->offset=(paloffset/3);\r
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
+ printf("\n====\n");\r
+ printf("0 paloffset= %d\n", paloffset/3);\r
+ printf("====\n\n");\r
+ gpal = modexNewPal();\r
+ modexPalSave(gpal);\r
+ modexSavePalFile("data/g.pal", gpal);\r
+ modexPalBlack(); //so player will not see loadings~\r
+\r
+ /* setup camera and screen~ */\r
screen = modexDefaultPage();\r
screen.width += (TILEWH*2);\r
screen.height += (TILEWH*2)+QUADWH;\r
modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/\r
modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
\r
- modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
- modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
-\r
- modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);\r
- modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);\r
-\r
modexShowPage(spri->page);\r
+// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize());\r
+ modexFadeOn(4, gpal);\r
while(!keyp(1) && player.hp>0)\r
{\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
\r
//player movement\r
- //TODO: make movement into a function!\r
+ //TODO: make movement into a function!
+ if(!panswitch){\r
//right movement\r
if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)\r
{\r
if(player.d == 0){ player.d = 2; }\r
- if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+ if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
+ !(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 && !(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
if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)\r
{\r
if(player.d == 0){ player.d = 4; }\r
- if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
+ if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
+ !(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 && !(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
if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)\r
{\r
if(player.d == 0){ player.d = 3; }\r
- if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+ if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
+ !(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 && !(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
if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)\r
{\r
if(player.d == 0){ player.d = 1; }\r
- if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
+ if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
+ !(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 && !(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
-\r
- if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
+}else{
+//88 switch!
+ //right movement\r
+ if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)\r
+ {\r
+ if(pand == 0){ pand = 2; }\r
+ if(panq<=(TILEWH/SPEED))\r
+ {
+ bg->page->dx++;
+ spri->page->dx++;
+ modexShowPage(bg->page);
+ modexShowPage(spri->page);
+ panq++;\r
+ } else { panq = 1; pand = 0; }\r
+ }\r
+ //left movement\r
+ if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)\r
+ {\r
+ if(pand == 0){ pand = 4; }\r
+ if(panq<=(TILEWH/SPEED))\r
+ {\r
+ bg->page->dx--;
+ spri->page->dx--;
+ modexShowPage(bg->page);
+ modexShowPage(spri->page);
+ panq++;\r
+ } else { panq = 1; pand = 0; }\r
+ }\r
+ //down movement\r
+ if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)\r
+ {\r
+ if(pand == 0){ pand = 3; }\r
+ if(panq<=(TILEWH/SPEED))\r
+ {\r
+ bg->page->dy--;
+ spri->page->dy--;
+ modexShowPage(bg->page);
+ modexShowPage(spri->page);
+ panq++;\r
+ } else { panq = 1; pand = 0; }\r
+ }\r
+ //up movement\r
+ if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)\r
+ {\r
+ if(pand == 0){ pand = 1; }\r
+ if(panq<=(TILEWH/SPEED))\r
+ {\r
+ bg->page->dy++;
+ spri->page->dy++;
+ modexShowPage(bg->page);
+ modexShowPage(spri->page);\r
+ panq++;\r
+ } else { panq = 1; pand = 0; }\r
+ }
+}\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
nosound();\r
}\r
if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }\r
- //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
- if(keyp(87))
- {
+ //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }\r
+ if(keyp(25)){ pdump(bg); pdump(spri); }\r
+ if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
+ if(keyp(22)){\r
+ paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+ printf("1paloffset = %d\n", paloffset/3);\r
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
+ printf("2paloffset = %d\n", paloffset/3);\r
+ pdump(bg); pdump(spri); }
+\r
+ if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }\r
+ if(keyp(87))\r
+ {\r
modexLeave();\r
- setkb(0);
- __asm
- {
- mov ah,31h
- int 21h
- }
- }\r
+ setkb(0);\r
+ __asm\r
+ {\r
+ mov ah,31h\r
+ int 21h\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, ptmp.palette);\r
- modexPalBlack();\r
+ /* but 1st lets save the game palette~ */\r
+ modexPalSave(gpal);\r
+ modexSavePalFile("data/g.pal", gpal);\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);\r
- printf("player.x: %d", player.x);\r
- if(player.hp==0) printf("%d wwww\n", player.y+8);\r
- else printf("\nplayer.y: %d\n", player.y);\r
- printf("player.tx: %d\n", player.tx);\r
- printf("player.ty: %d\n", player.ty);\r
- printf("player.triggx: %d\n", player.triggerx);\r
- printf("player.triggy: %d\n", player.triggery);\r
- printf("player.hp: %d\n", player.hp);\r
- printf("player.q: %d\n", player.q);\r
- printf("player.d: %d\n", player.d);
- printf("%d\n", map.data[0]);\r
+ printf("ty: %d\n", bg->ty);
+ printf("player.x: %d", player.x); printf(" player.y: %d\n", player.y);\r
+ //if(player.hp==0) printf("%d wwww\n", player.y+8);\r
+ //else printf("\nplayer.y: %d\n", player.y);\r
+ printf("player.tx: %d", player.tx); printf(" player.ty: %d\n", player.ty);\r
+ printf("player.triggx: %d", player.triggerx); printf(" player.triggy: %d\n", player.triggery);\r
+ printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d);
+ printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);\r
+ printf("palette offset: %d\n", paloffset/3);\r
+ printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
+ printf("Total free: %zu\n", GetFreeSize());\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("\n");\r
+ printf("Screen: %dx", screen.width); printf("%d\n", screen.height);\r
+ printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height);\r
//xmsfree(&map);\r
//xmsfree(bg);\r
//xmsfree(spri);\r
default: cpus = "internal error"; break;\r
}\r
printf("detected CPU type: %s\n", cpus);\r
- modexPalBlack();\r
- modexFadeOn(4, pal);\r
+ modexFadeOn(4, dpal);\r
}\r
\r
\r
// map->tiles->data = malloc(sizeof(bitmap_t));\r
//else\r
// map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
- map->tiles->data->width = (TILEWH/**2*/);\r
- map->tiles->data->height= TILEWH;\r
+// map->tiles->data->width = (TILEWH/**2*/);\r
+// map->tiles->data->height= TILEWH;\r
//if(!isEMS() || !checkEMS())\r
// map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
//else\r
// map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
- map->tiles->tileHeight = TILEWH;\r
- map->tiles->tileWidth =TILEWH;\r
- map->tiles->rows = 1;\r
- map->tiles->cols = 1;//2;\r
+// map->tiles->tileHeight = TILEWH;\r
+// map->tiles->tileWidth =TILEWH;\r
+// map->tiles->rows = 1;\r
+// map->tiles->cols = 1;//2;\r
\r
- /*q=0;
+ /*q=0;\r
//for(y=0; y<map->height; y++) {\r
- //for(x=0; x<map->width; x++) {
+ //for(x=0; x<map->width; x++) {\r
i=0;\r
for(yy=0; yy<TILEWH; yy++) {\r
for(xx=0; xx<(TILEWH); xx++) {\r
//if(x<TILEWH){\r
- map->tiles->data->data[i+1] = map->data[q];//28;//0x24;
+ map->tiles->data->data[i+1] = map->data[q];//28;//0x24;\r
// printf("[%d]", map->tiles->data->data[i]);\r
//}else{\r
- //map->tiles->data->data[i] = map->data[q];//0;//0x34;
- //printf("]%d[==[%d]", i, map->tiles->data->data[i]);
+ //map->tiles->data->data[i] = map->data[q];//0;//0x34;\r
+ //printf("]%d[==[%d]", i, map->tiles->data->data[i]);\r
//}\r
i++;\r
- }
-// printf("\n");
- }
-// printf("[%d]", map->data[q]);
- q++;
-// }
+ }\r
+// printf("\n");\r
+ }\r
+// printf("[%d]", map->data[q]);\r
+ q++;\r
+// }\r
//printf("\n\n");\r
// }*/\r
\r
/*i=0;\r
for(y=0; y<map->height; y++) {\r
- for(x=0; x<map->width; x++) {
+ for(x=0; x<map->width; x++) {\r
// map->data[i]=255;\r
printf("[%d]", map->data[i]);\r
//tile = tile ? 0 : 1;\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
+ //if(i==0) i=2;\r
+ if(i==0)\r
+ {\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
//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);\r
- modexDrawBmpRegion(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
\r
setkb(0);\r
}\r
\r
+void pdump(map_view_t *pee)\r
+{\r
+ int mult=(QUADWH);\r
+ int palq=(mult)*TILEWH;\r
+ int palcol=0;\r
+ int palx, paly;\r
+ for(paly=0; paly<palq; paly+=mult){\r
+ for(palx=0; palx<palq; palx+=mult){\r
+ modexClearRegion(pee->page, palx+TILEWH, paly+TILEWH, mult, mult, palcol);\r
+ palcol++;\r
+ }\r
+ }\r
+}\r
+\r
void\r
animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)\r
{\r
projects / 16.git / blobdiff