X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=b80291fcf740d804c9dfbd91f6dadaff4c3d056a;hb=ebbb6a0fc39d7f16b7127e51da1784421a5e1cf9;hp=8227979b2056f41bc417cdef5185476b364b9bf3;hpb=71c021406f2917a95443149eb883edd44ed5a647;p=16.git

diff --git a/src/test.c b/src/test.c
index 8227979b..b80291fc 100755
--- a/src/test.c
+++ b/src/test.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -29,8 +29,9 @@ player_t player[MaxPlayers];
 
 void main(int argc, char *argv[])
 {
-	int i, j, k;
+	int i, j;
 	word start, end;
+	word p, k;
 	byte *pal, *pal2;
 	sword bakapee;
 
@@ -47,7 +48,7 @@ void main(int argc, char *argv[])
 	modexFadeOff(1, pal);
 	modexPalBlack();
 
-	VGAmodeX(bakapee, &gvar);
+	VGAmodeX(bakapee, 1, &gvar);
 	modexPalBlack();
 
 	IN_Startup();
@@ -70,40 +71,40 @@ void main(int argc, char *argv[])
 	/* fade in */
 	modexFadeOn(1, pal2);
 
-	i=0,k=0,j=0;
+	i=0,k=0,j=0,p=0;
 	start = *clockw;
-	while(!IN_KeyDown(sc_Escape) || i<5)
+	while(!IN_KeyDown(sc_Escape) && i<5)
 	{
 		IN_ReadControl(0,&player);
-	/* go right */
-	for(j=0; j<32; j++) {
-		gvar.video.page[0].dx++;
-		modexShowPage(&gvar.video.page[0]);
-	}
-	/* go left */
-	for(j=0; j<32; j++) {
-		gvar.video.page[0].dx--;
-		modexShowPage(&gvar.video.page[0]);
-	}
-	/* go up */
-	for(j=0; j<32; j++) {
-		gvar.video.page[0].dy++;
-		modexShowPage(&gvar.video.page[0]);
-	}
-
-	/* go down */
-	for(j=0; j<32; j++) {
-		gvar.video.page[0].dy--;
-		modexShowPage(&gvar.video.page[0]);
-	}
-// 	switch (j)
-// 	{
-// 		case 31:
-// 		case 32:
-// 			j=0;
-// 		break;
-// 	}
-	i++;
+		switch (k)
+		{
+			case 0:
+				/* go right */
+				gvar.video.page[p].dx++;
+				if(j>=32){ k++; j=0; }else j++;
+			break;
+			case 1:
+				/* go left */
+				gvar.video.page[p].dx--;
+				if(j>=32){ k++; j=0; }else j++;
+			break;
+			case 2:
+				/* go up */
+				gvar.video.page[p].dy++;
+				if(j>=32){ k++; j=0; }else j++;
+			break;
+			case 3:
+				/* go down */
+				gvar.video.page[p].dy--;
+				if(j>=32){ k=0; j=0; i++; }else j++;
+			break;
+			default:
+
+			break;
+		}
+		if(IN_KeyDown(2)) p=0;
+		if(IN_KeyDown(3)) p=1;
+		modexShowPage(&gvar.video.page[p]);
 	}
 
 	end = *clockw;
@@ -111,7 +112,10 @@ void main(int argc, char *argv[])
 	/* fade back to text mode */
 	modexFadeOff(1, pal2);
 	modexPalBlack();
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
+	IN_Shutdown();
+	printf("Project 16 test.exe. This is just a test file!\n");
+	printf("version %s\n", VERSION);
 	modexPalBlack();
 	modexFadeOn(1, pal);
 }