engi stuff moved to tdef and textinit is in startup16

[16.git] / src / 16.c

diff --git a/src/16.c b/src/16.c
index 5ee40aa99c7505274a26be3895d0735b6f0d0686..8ef4d904a17166c41b7990365d82415b5bb37f37 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\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -22,38 +22,36 @@
 \r
 #include "src/16.h"\r
 \r
-global_game_variables_t gvar;\r
 engi_stat_t engi_stat;\r
 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
 {\r
-       //screen = modexDefaultPage();\r
+       static global_game_variables_t gvar;\r
+       Startup16(&gvar);\r
+\r
        engi_stat = ENGI_RUN;\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
-       VGAmodeX(1, &gvar);\r
-       modexPalBlack();        //so player will not see loadings~\r
-       IN_Startup();\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
        IN_Default(0,&player,ctrl_Joystick);\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(&gvar);\r
+               _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
        }\r
        switch(detectcpu())\r
        {\r
@@ -62,10 +60,10 @@ main(int argc, char *argv[])
                case 2: cpus = "386 or newer"; break;\r
                default: cpus = "internal error"; break;\r
        }\r
-       VGAmodeX(0, &gvar);\r
+       Shutdown16(&gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
        printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");\r
        printf("version %s\n", VERSION);\r
        printf("detected CPU type: %s\n", cpus);\r
-       IN_Shutdown();\r
        modexFadeOn(4, dpal);\r
 }\r