Merge remote-tracking branch 'upstream/master'

[16.git] / src / test.c

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