X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=92b26f2e78e6de979def5efae33635698f9ea6b9;hb=0cde1191c89610551608f41e5bcd58f6d37d267f;hp=bd1035342417aece703aad109b65e89ef3dcf58f;hpb=86470bee97dd0d0663008826a0cfa976a9a65c2a;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index bd103534..92b26f2e 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-//#include "src/lib/mapread.h"
+#include "src/lib/timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -32,12 +32,14 @@
 global_game_variables_t gvar;
 static map_t map;
 player_t player[MaxPlayers];
-page_t screen, screen2, screen3;
+//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;
+float t;
+sword bakapee;
 
-void main()
+void main(int argc, char *argv[])
 {
 //	word panswitch=0, panq=1, pand=0;
 	word panpagenum=0; //for panning!
@@ -47,6 +49,7 @@ void main()
 	//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;
 #ifdef FADE
 	byte *dpal, *gpal;
 #endif
@@ -54,14 +57,16 @@ void main()
 	byte *mappalptr;
 	byte *mesg=malloc(sizeof(dword));
 
+
+	if(argv[1]) bakapee = atoi(argv[1]);
+	else bakapee = 1;
+
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
-	gvar.clock=*hwclockw;
-	//0000printf("starting timer\n");
-//++++
-	//++++????start_timer(&gvar);
-//++++	gvar.frames_per_second = 60;
-//0000	printf("ok\n");
+
+	printf("starting timer\n");
+	start_timer(&gvar);
+	printf("ok\n");
 	//extern struct inconfig inpu;
 
 //	atexit(qclean());
@@ -104,7 +109,8 @@ void main()
 #endif
 
 	textInit();
-	VGAmodeX(1, &gvar);
+	VGAmodeX(bakapee, &gvar);
+	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
@@ -129,15 +135,15 @@ void main()
 #endif
 
 	/* setup camera and screen~ */
-	screen = modexDefaultPage();
-	screen.width += (TILEWH*2);
-	screen.height += (TILEWH*2);//+QUADWH;
-	mv[0].page = &screen;
-	screen2 = modexNextPage(mv[0].page);
-	mv[1].page = &screen2;
-	screen3 = modexNextPageFlexibleSize(mv[1].page, 320, 240);	//(352*176)+1024 is the remaining amount of memory left wwww
-	//screen3 = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
-	mv[2].page = &screen3;
+	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
+	gvar.video.page[0].width += (TILEWH*2);
+	gvar.video.page[0].height += (TILEWH*2);//+QUADWH;
+	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];
 
 	/* set up paging */
 	bg = &mv[0];
@@ -151,8 +157,8 @@ void main()
 
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
-	player[0].tx = bg->tx + 10;
-	player[0].ty = bg->ty + 8;
+	player[0].tx = bg->tx + bg->page->tilemidposscreenx;
+	player[0].ty = bg->ty + bg->page->tilemidposscreeny;
 	player[0].x = player[0].tx*TILEWH;
 	player[0].y = player[0].ty*TILEWH;
 	player[0].triggerx = player[0].tx;
@@ -175,6 +181,7 @@ void main()
 	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);
@@ -186,7 +193,6 @@ void main()
 #endif
 
 	modexShowPage(spri->page);
-//	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
 	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
@@ -195,9 +201,7 @@ void main()
 #endif
 	while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
 	{
-		sprintf(mesg, "%lu", gvar.tiku);
-		modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg);
-		shinku(mv[1].page, &gvar);
+		shinku(mv, &gvar);
 		IN_ReadControl(0,&player);
 	//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
@@ -362,10 +366,28 @@ void main()
 			int 21h
 		}
 	}
+	if(IN_KeyDown(88))	//s
+	{
+		switch(gvar.kurokku.fpscap)
+		{
+			case 0:
+				gvar.kurokku.fpscap=1;
+			break;
+			case 1:
+				gvar.kurokku.fpscap=0;
+			break;
+		}
+		IN_Ack();
+	}
+	//TODO 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);
+	}
 
 	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
-
-	gvar.tiku++;
 	}
 
 	/* fade back to text mode */
@@ -395,8 +417,11 @@ void main()
 //++++	printf("Total free: %zu\n", GetFreeSize());
 //not used now	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 //not used now	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-//	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
-//	printf("Screen2: %dx", screen2.width);	printf("%d\n", screen2.height);
+	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d\n", gvar.video.page[0].height);
+	printf("Screen: %dx", gvar.video.page[0].sw);	printf("%d\n", gvar.video.page[0].sh);
+	printf("tile resolution: %dx", gvar.video.page[0].tilesh);	printf("%d\n", gvar.video.page[0].tilesh);
+	printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
+//	printf("Screen2: %dx", gvar.video.page[1].width);	printf("%d\n", gvar.video.page[1].height);
 //	printf("map: %dx%d\n", map.width, map.height);
 //	printf("\n");
 //	printf("player[0].info.x: %d", player[0].info.xaxis); printf("		player[0].info.y: %d\n", player[0].info.yaxis);