X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=263b66027e6ce2b990eee5e8c17e4cd657cce3ec;hb=b5c46f5e85d6be9895fa484766867907a885439c;hp=29d22806ad6c11f4384282c6e840cfede484dc6a;hpb=d64a24c31ff7a7dab828b624a5540114e5feb315;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 29d22806..263b6602 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,8 +1,8 @@
-#include "src\lib\dos_kb.h"
-#include "src\lib\mapread.c"
+#include "src/lib/dos_kb.h"
+#include "src/lib/mapread.c"
 //#include "16\lib\x\modex.h"
-#include "src\lib\wtest\wtest.c"
-#include "src\lib\planar.c"
+#include "src/lib/wtest/wtest.c"
+#include "src/lib/planar.c"
 //====#include "src\lib\ems.c"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
@@ -73,7 +73,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 #define TRIGGX 10
 #define TRIGGY 9
 
-void main() {
+void main() {
+	size_t oldfreemem=GetFreeSize();
 	long emmhandle;
 	long emsavail;
 	char teststr[80];
@@ -104,7 +105,7 @@ void main() {
 		printf("Expanded memory manager is not present\n");
 		exit(0);
 	}
-     
+
 	emsavail = emmavail();
 	if(emsavail == -1)
 	{
@@ -120,6 +121,7 @@ void main() {
 	}*/
 
 	/* 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());
@@ -132,10 +134,14 @@ void main() {
 	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);
+//0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
 
 	/*if(isEMS())
 	{
@@ -172,24 +178,24 @@ void main() {
 	dpal = modexNewPal();
 	modexPalSave(dpal);
 	modexFadeOff(4, dpal);
-	modexPalBlack();
 
 	setkb(1);
 	modexEnter();
-	modexPalBlack();
+	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("wwww:	%d\n", map.tiles->data->offset);
-	//printf("2:	%d\n", paloffset);
-	//printf("	%d\n", sizeof(map.tiles->data->(*data)));
+	printf("\n====\n");
+	printf("0	paloffset=	%d\n", paloffset/3);
+	printf("====\n\n");
 	gpal = modexNewPal();
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
-	modexFadeOn(4, gpal);
+	modexPalBlack();	//so player will not see loadings~
 
 	/* setup camera and screen~ */
 	screen = modexDefaultPage();
@@ -239,8 +245,9 @@ void main() {
 
 	//----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);
 	//----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);
-
-	modexShowPage(spri->page);
+	modexShowPage(spri->page);
+//	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
+	modexFadeOn(4, gpal);
 	while(!keyp(1) && player.hp>0)
 	{
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
@@ -539,6 +546,13 @@ void main() {
 	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
 	//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))
 	{
@@ -553,8 +567,10 @@ void main() {
 	}
 
 	/* fade back to text mode */
+	/* but 1st lets save the game palette~ */
+	modexPalSave(gpal);
+	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
-	modexPalBlack();
 	modexLeave();
 	setkb(0);
 	//system("mem /E /P");
@@ -572,6 +588,8 @@ void main() {
 	printf("player.q: %d\n", player.q);
 	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");
 	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
 	printf("\n");
@@ -589,7 +607,6 @@ void main() {
 		default: cpus = "internal error"; break;
 	}
 	printf("detected CPU type: %s\n", cpus);
-	modexPalBlack();
 	modexFadeOn(4, dpal);
 }
 
@@ -872,7 +889,7 @@ void pdump(map_view_t *pee)
 			palcol++;
 		}
 	}
-}
+}
 
 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)