X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=df0af6152a78a5777d4fa77f30ee57af5a009438;hb=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;hp=21b4d325171010a37cfbc4b448516be6c86b375a;hpb=c39d09723a7375861ff2d46efc946cfee56b1c7a;p=16.git

diff --git a/src/test.c b/src/test.c
index 21b4d325..df0af615 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.
  *
@@ -22,13 +22,22 @@
 
 #include <stdio.h>
 #include "src/lib/modex16.h"
+#include "src/lib/16_in.h"
 
 global_game_variables_t gvar;
+player_t player[MaxPlayers];
 
-void main() {
+void main(int argc, char *argv[])
+{
 	int i, j;
 	word start, end;
-	byte *pal, *pal2=NULL;
+	word p, k;
+	byte *pal, *pal2;
+	sword bakapee;
+
+	//argument
+	if(argv[1]) bakapee = atoi(argv[1]);
+	else bakapee = 1;
 
 	/* load our palette */
 	modexLoadPalFile("data/default.pal", &pal2);
@@ -39,9 +48,12 @@ void main() {
 	modexFadeOff(1, pal);
 	modexPalBlack();
 
-	VGAmodeX(1, &gvar);
+	VGAmodeX(bakapee, &gvar);
 	modexPalBlack();
 
+	IN_Startup();
+	IN_Default(0,&player,ctrl_Joystick);
+
 	/* set up the page, but with 16 pixels on all borders in offscreen mem */
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
@@ -59,30 +71,40 @@ void main() {
 	/* fade in */
 	modexFadeOn(1, pal2);
 
-
+	i=0,k=0,j=0,p=0;
 	start = *clockw;
-	for(i=0; i<5; i++) {
-	/* 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]);
-	}
+	while(!IN_KeyDown(sc_Escape) && i<5)
+	{
+		IN_ReadControl(0,&player);
+		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:
 
-	/* go down */
-	for(j=0; j<32; j++) {
-		gvar.video.page[0].dy--;
-		modexShowPage(&gvar.video.page[0]);
-	}
+			break;
+		}
+		if(IN_KeyDown(2)) p=0;
+		if(IN_KeyDown(3)) p=1;
+		modexShowPage(&gvar.video.page[p]);
 	}
 
 	end = *clockw;
@@ -91,6 +113,9 @@ void main() {
 	modexFadeOff(1, pal2);
 	modexPalBlack();
 	VGAmodeX(0, &gvar);
+	IN_Shutdown();
+	printf("Project 16 test.exe. This is just a test file!\n");
+	printf("version %s\n", VERSION);
 	modexPalBlack();
 	modexFadeOn(1, pal);
 }