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

diff --git a/src/test.c b/src/test.c
index 2e21e02e..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,74 +22,100 @@
 
 #include <stdio.h>
 #include "src/lib/modex16.h"
+#include "src/lib/16_in.h"
 
-void main() {
-    int i, j;
-    word start, end;
-    page_t page, page2;
-    byte *pal, *pal2=NULL;
+global_game_variables_t gvar;
+player_t player[MaxPlayers];
 
-    /* load our palette */
-    modexLoadPalFile("data/default.pal", &pal2);
+void main(int argc, char *argv[])
+{
+	int i, j;
+	word start, end;
+	word p, k;
+	byte *pal, *pal2;
+	sword bakapee;
 
-    /* save the palette */
-    pal  = modexNewPal();
-    modexPalSave(pal);
-    modexFadeOff(1, pal);
-    modexPalBlack();
+	//argument
+	if(argv[1]) bakapee = atoi(argv[1]);
+	else bakapee = 1;
 
-    modexEnter();
-    modexPalBlack();
+	/* load our palette */
+	modexLoadPalFile("data/default.pal", &pal2);
 
-    /* set up the page, but with 16 pixels on all borders in offscreen mem */
-    page=modexDefaultPage();
-    page2 = modexNextPage(&page);
-    page.width += 32;
-    page.height += 32;
+	/* save the palette */
+	pal  = modexNewPal();
+	modexPalSave(pal);
+	modexFadeOff(1, pal);
+	modexPalBlack();
 
+	VGAmodeX(bakapee, &gvar);
+	modexPalBlack();
 
-    /* fill the page with one color, but with a black border */
-    modexShowPage(&page2);
-    modexClearRegion(&page, 16, 16, SCREEN_WIDTH, SCREEN_HEIGHT, 128);
-    modexClearRegion(&page, 32, 32, SCREEN_WIDTH-32, SCREEN_HEIGHT-32, 42);
-    modexClearRegion(&page, 48, 48, SCREEN_WIDTH-64, SCREEN_HEIGHT-64, 128);
-    modexShowPage(&page);
+	IN_Startup();
+	IN_Default(0,&player,ctrl_Joystick);
 
-    /* fade in */
-    modexFadeOn(1, pal2);
+	/* 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]);
+	gvar.video.page[0].width += 32;
+	gvar.video.page[0].height += 32;
 
 
-    start = *clockw;
-    for(i=0; i<5; i++) {
-	/* go right */
-	for(j=0; j<32; j++) {
-	    page.dx++;
-	    modexShowPage(&page);
-	}
-	/* go left */
-	for(j=0; j<32; j++) {
-	    page.dx--;
-	    modexShowPage(&page);
-	}
-	/* go up */
-	for(j=0; j<32; j++) {
-	    page.dy++;
-	    modexShowPage(&page);
-	}
+	/* fill the page with one color, but with a black border */
+	modexShowPage(&gvar.video.page[1]);
+	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]);
+
+	/* fade in */
+	modexFadeOn(1, pal2);
+
+	i=0,k=0,j=0,p=0;
+	start = *clockw;
+	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++) {
-	    page.dy--;
-	    modexShowPage(&page);
+			break;
+		}
+		if(IN_KeyDown(2)) p=0;
+		if(IN_KeyDown(3)) p=1;
+		modexShowPage(&gvar.video.page[p]);
 	}
-    }
 
-    end = *clockw;
+	end = *clockw;
 
-    /* fade back to text mode */
-    modexFadeOff(1, pal2);
-    modexPalBlack();
-    modexLeave();
-    modexPalBlack();
-    modexFadeOn(1, pal);
+	/* fade back to text mode */
+	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);
 }