X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=5121874f3bf92cdea482e88de0d848189804a6cd;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=7fb6f755e137606516e5225ee90f603850faab67;hpb=d182bbe56ee5292986d3ae5ea273b9ff4142fd7e;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 7fb6f755..5121874f 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -28,7 +28,6 @@
 #define MODEX	//this is for mode x initiating
 
 static map_t map;
-map_view_t mv[4];
 float t;
 sword bakapee;
 //debugswitches
@@ -68,7 +67,7 @@ void main(int argc, char *argv[])
 
 #endif
 	/*	input!	*/
-	IN_Default(0, &gvar.gvar.player,ctrl_Keyboard1);
+	IN_Default(0, &gvar.gvar.player[0],ctrl_Keyboard1);
 
 	/* save the palette */
 #ifdef MODEX
@@ -107,16 +106,16 @@ void main(int argc, char *argv[])
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &gvar);
+	ZC_MVSetup(&gvar.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);
+	mapGoTo(&gvar.mv, 0, 0);
 
-	ZC_gvar.playerXYpos(0, 0, &gvar.player, &mv, 0, 1);
+	ZC_gvar.playerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);
 	EN_initgvar.player(&gvar.player, 0, &gvar.video);
 	if (gvar.video.sprifilei == -1)
 	{
@@ -130,19 +129,19 @@ void main(int argc, char *argv[])
 	}
 
 #ifndef	SPRITE
-	modexClearRegion(mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);
+	modexClearRegion(gvar.mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);
 #else
 	modexDrawSpriteRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.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)
+		VL_ShowPage(gvar.mv[1].page, 0, 0);//modexShowPage(gvar.mv[1].page);
+	//else			ZC_ShowMV(&gvar.mv, 0, 0);//modexShowPage(gvar.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);
+// 	modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 47);
+// 	modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 45);
 // 	{
 // 		unsigned int k,j,o;
 // 		/* fill screen with a distinctive pattern */
@@ -153,7 +152,7 @@ void main(int argc, char *argv[])
 // 					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
 // 		}
 // 	}
-	modexClearRegion(mv[3].page, 0, 128, 24, 36, 15);
+	modexClearRegion(gvar.mv[3].page, 0, 128, 24, 36, 15);
 
 #ifdef MODEX
 #ifdef FADE
@@ -170,15 +169,15 @@ void main(int argc, char *argv[])
 	//gvar.player movement
 		IN_ReadControl(0, &gvar.player);
 	if(!panswitch){
-		ZC_walk(&mv, &gvar.player, 0);
+		ZC_walk(&gvar.mv, &gvar.player, 0);
 	}else{
-		PANKEYFUNZC;//panPageManual(&mv, &gvar.player, 0);
+		PANKEYFUNZC;//panPageManual(&gvar.mv, &gvar.player, 0);
 		//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.player[0].d);
 	}
 
 	//the scripting stuff....
 	//if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
-	if(((mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+	if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -191,25 +190,25 @@ void main(int argc, char *argv[])
 	//debugging binds!
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p
+	if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);  IN_UserInput(1); } //p
 	/*if(IN_KeyDown(22)){
 	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);
-	 modexpdump(mv[0].page); modexpdump(mv[1].page);
-		IN_UserInput(1,1);
+	 modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);
+		IN_UserInput(1);
 	}*/
 #endif
 #endif
 	//pan switch
 	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);
-		modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 4);
-		modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);
-		//IN_UserInput(1,1);
+		modexClearRegion(gvar.mv[1].page, 0, 0, gvar.mv[1].page->width, gvar.mv[1].page->height, 2);
+		modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 3);
+		modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 4);
+		modexClearRegion(gvar.mv[3].page, 0, 0, 20, 36, 15);
+		//IN_UserInput(1);
 	}
 
 	FUNCTIONKEYFUNCTIONS
@@ -218,7 +217,7 @@ void main(int argc, char *argv[])
 
 	//9
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r