X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=839915fca95c245e818eb6384a30b9f67841ee24;hb=fa252ebd82649e4f3bab4a53228828766713ad6c;hp=6339d96d17f0644a98486e017c743b6fdafc712c;hpb=32e0bfea8d60e4f1b03c99a43fabcde3747613b8;p=16.git

diff --git a/src/test.c b/src/test.c
index 6339d96d..839915fc 100755
--- a/src/test.c
+++ b/src/test.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.
  *
@@ -24,28 +24,26 @@
 #include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
 #include "src/lib/scroll16.h"
-#include "src/lib/bakapee.h"
+
+#define LGQ 32
+#define HGQ 55
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
-player_t player[MaxPlayers];
-pan_t pan;
 
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
+	static player_t player[MaxPlayers];
+
+	map_t map;
 	map_view_t mv[4];
+
 	int i, j;
 	word startclk, endclk;
 	word k;
 	//====byte *pal, *pal2;
-	sword bakapee;
 
 	//====word colo=LGQ;
-	pan.pn=0;
-
-	//argument
-	if(argv[1]) bakapee = atoi(argv[1]);
-	else bakapee = 1;
 
 	// DOSLIB: check our environment
 	/*probe_dos();
@@ -85,9 +83,9 @@ void main(int argc, char *argv[])
 
 	//IN_Startup();
 	IN_Default(0,&player,ctrl_Keyboard1);
-	IN_initplayer(&player, 0);
+	EN_initplayer(&player, 0, &gvar.video);
 
-	VGAmodeX(bakapee, 1, &gvar);
+	VGAmodeX(1, 1, &gvar);
 	//====modexPalBlack();
 
 	/* load our palette */
@@ -98,14 +96,7 @@ void main(int argc, char *argv[])
 
 	/* set up the page, but with 16 pixels on all borders in offscreen mem */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages;i++)
-	{
-		mv[i].page = &gvar.video.page[i];
-		mv[i].video = &gvar.video;
-		mv[i].pan	= &pan;
-		mv[i].tx	= 1;
-		mv[i].ty	= 1;
-	}
+	ZC_MVSetup(&mv, &map, &gvar);
 
 	/* fill the page with one color, but with a black border */
 	/*modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);
@@ -137,7 +128,8 @@ void main(int argc, char *argv[])
 	while(!IN_KeyDown(sc_Escape))
 	{
 		IN_ReadControl(0,&player);
-		ZC_panPageManual(&mv[pan.pn], &player, 0);
+		ZC_panPageManual(&mv, &player, 0);
+		//[gvar.video.sp]
 		//ZC_MVSync(&mv);
 
 		/*if(i<5){
@@ -146,23 +138,23 @@ void main(int argc, char *argv[])
 			case 0:
 				pee:
 				// go right
-				gvar.video.page[pan.pn].dx++;
+				gvar.video.page[gvar.video.sp].dx++;
 				if(i==5){ if(j>=31){ i++; j=0; goto baka; }else j++; }else
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 1:
 				// go left
-				gvar.video.page[pan.pn].dx--;
+				gvar.video.page[gvar.video.sp].dx--;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 2:
 				// go up
-				gvar.video.page[pan.pn].dy++;
+				gvar.video.page[gvar.video.sp].dy++;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 3:
 				// go down
-				gvar.video.page[pan.pn].dy--;
+				gvar.video.page[gvar.video.sp].dy--;
 				if(j>=32){ k=0; j=0; i++; }else j++;
 			break;
 			default:
@@ -183,10 +175,7 @@ void main(int argc, char *argv[])
 // 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
 // 			}
 		//}
-		if(IN_KeyDown(1+1)){ pan.pn=0; }
-		if(IN_KeyDown(2+1)){ pan.pn=1; }
-		if(IN_KeyDown(3+1)){ pan.pn=2; }
-		if(IN_KeyDown(4+1)){ pan.pn=3; }
+		PANKEYFUN;
 		if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
 		if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
 /*====		if(IN_KeyDown(7)){
@@ -199,8 +188,9 @@ void main(int argc, char *argv[])
 			}
 //			if(i>PAL_SIZE) i=0;
 		}//9*/
-		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[pan.pn]); IN_UserInput(1,1); }//p
-		VL_ShowPage(&gvar.video.page[pan.pn], 0, 0);
+		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1,1); }//p
+		//VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
+		ZC_ShowMV(&mv, 0, 0);
 	}
 
 	endclk = *clockw;
@@ -212,8 +202,8 @@ void main(int argc, char *argv[])
 	Shutdown16(&gvar);
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	modexprintmeminfo(&gvar.video);
-	printf("tx=%d	", mv[pan.pn].tx); printf("ty=%d	", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);
+	VL_PrintmodexmemInfo(&gvar.video);
+	printf("tx=%d	", mv[gvar.video.sp].tx); printf("ty=%d	", mv[gvar.video.sp].ty); printf("player.d=%d\n", player[0].enti.d);
 	//IN_Shutdown();
 	//====modexPalBlack();
 	//====modexFadeOn(1, pal);