X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=e9f19bbd9524c4aba2efb3750c5ffd676a0eaddc;hb=52fab2ff9ef6a39ed9303b0df1ce0ad9c9180ef1;hp=d7350bb29934b8f235ddac109251ec40235a15d5;hpb=26536b16d4825df06a4e73380985afb3a0bfb7e4;p=16.git

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