X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fscroll.c;h=9855756fada4baabf03b960df54bd51fb7971014;hb=9ee2d68eb9e4c8ee46254efa06e3977cf3b36bdd;hp=6baefa2af368a8ba748aff10886215e24d02dcab;hpb=c5070709fea9c16de70dd438e199d0a242cda8e9;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 6baefa2a..9855756f 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -34,6 +34,7 @@ sword bakapee;
 //debugswitches
 boolean panswitch=0;//1
 //extern boolean pageflipflop=1;
+boolean pagenorendermap = 1;
 unsigned int i;
 //#ifdef FADE
 	static word paloffset=0;
@@ -52,8 +53,6 @@ void main(int argc, char *argv[])
 
 	Startup16(&gvar);
 
-	gvar.video.panp=0;
-
 	/* create the map */
 //	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
@@ -113,17 +112,24 @@ void main(int argc, char *argv[])
 	ZC_MVSetup(&mv, &map, &gvar);
 
 	//renderswitch
-	gvar.video.rs=2;
+	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);
 
-	playerXYpos(0, 0, &player, &mv, 0);
-	IN_initplayer(&player, 0);
-	player[0].ent->spri->x = player[0].enti.x-4;
-	player[0].ent->spri->y = player[0].enti.y-16;
-	player[0].ent->spri->delay = 0;
+	ZC_playerXYpos(0, 0, &player, &mv, 0, 1);
+	EN_initplayer(&player, 0, &gvar.video);
+	if (gvar.video.sprifilei == -1)
+	{
+#ifdef FADE
+		modexFadeOff(4, gpal);
+#endif
+		Quit(&gvar, "Wrong");
+#ifdef FADE
+		modexFadeOn(4, dpal);
+#endif
+	}
 
 #ifndef	SPRITE
 	modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);
@@ -131,8 +137,9 @@ void main(int argc, char *argv[])
 	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			ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)
+	//if(!pageflipflop)
+		VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);
+	//else			ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)
 
 	//modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);
 	/* buffer pages */
@@ -167,7 +174,7 @@ void main(int argc, char *argv[])
 	if(!panswitch){
 		ZC_walk(&mv, &player, 0);
 	}else{
-		PANKEYFUN;//panPageManual(&mv, &player, 0);
+		PANKEYFUNZC;//panPageManual(&mv, &player, 0);
 		//printf("	player[0].enti.q: %d", player[0].enti.q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
@@ -198,25 +205,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);
@@ -224,14 +213,10 @@ 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, (PCXBMPVAR));
-	}
-#endif
-	FUNCTIONKEYFUNCTIONS;
+
+	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