[Timewarp-commit] source ais.h,1.14,1.15

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source

Modified Files:
	ais.h 
Log Message:


Index: ais.h
===================================================================
RCS file: /cvsroot/timewarp/source/ais.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ais.h	16 Mar 2006 16:10:32 -0000	1.14
--- ais.h	2 Jun 2006 13:38:21 -0000	1.15
***************
*** 11,25 ****
  const int MAX_OPTIONS  = 1024;
  
! 
! //ais/c_input.cpp
! /*! \brief Human Ship Control */
! class ControlHuman : public Control
! {	
! 	private:
! 	bool toggle_cruise_thrust_press;
! 
  	int thrust;
- 	bool cruise_control_thrust;
- 
  	int left;
  	int right;
--- 11,17 ----
  const int MAX_OPTIONS  = 1024;
  
! struct player_keys
! {
  	int thrust;
  	int left;
  	int right;
***************
*** 33,36 ****
--- 25,45 ----
  	int extra1, extra2, communicate, dec_lag, inc_lag;
  	int suicide;
+ };
+ 
+ typedef enum {key_load=1, key_write} KEY_EDIT_OPTION;
+ void player_keys_load_write (player_keys *keys, const char *inifile, const char *inisection, KEY_EDIT_OPTION localoption);
+ 
+ 
+ //ais/c_input.cpp
+ /*! \brief Human Ship Control */
+ class ControlHuman : public Control
+ {	
+ 	private:
+ 	bool toggle_cruise_thrust_press;
+ 
+ 	bool cruise_control_thrust;
+ 
+ 	player_keys userkeys;
+ 
  	public:
  	virtual void load(const char* inifile, const char* inisection);
***************
*** 39,43 ****
  	virtual int think();
  	ControlHuman (const char *name, int channel) ;
- 	virtual void setup();
  	};
  
--- 48,51 ----