From 0749389d973ec92421bce00e8873dc3c8c269475 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 8 Oct 2003 19:18:46 +0000 Subject: [PATCH] disabled 'd2x keys' weapon selection --- ChangeLog | 7 ++++++- arch/sdl/joydefs.c | 31 ++++++++++++++++++++----------- main/gamecntl.c | 10 ++++++---- main/kconfig.c | 24 ++++++++++++++++++++++-- main/menu.c | 17 +++++++++++------ 5 files changed, 65 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 447b3188..58e7bfe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2003-10-08 +2003-10-08 Bradley Bell + + * arch/sdl/joydefs.c, main/gamecntl.c, main/kconfig.c, + main/menu.c: Disabled 'd2x keys' weapon selection + +2003-10-08 Martin Schaffner * main/object.h, main/multi.h: get rid of most warnings issued by cpp-precomp of gcc from Mac OS X dev tools diff --git a/arch/sdl/joydefs.c b/arch/sdl/joydefs.c index c9d62fe0..76b7b16c 100644 --- a/arch/sdl/joydefs.c +++ b/arch/sdl/joydefs.c @@ -1,4 +1,4 @@ -/* $Id: joydefs.c,v 1.6 2003-03-14 05:11:29 btb Exp $ */ +/* $Id: joydefs.c,v 1.7 2003-10-08 19:18:46 btb Exp $ */ /* * * SDL joystick support @@ -70,26 +70,33 @@ void joydef_menuset_1(int nitems, newmenu_item * items, int *last_key, int citem void joydefs_config() { newmenu_item m[13]; - int i, i1 = 5, j, nitems = 10; + int i, i1 = 5, j; +#ifdef D2X_KEYS + int nitems = 10; +#else + int nitems = 9; +#endif - m[0].type = NM_TYPE_RADIO; m[0].text = "KEYBOARD"; m[0].value = 0; m[0].group = 0; - m[1].type = NM_TYPE_RADIO; m[1].text = "JOYSTICK"; m[1].value = 0; m[1].group = 0; - m[2].type = NM_TYPE_RADIO; m[2].text = "MOUSE"; m[2].value = 0; m[2].group = 0; - m[3].type = NM_TYPE_TEXT; m[3].text=""; + m[0].type = NM_TYPE_RADIO; m[0].text = "KEYBOARD"; m[0].value = 0; m[0].group = 0; + m[1].type = NM_TYPE_RADIO; m[1].text = "JOYSTICK"; m[1].value = 0; m[1].group = 0; + m[2].type = NM_TYPE_RADIO; m[2].text = "MOUSE"; m[2].value = 0; m[2].group = 0; + m[3].type = NM_TYPE_TEXT; m[3].text = ""; m[4].type = NM_TYPE_MENU; m[4].text = TXT_CUST_ABOVE; m[5].type = NM_TYPE_TEXT; m[5].text = ""; - m[6].type = NM_TYPE_SLIDER; m[6].text = TXT_JOYS_SENSITIVITY; m[6].value = Config_joystick_sensitivity; m[6].min_value =0; m[6].max_value = 16; + m[6].type = NM_TYPE_SLIDER; m[6].text = TXT_JOYS_SENSITIVITY; m[6].value = Config_joystick_sensitivity; m[6].min_value = 0; m[6].max_value = 16; m[7].type = NM_TYPE_TEXT; m[7].text = ""; m[8].type = NM_TYPE_MENU; m[8].text = TXT_CUST_KEYBOARD; +#ifdef D2X_KEYS m[9].type = NM_TYPE_MENU; m[9].text = "CUSTOMIZE D2X KEYS"; +#endif do { i = Config_control_type; - if(i==CONTROL_MOUSE) i = 2; - m[i].value=1; + if (i == CONTROL_MOUSE) i = 2; + m[i].value = 1; - i1 = newmenu_do1( NULL, TXT_CONTROLS, nitems, m, joydef_menuset_1, i1 ); + i1 = newmenu_do1(NULL, TXT_CONTROLS, nitems, m, joydef_menuset_1, i1); Config_joystick_sensitivity = m[6].value; @@ -102,14 +109,16 @@ void joydefs_config() switch (i1) { case 4: - kconfig (i, m[i].text); + kconfig(i, m[i].text); break; case 8: kconfig(0, "KEYBOARD"); break; +#ifdef D2X_KEYS case 9: kconfig(4, "D2X KEYS"); break; +#endif } } while (i1>-1); diff --git a/main/gamecntl.c b/main/gamecntl.c index bf5fbd54..5ded7d43 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1,4 +1,4 @@ -/* $Id: gamecntl.c,v 1.19 2003-06-06 19:04:27 btb Exp $ */ +/* $Id: gamecntl.c,v 1.20 2003-10-08 19:18:46 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1539,9 +1539,11 @@ void HandleGameKey(int key) case KEY_COMMAND+KEY_F: r_framerate.value = !r_framerate.value; break; #endif -#if 0 // weapon selection handled in controls_read_all, d1x-style -// MWA changed the weapon select cases to have each case call do_weapon_select -// the macintosh keycodes aren't consecutive from 1 -- 0 on the keyboard -- boy is that STUPID!!!! +#ifndef D2X_KEYS // weapon selection handled in controls_read_all, d1x-style +// MWA changed the weapon select cases to have each case call +// do_weapon_select the macintosh keycodes aren't consecutive from 1 +// -- 0 on the keyboard -- boy is that STUPID!!!! + // Select primary or secondary weapon. case KEY_1: do_weapon_select(0 , 0); diff --git a/main/kconfig.c b/main/kconfig.c index e90df608..1e72895a 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -1,4 +1,4 @@ -/* $Id: kconfig.c,v 1.23 2003-10-04 02:58:23 btb Exp $ */ +/* $Id: kconfig.c,v 1.24 2003-10-08 19:18:46 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -346,7 +346,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: kconfig.c,v 1.23 2003-10-04 02:58:23 btb Exp $"; +static char rcsid[] = "$Id: kconfig.c,v 1.24 2003-10-08 19:18:46 btb Exp $"; #endif #ifdef WINDOWS @@ -505,9 +505,13 @@ char * key_text[256] = { \ #endif /* OGL */ #endif +#ifdef D2X_KEYS //added/removed by Victor Rachels for adding rebindable keys for these // KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0 ubyte system_keys[] = { KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_MINUS, KEY_EQUAL, KEY_PRINT_SCREEN }; +#else +ubyte system_keys[] = { KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_PRINT_SCREEN }; +#endif //extern void GameLoop(int, int ); @@ -752,6 +756,7 @@ kc_item kc_mouse[NUM_OTHER_CONTROLS] = { { 27, 25,117, 85, 26, 25, 13, 25, 13,"Afterburner", BT_MOUSE_BUTTON, 255 }, }; +#ifdef D2X_KEYS //added on 2/4/99 by Victor Rachels to add d1x new keys kc_item kc_d2x[NUM_D2X_CONTROLS] = { // id,x,y,w1,w2,u,d,l,r,text_num1,type,value @@ -787,6 +792,7 @@ kc_item kc_d2x[NUM_D2X_CONTROLS] = { //{ 27, 8,155,107, 26, 25, 0, 26, 0, "TOGGLE SEC AUTO", BT_JOY_BUTTON, 255}, }; //end this section addition - VR +#endif #else // ifndef MACINTOSH (following are macintosh controls) @@ -1278,6 +1284,7 @@ WIN(DDGRLOCK(dd_grd_curcanv)); gr_string( LHX(169), LHY(129), TXT_AXIS ); gr_string( LHX(199), LHY(129), TXT_INVERT ); } +#ifdef D2X_KEYS else if ( items == kc_d2x ) { gr_set_fontcolor( BM_XRGB(31,27,6), -1 ); @@ -1286,6 +1293,7 @@ WIN(DDGRLOCK(dd_grd_curcanv)); gr_string(LHX( 94), LHY(40), "KB"); gr_string(LHX(121), LHY(40), "JOY"); } +#endif WIN(DDGRUNLOCK(dd_grd_curcanv)); @@ -1359,12 +1367,14 @@ WIN(DDGRUNLOCK(dd_grd_curcanv)); items[i].value=default_kconfig_settings[0][i]; kc_drawitem( &items[i], 0 ); } +#ifdef D2X_KEYS } else if ( items==kc_d2x ) { for(i=0;i-1) { @@ -1240,16 +1242,19 @@ void d2x_options_menu() { switch(i) { + int n = 0; #if 0 - case 0: reorder_primary(); break; - case 1: reorder_secondary(); break; + case n++: reorder_primary(); break; + case n++: reorder_secondary(); break; #endif +#ifdef D2X_KEYS //added on 2/4/99 by Victor Rachels for new key menu - case 0: kconfig(4,"D2X Keys"); break; + case n++: kconfig(4, "D2X Keys"); break; //end this section addition - VR +#endif #if 0 //enabled 3/24/99 - Owen Evans - case 3: change_res(); break; + case n++: change_res(); break; //end enabled stuff - OE #endif } -- 2.39.2