polished 16_vrs.h and put into make file AND! updated copyright to add yakui lover...

[16.git] / src / 16.c

diff --git a/src/16.c b/src/16.c
index 27c17a58c57641cb14d8324a26b040567f53b8d0..5e5124224ff0722d4553fbfaeecb4536927b5646 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -27,7 +27,6 @@ engi_stat_t engi_stat;
 const char *cpus;\r
 byte *dpal, *gpal;\r
 player_t player[MaxPlayers];\r
-//page_t screen;\r
 \r
 void\r
 main(int argc, char *argv[])\r
@@ -53,28 +52,35 @@ main(int argc, char *argv[])
                return;\r
        }\r
 \r
-       //screen = modexDefaultPage();\r
+       if (_DEBUG_INIT() == 0) {\r
+#ifdef DEBUGSERIAL\r
+               printf("WARNING: Failed to initialize DEBUG output\n");\r
+#endif\r
+       }\r
+       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
+       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
+\r
        engi_stat = ENGI_RUN;\r
-       //textInit();\r
+       textInit();\r
 \r
        /* save the palette */\r
        dpal = modexNewPal();\r
        modexPalSave(dpal);\r
        modexFadeOff(4, dpal);\r
-       //printf("pal load\n");\r
-       //gpal = modexNewPal();\r
-       /*modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);*/\r
-       printf("wwww loop wwww\n");\r
+       gpal = modexNewPal();\r
+       modexPalSave(gpal);\r
+       modexSavePalFile("data/g.pal", gpal);\r
        VGAmodeX(1, 1, &gvar);\r
-       modexPalBlack();        //so player will not see loadings~\r
+//     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", 1);\r
+       start_timer(&gvar);\r
        while(ENGI_EXIT != engi_stat)\r
        {\r
                IN_ReadControl(0,&player);\r
                if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;\r
+               shinku(&gvar);\r
        }\r
        switch(detectcpu())\r
        {\r