[16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_tdef.h

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index d7350bb29934b8f235ddac109251ec40235a15d5..e9f19bbd9524c4aba2efb3750c5ffd676a0eaddc 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -287,27 +287,32 @@ typedef   struct          {
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
 \r
-/*typedef struct// inconfig\r
-{\r
-       boolean         IN_Started;\r
+typedef struct instat {\r
        boolean         CapsLock;\r
        ScanCode        CurCode,LastCode;\r
+\r
+       boolean         Keyboard[NumCodes];\r
+       boolean         Paused;\r
+       char            LastASCII;\r
+       ScanCode        LastScan;\r
+} inst_t;\r
+\r
+typedef struct// inconfig\r
+{\r
+       boolean         IN_Started;\r
 //\r
 // configuration variables\r
 //\r
-       boolean         Keyboard[NumCodes],\r
-                                       JoysPresent[MaxJoys],\r
+       boolean         JoysPresent[MaxJoys],\r
                                        MousePresent,\r
                                        JoyPadPresent;\r
 \r
 //     Global variables\r
-       boolean         Paused;\r
-       char            LastASCII;\r
-       ScanCode        LastScan;\r
-\r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-} in_info_t;*/\r
+       //struct        instat  *inst;\r
+       inst_t  *inst;\r
+} in_info_t;\r
 \r
 //==========================================================================\r
 \r
@@ -637,24 +642,24 @@ typedef struct    //TODO: USE THIS!!!!
 //==========================================================================\r
 \r
 //actual global game varables!\r
-typedef enum {\r
+/*typedef enum {\r
        ENGI_QUIT,\r
        ENGI_RUN,\r
        ENGI_MENU,\r
        ENGI_PAUSE\r
-} engi_stat_t;\r
+} engi_stat_t;*/\r
 //ENGI_INPUT,\r
 \r
 typedef struct\r
 {\r
-       engi_stat_t     engi_stat;\r
+//---- engi_stat_t     engi_stat;\r
        video_t video;  // video settings variable\r
        ca_t            ca;     // ca stuff\r
        pm_t            pm;     // pm stuff\r
        loghandle_t     handle; //handles for file logging\r
        kurokku_t       kurokku;        //clock struct\r
        mminfo_t        mm; mminfotype  mmi;    // mm stuff\r
-//++++ in_info_t       in;             // 16_in info\r
+       in_info_t       in;             // 16_in info\r
        player_t        player[MaxPlayers];     // player vars\r
        map_view_t      mv[4];\r
 } global_game_variables_t;\r