X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=b89d1291b45e5065797457dfac96500056cf4cd2;hb=18306661fed9fc7474047d15cae6422292b1878d;hp=55df4a4b40ce8481db4da50e67a7cdae18f1ef4d;hpb=66a317137a97b0488d86969e1c9562ed061f0de5;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 55df4a4b..b89d1291 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -35,12 +35,12 @@ player_t player[MaxPlayers];
 //page_t screen, gvar.video.page[1], gvar.video.page[2];
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
-planar_buf_t *p;
+bitmap_t p;
+word pn=0;
+static planar_buf_t huge *pp;
 float t;
 sword bakapee;
 
-void main(int argc, char *argv[])
-{
 //	word panswitch=0, panq=1, pand=0;
 	word panpagenum=0; //for panning!
 	unsigned int i;
@@ -56,14 +56,17 @@ void main(int argc, char *argv[])
 	byte *gpal;
 	byte *ptr;
 	byte *mappalptr;
-	byte *mesg=malloc(sizeof(dword));
 
+void main(int argc, char *argv[])
+{
+	byte *mesg=malloc(sizeof(dword));
 
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
+	//player[0].data = &pp;
 
 	printf("starting timer\n");
 	start_timer(&gvar);
@@ -75,8 +78,6 @@ void main(int argc, char *argv[])
 	/* create the map */
 	fprintf(stderr, "testing map load~\n");
 	loadmap("data/test.map", &map);
-//0000	map.width=0;
-//0000	map.height=0;
 	chkmap(&map, 0);
 	printf("chkmap ok\n");
 	fprintf(stderr, "yay map loaded~~\n");
@@ -87,15 +88,18 @@ void main(int argc, char *argv[])
 	/* draw the tiles */
 #ifdef MODEX
 	ptr = map.data;
-	mappalptr = map.tiles->data->palette;
+	//mappalptr = map.tiles->btdata->palette;
 
 	/* data */
-	player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+	p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
-	p = planar_buf_from_bitmap(&player[0].data);
-//0000	printf("planar buffer ok\n");
+////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
+	printf("load pee!!\n");
+	pp = planar_buf_from_bitmap(&p);
+	printf("done!\n");
+
 #endif
 	/*	input!	*/
 	IN_Startup();
@@ -113,14 +117,16 @@ void main(int argc, char *argv[])
 
 	textInit();
 	VGAmodeX(bakapee, &gvar);
-	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
 #endif
 //	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
 //++++	player[0].data.offset=(paloffset/3);
-//++++	modexPalUpdate(&player[0].data, &paloffset, 0, 0);
+//++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
+		//modexPalUpdate1(p.palette);
+		modexPalUpdate1(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
 //++++	map.tiles->data->offset=(paloffset/3);
@@ -144,6 +150,7 @@ void main(int argc, char *argv[])
 	mv[0].page = &gvar.video.page[0];
 	gvar.video.page[1] = modexNextPage(mv[0].page);
 	mv[1].page = &gvar.video.page[1];
+
 	gvar.video.page[2] = modexNextPageFlexibleSize(mv[1].page, gvar.video.page[0].sw, gvar.video.page[0].sh);	//(352*176)+1024 is the remaining amount of memory left wwww
 	//gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
 	mv[2].page = &gvar.video.page[2];
@@ -152,12 +159,12 @@ void main(int argc, char *argv[])
 	bg = &mv[0];
 	spri = &mv[1];
 	mask = &mv[2];
-
+//IN_Ack();
 //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(bg, 0, 0);
 	mapGoTo(spri, 0, 0);
 	//mapGoTo(mask, 0, 0);
-
+//IN_Ack();
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
 	player[0].tx = bg->tx + bg->page->tilemidposscreenx;
@@ -184,19 +191,17 @@ void main(int argc, char *argv[])
 	npc0.q=1;
 	npc0.d=0;
 	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
+
 	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
-#ifdef	SPRITE
-#ifdef BMPTYPE
-	oldDrawBmp(VGA, player[0].x-4, player[0].y-TILEWH, &player[0].data, 1);
-#else
-	modexDrawSpriteRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
-#endif
-#else
+#ifndef	SPRITE
 	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
+#else
+	//PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
+	PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
 #endif
 
 	modexShowPage(spri->page);
-	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
 	modexFadeOn(4, gpal);