updated copyleft and need to test and fix newer version of open watcom

[proj16/16.git] / src / 16.c

diff --git a/src/16.c b/src/16.c
index b0ca840..d2a9f86 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -26,9 +26,7 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       Startup16(&gvar);\r
-\r
-       gvar.engi_stat = ENGI_RUN;\r
+       Startup16(&gvar);//initgame equ\r
 \r
        /* save the palette */\r
        modexPalSave(gvar.video.dpal);\r
@@ -37,12 +35,12 @@ main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", gvar.video.palette);\r
        VGAmodeX(1, 1, &gvar);\r
 //     modexPalBlack();        //so player will not see loadings~\r
-       IN_Default(0,&gvar.player[0],ctrl_Joystick);\r
+       IN_Default(0,&gvar.player[0],ctrl_Joystick, &gvar);\r
        //modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);\r
-       while(ENGI_QUIT != gvar.engi_stat)\r
+       while(1)\r
        {\r
-               IN_ReadControl(&gvar.player[0]);\r
-               if(IN_KeyDown(sc_Escape)) gvar.engi_stat = ENGI_QUIT;\r
+               IN_ReadControl(&gvar.player[0], &gvar);\r
+               if(gvar.in.inst->Keyboard[sc_Escape]) break;\r
                shinku(&gvar);\r
                _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
        }\r
@@ -52,4 +50,10 @@ main(int argc, char *argv[])
        printf("version %s\n", VERSION);\r
        WCPU_cpufpumesg();\r
        modexFadeOn(4, gvar.video.dpal);\r
+//     InitGame ();//to be defined in 16_tail\r
+\r
+//++++ DemoLoop();//to be defined in 16_tail\r
+\r
+//++++ Quit(&gvar, "Demo loop exited???");\r
+\r
 }\r