X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=839915fca95c245e818eb6384a30b9f67841ee24;hb=685a965bc64a6971eecd1d61f8cad606b5f0ac02;hp=ab283fa614ba28b14452256706eecfc767a1541f;hpb=e7fa17ebf9e8c8ce5d08d2fe5da684df58f45910;p=16.git

diff --git a/src/test.c b/src/test.c
index ab283fa6..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
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -21,30 +21,32 @@
  */
 
 #include <stdio.h>
-#include "src/lib/modex16.h"
+#include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
 #include "src/lib/scroll16.h"
 
-global_game_variables_t gvar;
-player_t player[MaxPlayers];
-map_view_t mv[2];
-pan_t pan;
+#define LGQ 32
+#define HGQ 55
+
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 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;
-
-	//argument
-	if(argv[1]) bakapee = atoi(argv[1]);
-	else bakapee = 1;
+	//====byte *pal, *pal2;
 
+	//====word colo=LGQ;
 
 	// DOSLIB: check our environment
-	probe_dos();
+	/*probe_dos();
 
 	// DOSLIB: what CPU are we using?
 	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
@@ -64,57 +66,71 @@ void main(int argc, char *argv[])
 		return;
 	}
 
-	/* load our palette */
-	modexLoadPalFile("data/default.pal", &pal2);
+	if (_DEBUG_INIT() == 0) {
+#ifdef DEBUGSERIAL
+		printf("WARNING: Failed to initialize DEBUG output\n");
+#endif
+	}
+	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);*/
+	Startup16(&gvar);
 
 	/* save the palette */
-	pal  = modexNewPal();
-	modexPalSave(pal);
-	modexFadeOff(1, pal);
-	modexPalBlack();
+	//====pal  = modexNewPal();
+	//====modexPalSave(pal);
+	//====modexFadeOff(1, pal);
+	//====modexPalBlack();
 
-	IN_Startup();
+	//IN_Startup();
 	IN_Default(0,&player,ctrl_Keyboard1);
-	IN_initplayer(&player, 0);
+	EN_initplayer(&player, 0, &gvar.video);
 
-	textInit();
-	VGAmodeX(bakapee, 1, &gvar);
-	modexPalBlack();
+	VGAmodeX(1, 1, &gvar);
+	//====modexPalBlack();
+
+	/* load our palette */
+	//====modexLoadPalFile("data/default.pal", &pal2);
+
+	/* overscan show */
+	//modexPalOverscan(44+1);
 
 	/* 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	= 0;
-		mv[i].ty	= 0;
-	}
- 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
- 	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
-// 	gvar.video.page[0].width += 32;
-// 	gvar.video.page[0].height += 32;
-
+	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);
+	modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+	modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+	modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
 	modexShowPage(&gvar.video.page[1]);
 	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
 	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);
 	modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);
-	modexShowPage(&gvar.video.page[0]);
-	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width+32, gvar.video.page[0].height);
+	modexShowPage(&gvar.video.page[0]);*/
+
+
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);
+	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
+	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);
+	modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);
+	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);
+	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);
+	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);
+
 
 	/* fade in */
-	modexFadeOn(1, pal2);
+	//====modexFadeOn(1, pal2);
 
-	i=0,k=0,j=0,pan.pn=1;
+	i=0,k=0,j=0;
 	startclk = *clockw;
 	while(!IN_KeyDown(sc_Escape))
 	{
 		IN_ReadControl(0,&player);
-		panpagemanual(mv, player, 0);
+		ZC_panPageManual(&mv, &player, 0);
+		//[gvar.video.sp]
+		//ZC_MVSync(&mv);
 
 		/*if(i<5){
 		switch (k)
@@ -122,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:
@@ -149,45 +165,46 @@ void main(int argc, char *argv[])
 			baka:
 			i++;
 			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);*/
-			if(IN_KeyDown(6))
+// 			if(IN_KeyDown(6))
+// 			{
+// 				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
+// 			}
+// 			if(IN_KeyDown(4+1)){
+// 				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+// 				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+// 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
+// 			}
+		//}
+		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)){
+			for(i=0;i<3;i++)
 			{
-				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
-			}
-			if(IN_KeyDown(4+1)){
-				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
-				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
-				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
+				pal2[i] = rand()%64;
+				modexPalUpdate1(pal2);
+				colo++;
+				if(colo>HGQ) colo=LGQ;
 			}
-		//}
-		if(IN_KeyDown(2)) pan.pn=0;
-		if(IN_KeyDown(3)) pan.pn=1;
-		if(IN_KeyDown(25)){
-			modexpdump(&gvar.video.page[pan.pn]);
-		}//p
-		modexShowPage(&gvar.video.page[pan.pn]);
+//			if(i>PAL_SIZE) i=0;
+		}//9*/
+		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;
 
 	/* fade back to text mode */
-	modexFadeOff(1, pal2);
-	modexPalBlack();
+	//====modexFadeOff(1, pal2);
+	//====modexPalBlack();
 	VGAmodeX(0, 1, &gvar);
+	Shutdown16(&gvar);
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	printf("video memory remaining: %ld\n", gvar.video.vmem_remain);
-	printf("page ");
-	for(i=0; i<gvar.video.num_of_pages;i++)
-	{
-		printf("	[%u]=", i);
-		printf("(%Fp)", (gvar.video.page[i].data));
-		printf(" size=%ld", gvar.video.page[i].pagesize);
-		printf(" sw=%lu  sh=%lu ", (unsigned long)gvar.video.page[i].sw, (unsigned long)gvar.video.page[i].sh);
-		printf(" width=%lu  height=%lu", (unsigned long)gvar.video.page[i].width, (unsigned long)gvar.video.page[i].height);
-		printf("\n");
-	}
-	printf("tx=%d	", mv[pan.pn].tx); printf("ty=%d	", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);
-	IN_Shutdown();
-	modexPalBlack();
-	modexFadeOn(1, pal);
+	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);
 }