From 7c9fde37800860c847f9b768d94298f34c4b7a02 Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Thu, 18 Jan 2007 15:19:45 +0000 Subject: [PATCH] prevent changing weapons if automap is active --- dxx-changelog.txt | 1 + main/kconfig.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dxx-changelog.txt b/dxx-changelog.txt index f559bca38..074a6dbe8 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -4,6 +4,7 @@ D2X-Rebirth Changelog -------- main/gauges.c: draw bomb count correctly in CM_FULL_SCREEN ... finally main/laser.c: made Omega selectable even if it has no energy left and can't fire +main/kconfig.c: prevent changing weapons if automap is active 20070117 -------- diff --git a/main/kconfig.c b/main/kconfig.c index 3fc8e6422..e3aa12dc6 100755 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -206,6 +206,7 @@ ubyte Config_mouse_sensitivity = 8; fix Cruise_speed=0; int mouselook=0; +extern int Automap_flag; // macros for drawing lo/hi res kconfig screens (see scores.c as well) @@ -2845,31 +2846,31 @@ void controls_read_all() if(key_down_count(kc_d2x[0].value) || (joy_get_button_state(kc_d2x[1].value) && (d2x_joystick_state[0]!=d2x_joystick_ostate[0]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[0].value >= 2 && kc_d2x[0].value <= 11))) // this (and the following statements) prevents to select weapon if guide-bot shortcut has done and weapon key is mapped from 0 to 9 + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[0].value >= 2 && kc_d2x[0].value <= 11)) && !Automap_flag) // this (and the following statements) prevents to select weapon if guide-bot shortcut has done and weapon key is mapped from 0 to 9 or Automap is active do_weapon_select(0,0); //----------------Weapon 2---------------- if(key_down_count(kc_d2x[2].value) || (joy_get_button_state(kc_d2x[3].value) && (d2x_joystick_state[1]!=d2x_joystick_ostate[1]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[2].value >= 2 && kc_d2x[2].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[2].value >= 2 && kc_d2x[2].value <= 11)) && !Automap_flag) do_weapon_select(1,0); //----------------Weapon 3---------------- if(key_down_count(kc_d2x[4].value) || (joy_get_button_state(kc_d2x[5].value) && (d2x_joystick_state[2]!=d2x_joystick_ostate[2]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[4].value >= 2 && kc_d2x[4].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[4].value >= 2 && kc_d2x[4].value <= 11)) && !Automap_flag) do_weapon_select(2,0); //----------------Weapon 4---------------- if(key_down_count(kc_d2x[6].value) || (joy_get_button_state(kc_d2x[7].value) && (d2x_joystick_state[3]!=d2x_joystick_ostate[3]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[6].value >= 2 && kc_d2x[6].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[6].value >= 2 && kc_d2x[6].value <= 11)) && !Automap_flag) do_weapon_select(3,0); //----------------Weapon 5---------------- if(key_down_count(kc_d2x[8].value) || (joy_get_button_state(kc_d2x[9].value) && (d2x_joystick_state[4]!=d2x_joystick_ostate[4]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[8].value >= 2 && kc_d2x[8].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[8].value >= 2 && kc_d2x[8].value <= 11)) && !Automap_flag) do_weapon_select(4,0); //--------- Read secondary weapon select ---------- @@ -2877,31 +2878,31 @@ void controls_read_all() if(key_down_count(kc_d2x[10].value) || (joy_get_button_state(kc_d2x[11].value) && (d2x_joystick_state[5]!=d2x_joystick_ostate[5]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[10].value >= 2 && kc_d2x[10].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[10].value >= 2 && kc_d2x[10].value <= 11)) && !Automap_flag) do_weapon_select(0,1); //----------------Weapon 7---------------- if(key_down_count(kc_d2x[12].value) || (joy_get_button_state(kc_d2x[13].value) && (d2x_joystick_state[6]!=d2x_joystick_ostate[6]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[12].value >= 2 && kc_d2x[12].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[12].value >= 2 && kc_d2x[12].value <= 11)) && !Automap_flag) do_weapon_select(1,1); //----------------Weapon 8---------------- if(key_down_count(kc_d2x[14].value) || (joy_get_button_state(kc_d2x[15].value) && (d2x_joystick_state[7]!=d2x_joystick_ostate[7]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[14].value >= 2 && kc_d2x[14].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[14].value >= 2 && kc_d2x[14].value <= 11)) && !Automap_flag) do_weapon_select(2,1); //----------------Weapon 9---------------- if(key_down_count(kc_d2x[16].value) || (joy_get_button_state(kc_d2x[17].value) && (d2x_joystick_state[8]!=d2x_joystick_ostate[8]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[16].value >= 2 && kc_d2x[16].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[16].value >= 2 && kc_d2x[16].value <= 11)) && !Automap_flag) do_weapon_select(3,1); //----------------Weapon 0---------------- if(key_down_count(kc_d2x[18].value) || (joy_get_button_state(kc_d2x[19].value) && (d2x_joystick_state[9]!=d2x_joystick_ostate[9]) ) ) - if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[18].value >= 2 && kc_d2x[18].value <= 11))) + if (!((keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) && (kc_d2x[18].value >= 2 && kc_d2x[18].value <= 11)) && !Automap_flag) do_weapon_select(4,1); memcpy(d2x_joystick_ostate,d2x_joystick_state,10*sizeof(int)); }