-#include "src\lib\modex16.h"\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include "src\lib\dos_kb.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
+#include "src/lib/dos_kb.h"
+#include "src/lib/mapread.c"\r
+//#include "16\lib\x\modex.h"\r
+#include "src/lib/wtest/wtest.c"\r
+#include "src/lib/planar.c"
+//====#include "src\lib\ems.c"\r
\r
//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
\r
-typedef struct {\r
+/*typedef struct {\r
bitmap_t *data;\r
word tileHeight;\r
word tileWidth;\r
tiles_t *tiles;\r
int width;\r
int height;\r
-} map_t;\r
+} map_t;*/\r
\r
\r
typedef struct {\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
-void qclean();\r
+void qclean();
+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 TILEWH 16
+#define QUADWH TILEWH/2\r
#define SPEED 4\r
//#define LOOPMAX (TILEWH/SPEED)\r
\r
//place holder definitions\r
-#define MAPX 200\r
-#define MAPY 150\r
+//#define MAPX 200\r
+//#define MAPY 150\r
#define TRIGGX 10\r
#define TRIGGY 9\r
\r
-void main() {\r
+void main() {
+ size_t oldfreemem=GetFreeSize();\r
long emmhandle;\r
long emsavail;\r
char teststr[80];\r
- int i;\r
+ int i;
+ 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 manager is not present\n");\r
exit(0);\r
}\r
- \r
+\r
emsavail = emmavail();\r
if(emsavail == -1)\r
{\r
printf("Insufficient pages available\n");\r
exit(0);\r
}*/\r
-\r
- /* create the map */\r
- map = allocMap(MAPX,MAPY); //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
- mv.map = ↦\r
- mv2.map = ↦\r
- mv3.map = ↦\r
-\r
- /* draw the tiles */\r
- ptr = map.data;\r
- /* data */\r
- ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
- //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
-\r
- /* create the planar buffer */\r
+
+ /* create the map */
+//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize());
+ loadmap("data/test.map", &map);
+//---- 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
+ //if(isEMS()) printf("%d tesuto\n", coretotalEMS());
+//---- initMap(&map);
+ mv.map = ↦
+ mv2.map = ↦
+ mv3.map = ↦
+
+ /* draw the tiles */
+ ptr = map.data;
+ mappalptr = map.tiles->data->palette;
+ /* data */
+//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize());
+ ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+ //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
+
+ /* create the planar buffer */
+//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize());
p = planar_buf_from_bitmap(&ptmp);\r
-\r
+//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize());
+
/*if(isEMS())\r
{\r
XMOVE mm;\r
//printf("%d\n", emmhandle);\r
}\r
*/\r
- /* save the palette */\r
- pal = modexNewPal();\r
- modexPalSave(pal);\r
- modexFadeOff(4, pal);\r
- modexPalBlack();\r
-\r
- setkb(1);\r
- modexEnter();\r
- modexPalBlack();\r
- modexPalUpdate(ptmp.palette);\r
- modexFadeOn(4, ptmp.palette);\r
- screen = modexDefaultPage();\r
+
+ /* save the palette */
+ dpal = modexNewPal();
+ modexPalSave(dpal);
+ modexFadeOff(4, dpal);
+
+ setkb(1);
+ modexEnter();
+ modexPalBlack(); //reset the palette~
+// printf("Total used @ before palette initiation: %zu\n", oldfreemem-GetFreeSize());
+ ptmp.offset=(paloffset/3);
+ modexPalUpdate(&ptmp, &paloffset, 0, 0);
+ //printf(" %d\n", sizeof(ptmp.data));
+ //printf("1: %d\n", paloffset);
+ map.tiles->data->offset=(paloffset/3);
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+ printf("\n====\n");
+ printf("0 paloffset= %d\n", paloffset/3);
+ printf("====\n\n");
+ gpal = modexNewPal();\r
+ modexPalSave(gpal);
+ modexSavePalFile("data/g.pal", gpal);
+ modexPalBlack(); //so player will not see loadings~
+
+ /* setup camera and screen~ */
+ screen = modexDefaultPage();
screen.width += (TILEWH*2);\r
screen.height += (TILEWH*2)+QUADWH;\r
mv.page = &screen;\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
+ //----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
- modexShowPage(spri->page);\r
+ //----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);\r
+ //----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);\r
+ modexShowPage(spri->page);
+// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize());
+ 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
//right movement\r
if(npc0.d == 2)\r
{\r
- if(npc0.tx < MAPX && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))\r
+ if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))\r
{\r
if(npc0.q<=(TILEWH/SPEED))\r
{\r
//down movement\r
if(npc0.d == 3)\r
{\r
- if(npc0.ty < MAPY && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))\r
+ if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))\r
{\r
if(npc0.q<=(TILEWH/SPEED))\r
{\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 < MAPX && 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 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\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 < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+ else if(player.tx < map.width && !(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 <= MAPX && 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 && !(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 < MAPY && 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 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\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 < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+ else if(player.ty < map.height && !(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 <= MAPY && 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 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
{\r
if(player.q<=(TILEWH/SPEED))\r
{\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; }\r
+ //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
+ if(keyp(25)){ pdump(bg); pdump(spri); }
+ if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }
+ if(keyp(22)){
+ paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
+ printf("1paloffset = %d\n", paloffset/3);
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+ printf("2paloffset = %d\n", paloffset/3);
+ pdump(bg); pdump(spri); }
+
+ if(keyp(87))
+ {
+ modexLeave();\r
+ setkb(0);
+ __asm
+ {
+ mov ah,31h
+ int 21h
+ }
+ }\r
}\r
\r
- /* fade back to text mode */\r
- modexFadeOff(4, ptmp.palette);\r
- modexPalBlack();\r
+ /* fade back to text mode */
+ /* but 1st lets save the game palette~ */
+ modexPalSave(gpal);
+ modexSavePalFile("data/g.pal", gpal);
+ modexFadeOff(4, gpal);\r
modexLeave();\r
setkb(0);\r
//system("mem /E /P");\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);\r
+ printf("player.d: %d\n", player.d);
+ printf("palette offset: %d\n", paloffset/3);
+ printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+ printf("Total free: %zu\n", GetFreeSize());
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
case 2: cpus = "386 or newer"; break;\r
default: cpus = "internal error"; break;\r
}\r
- printf("detected CPU type: %s\n", cpus);\r
- modexPalBlack();\r
- modexFadeOn(4, pal);\r
+ printf("detected CPU type: %s\n", cpus);
+ modexFadeOn(4, dpal);\r
}\r
\r
\r
void\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
+ int x, y, xx, yy;\r
+ int i, q;\r
+// int tile = 1;\r
//if(!isEMS() || !checkEMS())\r
- map->tiles = malloc(sizeof(tiles_t));\r
+// map->tiles = malloc(sizeof(tiles_t));\r
//else\r
// map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
\r
/* create the tile set */\r
//if(!isEMS() || !checkEMS())\r
- map->tiles->data = malloc(sizeof(bitmap_t));\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
+// 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 = 2;\r
-\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;
+ //for(y=0; y<map->height; y++) {\r
+ //for(x=0; x<map->width; x++) {
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] = 28;//0x24;\r
- else\r
- map->tiles->data->data[i] = 0;//0x34;\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;
+// 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]);
+ //}\r
i++;\r
- }\r
- }\r
-\r
- i=0;\r
+ }
+// printf("\n");
+ }
+// printf("[%d]", map->data[q]);
+ q++;
+// }
+ //printf("\n\n");\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
+ for(x=0; x<map->width; x++) {
+// map->data[i]=255;\r
+ printf("[%d]", map->data[i]);\r
+ //tile = tile ? 0 : 1;\r
i++;\r
}\r
- tile = tile ? 0 : 1;\r
- }\r
+ //tile = tile ? 0 : 1;\r
+ }*/\r
}\r
\r
\r
void\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
+ word ry;
+ //if(i==0) i=2;
+ if(i==0)
+ {
+ //wwww
+ }
+ else
+ {
+ rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
+ ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
//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
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
+ /* we are in the map, so copy! */
mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
}\r
i++; /* next! */\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
+ /* we are in the map, so copy away! */
mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
}\r
i += mv->map->width;\r
{\r
modexLeave();\r
setkb(0);\r
-}\r
+}
+
+void pdump(map_view_t *pee)
+{\r
+ int mult=(QUADWH);\r
+ int palq=(mult)*TILEWH;\r
+ int palcol=0;
+ int palx, paly;
+ for(paly=0; paly<palq; paly+=mult){\r
+ for(palx=0; palx<palq; palx+=mult){
+ modexClearRegion(pee->page, palx+TILEWH, paly+TILEWH, mult, mult, palcol);\r
+ palcol++;\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
projects / 16.git / blobdiff