X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7cfc324876efd17fd202bb79ff13072dba771343;hb=7c35eb648613504ac47e5605d79f93112f569134;hp=6c65ced05fe7e022509c5aaaac708f83da9f8cdd;hpb=32e0bfea8d60e4f1b03c99a43fabcde3747613b8;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 6c65ced0..7cfc3248 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -27,27 +27,21 @@
 #define FADE
 #define MODEX	//this is for mode x initiating
 
-//bitmap_t p;
 static map_t map;
 map_view_t mv[4];
-//word pn=0; //i forgot ww
 float t;
 sword bakapee;
-pan_t pan;
 //debugswitches
 boolean panswitch=0;//1
 //extern boolean pageflipflop=1;
-	unsigned int i;
-	//static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
-
-	//map_view_db_t pgid[4];
-	word pg;
+boolean pagenorendermap = 1;
+unsigned int i;
 //#ifdef FADE
 	static word paloffset=0;
 	byte *dpal;
 //#endif
 	byte *gpal;
-	byte *ptr;
+//	byte *ptr;
 	byte *mappalptr;
 
 void main(int argc, char *argv[])
@@ -59,33 +53,26 @@ void main(int argc, char *argv[])
 
 	Startup16(&gvar);
 
-	pan.pn=0;
+	gvar.video.panp=0;
 
 	/* create the map */
-	fprintf(stderr, "testing map load~	");
+//	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
 	chkmap(&map, 0);
-	printf("chkmap ok	");
-	fprintf(stderr, "yay map loaded~~\n");
+//	printf("chkmap ok	");
+//	fprintf(stderr, "yay map loaded~~\n");
 
 	/* draw the tiles */
 #ifdef MODEX
-	ptr = map.data;
-	//mappalptr = map.tiles->btdata->palette;
+//	ptr = map.data;
+//	mappalptr = map.tiles->btdata->palette;
 
 	/* data */
-	player[0].data = malloc(72*128); //TODO use exmm
-	*player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite
-
-	/* create the planar buffer */
-////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
-	/*++++printf("load pee!!	");
-	pp = planar_buf_from_bitmap(&p);
-	printf("done!\n");*/
+	PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite
 
 #endif
 	/*	input!	*/
-	IN_Default(0,&player,ctrl_Keyboard1);
+	IN_Default(0, &player,ctrl_Keyboard1);
 
 	/* save the palette */
 #ifdef MODEX
@@ -95,17 +82,16 @@ void main(int argc, char *argv[])
 	modexFadeOff(4, dpal);
 #endif
 
-	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
-//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+
+	/* fix up the palette and everything */
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
 #endif
-//	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
-//++++	player[0].data.offset=(paloffset/3);
-//++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-		modexPalUpdate1(player[0].data->palette);
+//++++	PCXBMPVAR.offset=(paloffset/3);
+//++++	modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);
+	modexPalUpdate1(&PCXBMP->palette);
 //++++0000		modexPalUpdate1(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
@@ -125,28 +111,30 @@ void main(int argc, char *argv[])
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &pan, &gvar);
+	ZC_MVSetup(&mv, &map, &gvar);
+
+	//renderswitch
+	gvar.video.rss=1;
 
 	/* set up paging */
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(mv, 0, 0);
-	//_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+	mapGoTo(&mv, 0, 0);
 
 	playerXYpos(0, 0, &player, &mv, 0);
-	IN_initplayer(&player, 0);
+	EN_initplayer(&player, 0);
+	player[0].enti.spri->x = player[0].enti.x-4;
+	player[0].enti.spri->y = player[0].enti.y-16;
 
 #ifndef	SPRITE
-	modexClearRegion(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
-	//modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
+	modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);
 #else
-	//PBUFSFUN(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 64, 24, 32,	PLAYERBMPDATA);
-	PBUFSFUN(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 64, 16, 32,	player[0].data);
+	modexDrawSpriteRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y-TILEWH, 16, 64, 16, 32,	PCXBMPPTR);
 #endif
 
 	if(!pageflipflop)	VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);
-	else			VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)
-		shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.
+	else			ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)
 
+	//modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);
 	/* buffer pages */
 // 	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);
 // 	modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);
@@ -167,25 +155,25 @@ void main(int argc, char *argv[])
 	modexFadeOn(4, gpal);
 #endif
 #endif
-	while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
+	while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)
 	{
 		shinku(&gvar);
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
-	//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
+	//when player[0].enti.tx or player[0].enti.ty == 0 or player[0].enti.tx == 20 or player[0].enti.ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 	//player movement
 		IN_ReadControl(0, &player);
 	if(!panswitch){
-		walk(mv, &player, 0);
+		ZC_walk(&mv, &player, 0);
 	}else{
-		panPageManual(mv, &player, 0);
-		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
+		PANKEYFUNZC;//panPageManual(&mv, &player, 0);
+		//printf("	player[0].enti.q: %d", player[0].enti.q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
 	//the scripting stuff....
-	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
-	if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
+	//if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
+	if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -194,20 +182,13 @@ void main(int argc, char *argv[])
 		}
 		nosound();
 	}
-	if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
+	if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }
 	//debugging binds!
-	if(IN_KeyDown(2)){ VL_ShowPage(mv[0].page, 0, 0); pan.pn=0; }
-	if(IN_KeyDown(3)){ VL_ShowPage(mv[1].page, 0, 0); pan.pn=1; }
-	if(IN_KeyDown(4)){ VL_ShowPage(mv[2].page, 0, 0); pan.pn=2; }
-	if(IN_KeyDown(4+1)){ VL_ShowPage(mv[3].page, 0, 0); pan.pn=3; }
-	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-		 IN_UserInput(1,1);
-	}	//p
 #ifdef MODEX
 #ifdef FADE
 	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p
 	/*if(IN_KeyDown(22)){
-	paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);
+	paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
@@ -217,25 +198,7 @@ void main(int argc, char *argv[])
 #endif
 #endif
 	//pan switch
-	if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
-	if(IN_KeyDown(87))	//f11
-	{
-		pageflipflop=!pageflipflop;
-		IN_UserInput(1,1);
-// 		VGAmodeX(0, 0, &gvar);
-// 		IN_Shutdown();
-// 		__asm
-// 		{
-// 			mov ah,31h
-// 			int 21h
-// 		}
-	}
-	if(IN_KeyDown(68))	//f10
-	{
-		gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-		IN_UserInput(1,1);
-	}
-	if(IN_KeyDown(67))	//f9
+	if(IN_KeyDown(62))	//f3
 	{
 		modexClearRegion(mv[1].page, 0, 0, mv[1].page->width, mv[1].page->height, 2);
 		modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 3);
@@ -243,19 +206,16 @@ void main(int argc, char *argv[])
 		modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);
 		//IN_UserInput(1,1);
 	}
+#ifdef SPRITE
 	if(IN_KeyDown(66))	//f8
 	{
 //		modexDrawSprite(mv[0].page, 16, 16, &p);
-		modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));
+		modexDrawSprite(mv[0].page, 32+72, 16, (PCXBMPVAR));
 	}
-	FUNCTIONKEYFUNCTIONS;
-	// fmemtest into page
-	/*if(IN_KeyDown(4+1))	//4
-	{
-		pg=1;
-		SELECT_ALL_PLANES();
-		_fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
-	}*/
+#endif
+	FUNCTIONKEYFUNCTIONS
+	FUNCTIONKEYDRAWJUNK
+	if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }
 
 	//9
 #ifdef FADE
@@ -263,7 +223,7 @@ void main(int argc, char *argv[])
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
-	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
+	if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */