From 96e44c21bc21309870a309d18cbae836e091d029 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 6 Sep 2010 20:16:44 +0300 Subject: [PATCH] Correct button name --- data/qcsrc/server/bot/bot.qc | 2 +- data/qcsrc/server/bot/havocbot/havocbot.qc | 6 +++--- data/qcsrc/server/bot/scripting.qc | 6 +++--- data/qcsrc/server/cl_client.qc | 2 +- data/qcsrc/server/cl_physics.qc | 10 +++++----- data/qcsrc/server/defs.qh | 2 +- data/qcsrc/server/g_grabber.qc | 10 +++++----- data/qcsrc/server/g_world.qc | 2 +- data/qcsrc/server/playerdemo.qc | 2 +- data/qcsrc/server/t_quake.qc | 2 +- data/qcsrc/server/w_grabber.qc | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/qcsrc/server/bot/bot.qc b/data/qcsrc/server/bot/bot.qc index e67d89f3..de6bed13 100644 --- a/data/qcsrc/server/bot/bot.qc +++ b/data/qcsrc/server/bot/bot.qc @@ -75,7 +75,7 @@ void bot_think() self.BUTTON_ATCK2 = 0; self.BUTTON_ZOOM = 0; self.BUTTON_CROUCH = 0; - self.BUTTON_GRABBER = 0; + self.BUTTON_JETPACK = 0; self.BUTTON_INFO = 0; self.button8 = 0; self.BUTTON_CHAT = 0; diff --git a/data/qcsrc/server/bot/havocbot/havocbot.qc b/data/qcsrc/server/bot/havocbot/havocbot.qc index ae03fac2..12287191 100644 --- a/data/qcsrc/server/bot/havocbot/havocbot.qc +++ b/data/qcsrc/server/bot/havocbot/havocbot.qc @@ -439,7 +439,7 @@ void havocbot_movetogoal() } // Flying - self.BUTTON_GRABBER = TRUE; + self.BUTTON_JETPACK = TRUE; if(self.navigation_jetpack_point_z - PL_MAX_z + PL_MIN_z < self.origin_z) { self.movement_x = dir * v_forward * maxspeed; @@ -525,11 +525,11 @@ void havocbot_movetogoal() { if(self.velocity_z<0) { - self.BUTTON_GRABBER = TRUE; + self.BUTTON_JETPACK = TRUE; } } else - self.BUTTON_GRABBER = TRUE; + self.BUTTON_JETPACK = TRUE; // If there is no goal try to move forward diff --git a/data/qcsrc/server/bot/scripting.qc b/data/qcsrc/server/bot/scripting.qc index b92badcd..1628641e 100644 --- a/data/qcsrc/server/bot/scripting.qc +++ b/data/qcsrc/server/bot/scripting.qc @@ -863,7 +863,7 @@ float bot_presskeys() self.BUTTON_ATCK = FALSE; self.BUTTON_ATCK2 = FALSE; self.BUTTON_USE = FALSE; - self.BUTTON_GRABBER = FALSE; + self.BUTTON_JETPACK = FALSE; self.BUTTON_CHAT = FALSE; self.BUTTON_DIGEST = FALSE; self.BUTTON_REGURGITATE = FALSE; @@ -897,7 +897,7 @@ float bot_presskeys() self.BUTTON_USE = TRUE; if(self.bot_cmd_keys & BOT_CMD_KEY_GRABBER) - self.BUTTON_GRABBER = TRUE; + self.BUTTON_JETPACK = TRUE; if(self.bot_cmd_keys & BOT_CMD_KEY_CHAT) self.BUTTON_CHAT = TRUE; @@ -1033,7 +1033,7 @@ float bot_cmd_pause() self.BUTTON_USE = 0; self.BUTTON_ATCK = 0; self.BUTTON_JUMP = 0; - self.BUTTON_GRABBER = 0; + self.BUTTON_JETPACK = 0; self.BUTTON_CHAT = 0; self.BUTTON_ATCK2 = 0; self.BUTTON_CROUCH = 0; diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 11cf27c7..9f5eb15f 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -2417,7 +2417,7 @@ void PlayerPreThink (void) { if(frametime) player_anim(); - button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_GRABBER || self.BUTTON_USE); + button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_JETPACK || self.BUTTON_USE); force_respawn = (g_lms || (g_ca) || cvar("g_forced_respawn")); if (self.deadflag == DEAD_DYING) { diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 1634961d..7c5c9b14 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -585,7 +585,7 @@ void SV_PlayerPhysics() anticheat_physics(); - buttons = self.BUTTON_ATCK + 2 * self.BUTTON_JUMP + 4 * self.BUTTON_ATCK2 + 8 * self.BUTTON_ZOOM + 16 * self.BUTTON_CROUCH + 32 * self.BUTTON_GRABBER + 64 * self.BUTTON_USE + 128 * (self.movement_x < 0) + 256 * (self.movement_x > 0) + 512 * (self.movement_y < 0) + 1024 * (self.movement_y > 0); + buttons = self.BUTTON_ATCK + 2 * self.BUTTON_JUMP + 4 * self.BUTTON_ATCK2 + 8 * self.BUTTON_ZOOM + 16 * self.BUTTON_CROUCH + 32 * self.BUTTON_JETPACK + 64 * self.BUTTON_USE + 128 * (self.movement_x < 0) + 256 * (self.movement_x > 0) + 512 * (self.movement_y < 0) + 1024 * (self.movement_y > 0); if(!buttons) c = "x"; @@ -632,7 +632,7 @@ void SV_PlayerPhysics() { // slight annoyance for nick change scripts self.movement = -1 * self.movement; - self.BUTTON_ATCK = self.BUTTON_JUMP = self.BUTTON_ATCK2 = self.BUTTON_ZOOM = self.BUTTON_CROUCH = self.BUTTON_GRABBER = self.BUTTON_USE = 0; + self.BUTTON_ATCK = self.BUTTON_JUMP = self.BUTTON_ATCK2 = self.BUTTON_ZOOM = self.BUTTON_CROUCH = self.BUTTON_JETPACK = self.BUTTON_USE = 0; if(self.nickspamcount >= cvar("g_nick_flood_penalty_red")) // if you are persistent and the slight annoyance above does not stop you, I'll show you! { @@ -902,7 +902,7 @@ void SV_PlayerPhysics() PM_Accelerate(wishdir, wishspeed, wishspeed, sv_accelerate*maxspd_mod, 1, 0); } } - else if ((self.items & IT_JETPACK) && self.BUTTON_GRABBER && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO)) + else if ((self.items & IT_JETPACK) && self.BUTTON_JETPACK && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO)) { //makevectors(self.v_angle_y * '0 1 0'); makevectors(self.v_angle); @@ -1004,7 +1004,7 @@ void SV_PlayerPhysics() else if (self.flags & FL_ONGROUND) { // we get here if we ran out of ammo - if((self.items & IT_JETPACK) && self.BUTTON_GRABBER && !(buttons_prev & 32)) + if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32)) sprint(self, "You don't have any fuel for the ^2Jetpack\n"); // walking @@ -1065,7 +1065,7 @@ void SV_PlayerPhysics() { float wishspeed0; // we get here if we ran out of ammo - if((self.items & IT_JETPACK) && self.BUTTON_GRABBER && !(buttons_prev & 32)) + if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32)) sprint(self, "You don't have any fuel for the ^2Jetpack\n"); if(maxspd_mod < 1) diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 0e2bce89..c3b0e830 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -7,7 +7,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa #define BUTTON_ATCK2 button3 #define BUTTON_ZOOM button4 #define BUTTON_CROUCH button5 -#define BUTTON_GRABBER button6 +#define BUTTON_JETPACK button6 #define BUTTON_INFO button7 #define BUTTON_CHAT buttonchat #define BUTTON_USE buttonuse diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc index 5202c1ce..dee5461c 100644 --- a/data/qcsrc/server/g_grabber.qc +++ b/data/qcsrc/server/g_grabber.qc @@ -327,7 +327,7 @@ void FireGrabber (void) // voidGrabberFrame() // { // // this function has been modified for Voretournament -// - if (self.BUTTON_GRABBER && g_grabber) +// - if (self.BUTTON_JETPACK && g_grabber) // { // - if (!self.grabber && self.grabber_time <= time && !self.button6_pressed_before) // - if (timeoutStatus != 2) //only allow the player to fire the grabber if the game is not paused (timeout) @@ -338,7 +338,7 @@ void FireGrabber (void) // if (self.grabber) // RemoveGrabber(self); // } -// - self.button6_pressed_before = self.BUTTON_GRABBER; +// - self.button6_pressed_before = self.BUTTON_JETPACK; // /* // // if I have no grabber or it's not pulling yet, make sure I'm not flying! // if((self.grabber == world || !self.grabber.state) && self.movetype == MOVETYPE_FLY) @@ -348,7 +348,7 @@ void GrabberFrame() if(timeoutStatus != 2 && self.weapon != WEP_GRABBER) { // offhand grabber controls - if(self.BUTTON_GRABBER) + if(self.BUTTON_JETPACK) { if not(self.grabber || (self.grabber_state & GRABBER_WAITING_FOR_RELEASE)) { @@ -376,10 +376,10 @@ void GrabberFrame() } else if(!(self.items & IT_JETPACK) && self.switchweapon != WEP_GRABBER) { - if(self.BUTTON_GRABBER && !self.grabber_switchweapon) + if(self.BUTTON_JETPACK && !self.grabber_switchweapon) W_SwitchWeapon(WEP_GRABBER); } - self.grabber_switchweapon = self.BUTTON_GRABBER; + self.grabber_switchweapon = self.BUTTON_JETPACK; if(self.weapon != WEP_GRABBER) { diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 0355a36a..d06624c2 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -1156,7 +1156,7 @@ void IntermissionThink() return; if(!mapvote_initialized) - if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_GRABBER && !self.BUTTON_USE) + if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_JETPACK && !self.BUTTON_USE) return; MapVote_Start(); diff --git a/data/qcsrc/server/playerdemo.qc b/data/qcsrc/server/playerdemo.qc index 12016f69..90882f0a 100644 --- a/data/qcsrc/server/playerdemo.qc +++ b/data/qcsrc/server/playerdemo.qc @@ -55,7 +55,7 @@ void playerdemo_open_write(string f) PLAYERDEMO_FIELD(func,float,BUTTON_ATCK) \ PLAYERDEMO_FIELD(func,float,BUTTON_ATCK2) \ PLAYERDEMO_FIELD(func,float,BUTTON_CROUCH) \ - PLAYERDEMO_FIELD(func,float,BUTTON_GRABBER) \ + PLAYERDEMO_FIELD(func,float,BUTTON_JETPACK) \ PLAYERDEMO_FIELD(func,float,BUTTON_USE) \ PLAYERDEMO_FIELD(func,float,flags) \ // end of list diff --git a/data/qcsrc/server/t_quake.qc b/data/qcsrc/server/t_quake.qc index 619b6f0c..b917287c 100644 --- a/data/qcsrc/server/t_quake.qc +++ b/data/qcsrc/server/t_quake.qc @@ -22,7 +22,7 @@ void junk_function () self.exteriormodeltoclient = world; self.glow_trail = 0; self.tag_entity = world; - self.BUTTON_GRABBER = 0; + self.BUTTON_JETPACK = 0; self.BUTTON_INFO = 0; self.button8 = 0; self.pitch_speed = 0; diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 63293e44..5a7e0e91 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -51,7 +51,7 @@ float w_grabber(float req) } else if (req == WR_THINK) { - if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_GRABBER)) + if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) { if(time < self.weapon_delay) return FALSE; @@ -129,7 +129,7 @@ float w_grabber(float req) if (self.BUTTON_CROUCH) { self.grabber_state &~= GRABBER_PULLING; - if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_GRABBER)) + if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) self.grabber_state &~= GRABBER_RELEASING; else self.grabber_state |= GRABBER_RELEASING; @@ -139,7 +139,7 @@ float w_grabber(float req) self.grabber_state |= GRABBER_PULLING; self.grabber_state &~= GRABBER_RELEASING; - if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_GRABBER)) + if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) { // already fired if(self.grabber) -- 2.39.2