X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=1d1cc983e360b012a39aa8d56edd770e0588ac50;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=43adbd8dad3b83b4b8d749b863e5527460e2c1c0;hpb=f6d0f26f669392f2970eb91d744fb88651583cf3;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 43adbd8d..1d1cc983 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-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -129,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(&gvar.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 */
@@ -152,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
@@ -177,7 +177,7 @@ void main(int argc, char *argv[])
 
 	//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--)
@@ -190,13 +190,13 @@ 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); } //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);
+	 modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);
 		IN_UserInput(1);
 	}*/
 #endif
@@ -204,10 +204,10 @@ void main(int argc, char *argv[])
 	//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);
+		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);
 	}