Merge remote-tracking branch 'upstream/master'

[16.git] / src / 16.c

diff --git a/src/16.c b/src/16.c
index 154714deb2d165cff2d7640af2c29aa51836c6c3..10aad071ee088930de3f96cfc7ff7599e8d325ae 100755 (executable)
--- a/src/16.c
+++ b/src/16.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
@@ -27,14 +27,13 @@ engi_stat_t engi_stat;
 const char *cpus;\r
 byte *dpal, *gpal;\r
 player_t player[MaxPlayers];\r
-page_t screen;\r
+//page_t screen;\r
 \r
 void\r
 main(int argc, char *argv[])\r
 {\r
        //screen = modexDefaultPage();\r
        engi_stat = ENGI_RUN;\r
-       gvar.clock_start=*clockdw;\r
        //textInit();\r
 \r
        /* save the palette */\r
@@ -50,13 +49,11 @@ main(int argc, char *argv[])
        modexPalBlack();        //so player will not see loadings~\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
-       //modexprint(&screen, 32, 32, 1, 2, 0, "a");\r
+       //modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);\r
        while(ENGI_EXIT != engi_stat)\r
        {\r
                IN_ReadControl(0,&player);\r
                if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;\r
-               shinku(&screen, &gvar);\r
-               gvar.tiku++;\r
        }\r
        switch(detectcpu())\r
        {\r