Menu
▾
▴
[Timewarp-commit] source/melee mcontrol.cpp, 1.32, 1.33 mcontrol.h, 1.14, 1.15 mframe.cpp, 1.51, 1.52 moptions.cpp, 1.20, 1.21 mship.cpp, 1.46, 1.47
|
From: Rob <geo...@us...> - 2006-06-02 13:38:30
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source/melee Modified Files: mcontrol.cpp mcontrol.h mframe.cpp moptions.cpp mship.cpp Log Message: Index: moptions.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** moptions.cpp 2 Jun 2006 08:30:30 -0000 1.20 --- moptions.cpp 2 Jun 2006 13:38:22 -0000 1.21 *************** *** 10,13 **** --- 10,15 ---- #include "../scp.h" #include "../gui.h" + #include "../menu/editkeys.h" + #include "../menu/menugeneral.h" #include "../util/aastr.h" *************** *** 61,64 **** --- 63,67 ---- DIALOG_OPTIONS_AUDIO, DIALOG_OPTIONS_CONFIG, + DIALOG_OPTIONS_CONFIGKEYS, DIALOG_OPTIONS_KEYJAMTEST }; *************** *** 70,74 **** { my_d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, { my_d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! { my_d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Keyjam test", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } --- 73,78 ---- { my_d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, { my_d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! { my_d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Configure keys", NULL, NULL }, ! { my_d_button_proc, 50, 250, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Keyjam test", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } *************** *** 98,101 **** --- 102,111 ---- break; + case DIALOG_OPTIONS_CONFIGKEYS: + showTitle(); + ControlHuman_setup(0); + showTitle(); + break; + case DIALOG_OPTIONS_KEYJAMTEST: keyjamming_tester(); Index: mcontrol.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mcontrol.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mcontrol.h 23 Aug 2005 22:20:16 -0000 1.14 --- mcontrol.h 2 Jun 2006 13:38:22 -0000 1.15 *************** *** 38,42 **** KeyCode keys; /*! \brief name of instance */ ! char *iname; SpaceObject *target; int index; --- 38,42 ---- KeyCode keys; /*! \brief name of instance */ ! // char *iname; SpaceObject *target; int index; *************** *** 70,80 **** virtual const char *getTypeName() = 0; /*! \brief returns the description of the control, like "NetworkGame(local)_Keyboard0" */ ! virtual char *getDescription(); /*! \brief the constructor initializes ship to NULL */ Control (const char *name, int channel) ; /*! \brief the destructor, which is rarely used */ virtual ~Control () ; - /*! called by the GUI stuff to setup the controls (calibrate Joystick, set keys, etc.) */ - virtual void setup(); virtual void set_target(int i); virtual void target_stuff(); --- 70,78 ---- virtual const char *getTypeName() = 0; /*! \brief returns the description of the control, like "NetworkGame(local)_Keyboard0" */ ! // virtual char *getDescription(); /*! \brief the constructor initializes ship to NULL */ Control (const char *name, int channel) ; /*! \brief the destructor, which is rarely used */ virtual ~Control () ; virtual void set_target(int i); virtual void target_stuff(); Index: mship.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** mship.cpp 29 Jan 2006 16:14:34 -0000 1.46 --- mship.cpp 2 Jun 2006 13:38:22 -0000 1.47 *************** *** 29,33 **** #include "mview.h" - #include "ais/ext_ai.h" /*------------------------------* --- 29,32 ---- Index: mcontrol.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mcontrol.cpp 2 Jun 2006 08:30:30 -0000 1.32 --- mcontrol.cpp 2 Jun 2006 13:38:22 -0000 1.33 *************** *** 104,108 **** } */ ! void Control::setup() {} void Control::select_ship(Ship* ship_pointer, const char* ship_name) {STACKTRACE; ship = ship_pointer; --- 104,108 ---- } */ ! void Control::select_ship(Ship* ship_pointer, const char* ship_name) {STACKTRACE; ship = ship_pointer; *************** *** 475,481 **** return 0; } ! char *Control::getDescription() {STACKTRACE; ! return iname; ! } void Control::_event(Event *e) {STACKTRACE; //add code for lag increase / decrease here --- 475,481 ---- return 0; } ! //char *Control::getDescription() {STACKTRACE; ! // return iname; ! // } void Control::_event(Event *e) {STACKTRACE; //add code for lag increase / decrease here *************** *** 508,512 **** } } ! iname = strdup(name); auto_update = true; // for bots. --- 508,512 ---- } } ! // iname = strdup(name); auto_update = true; // for bots. Index: mframe.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mframe.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** mframe.cpp 22 Apr 2006 09:24:53 -0000 1.51 --- mframe.cpp 2 Jun 2006 13:38:22 -0000 1.52 *************** *** 17,21 **** #include "mcbodies.h" - #include "ais/ext_ai.h" #include "scp.h" --- 17,20 ---- |
