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

diff --git a/src/test.c b/src/test.c
index 2e21e02e..21b4d325 100755
--- a/src/test.c
+++ b/src/test.c
@@ -23,73 +23,74 @@
 #include <stdio.h>
 #include "src/lib/modex16.h"
 
+global_game_variables_t gvar;
+
 void main() {
-    int i, j;
-    word start, end;
-    page_t page, page2;
-    byte *pal, *pal2=NULL;
+	int i, j;
+	word start, end;
+	byte *pal, *pal2=NULL;
 
-    /* load our palette */
-    modexLoadPalFile("data/default.pal", &pal2);
+	/* load our palette */
+	modexLoadPalFile("data/default.pal", &pal2);
 
-    /* save the palette */
-    pal  = modexNewPal();
-    modexPalSave(pal);
-    modexFadeOff(1, pal);
-    modexPalBlack();
+	/* save the palette */
+	pal  = modexNewPal();
+	modexPalSave(pal);
+	modexFadeOff(1, pal);
+	modexPalBlack();
 
-    modexEnter();
-    modexPalBlack();
+	VGAmodeX(1, &gvar);
+	modexPalBlack();
 
-    /* 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;
+	/* 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;
 
 
-    /* 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);
+	/* 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);
+	/* fade in */
+	modexFadeOn(1, pal2);
 
 
-    start = *clockw;
-    for(i=0; i<5; i++) {
+	start = *clockw;
+	for(i=0; i<5; i++) {
 	/* go right */
 	for(j=0; j<32; j++) {
-	    page.dx++;
-	    modexShowPage(&page);
+		gvar.video.page[0].dx++;
+		modexShowPage(&gvar.video.page[0]);
 	}
 	/* go left */
 	for(j=0; j<32; j++) {
-	    page.dx--;
-	    modexShowPage(&page);
+		gvar.video.page[0].dx--;
+		modexShowPage(&gvar.video.page[0]);
 	}
 	/* go up */
 	for(j=0; j<32; j++) {
-	    page.dy++;
-	    modexShowPage(&page);
+		gvar.video.page[0].dy++;
+		modexShowPage(&gvar.video.page[0]);
 	}
 
 	/* go down */
 	for(j=0; j<32; j++) {
-	    page.dy--;
-	    modexShowPage(&page);
+		gvar.video.page[0].dy--;
+		modexShowPage(&gvar.video.page[0]);
+	}
 	}
-    }
 
-    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);
+	modexPalBlack();
+	modexFadeOn(1, pal);
 }