going to work on this later ww

[16.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 1f9a4322bbb5c305bfac4954b8bd8843dc73b134..21b4d325171010a37cfbc4b448516be6c86b375a 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -28,7 +28,6 @@ global_game_variables_t gvar;
 void main() {\r
        int i, j;\r
        word start, end;\r
-       page_t page, page2;\r
        byte *pal, *pal2=NULL;\r
 \r
        /* load our palette */\r
@@ -44,18 +43,18 @@ void main() {
        modexPalBlack();\r
 \r
        /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
-       page=modexDefaultPage();\r
-       page2 = modexNextPage(&page);\r
-       page.width += 32;\r
-       page.height += 32;\r
+       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+       gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
+       gvar.video.page[0].width += 32;\r
+       gvar.video.page[0].height += 32;\r
 \r
 \r
        /* fill the page with one color, but with a black border */\r
-       modexShowPage(&page2);\r
-       modexClearRegion(&page, 16, 16, SCREEN_WIDTH, SCREEN_HEIGHT, 128);\r
-       modexClearRegion(&page, 32, 32, SCREEN_WIDTH-32, SCREEN_HEIGHT-32, 42);\r
-       modexClearRegion(&page, 48, 48, SCREEN_WIDTH-64, SCREEN_HEIGHT-64, 128);\r
-       modexShowPage(&page);\r
+       modexShowPage(&gvar.video.page[1]);\r
+       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);\r
+       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);\r
+       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);\r
+       modexShowPage(&gvar.video.page[0]);\r
 \r
        /* fade in */\r
        modexFadeOn(1, pal2);\r
@@ -65,24 +64,24 @@ void main() {
        for(i=0; i<5; i++) {\r
        /* go right */\r
        for(j=0; j<32; j++) {\r
-               page.dx++;\r
-               modexShowPage(&page);\r
+               gvar.video.page[0].dx++;\r
+               modexShowPage(&gvar.video.page[0]);\r
        }\r
        /* go left */\r
        for(j=0; j<32; j++) {\r
-               page.dx--;\r
-               modexShowPage(&page);\r
+               gvar.video.page[0].dx--;\r
+               modexShowPage(&gvar.video.page[0]);\r
        }\r
        /* go up */\r
        for(j=0; j<32; j++) {\r
-               page.dy++;\r
-               modexShowPage(&page);\r
+               gvar.video.page[0].dy++;\r
+               modexShowPage(&gvar.video.page[0]);\r
        }\r
 \r
        /* go down */\r
        for(j=0; j<32; j++) {\r
-               page.dy--;\r
-               modexShowPage(&page);\r
+               gvar.video.page[0].dy--;\r
+               modexShowPage(&gvar.video.page[0]);\r
        }\r
        }\r
 \r