Give jetpack a button

diff --git a/keybinds.txt b/keybinds.txt
index 3428f60fa22f848cdb44c47bf53e88ded3ed7a52..189d02eb4ddf0135ab0ed9ededd38db602495949 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -6,6 +6,7 @@
 "+jump"                                 "jump / swim"
 "+crouch"                               "crouch / sink"
 "+hook"                                 "off-hand hook"
+"+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Attacking"
 "+fire"                                 "primary fire"

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 4642fdd05556a46a4e40e3e576ca43257644f833..0c2aaf2b18a85cf0d3385ef1e355c667c532869c 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -6,6 +6,7 @@
 "+jump"                                 "springen / schwimmen"
 "+crouch"                               "ducken / sinken"
 "+hook"                                 "Enterhaken"
+"+jetpack"                              "Jetpack"
 ""                                      ""
 ""                                      "Angriff"
 "+fire"                                 "1. Feuermodus"

diff --git a/keybinds.txt.es b/keybinds.txt.es
index d0da89640ac308ec95ed85015364f08051003196..51d9bfc390374ef73cf0f145e93fc37097119e3a 100644 (file)
--- a/keybinds.txt.es
+++ b/keybinds.txt.es
@@ -6,6 +6,7 @@
 "+jump"                                 "saltar / nadar"
 "+crouch"                               "agacharse / bajar"
 "+hook"                                 "gancho"
+"+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Ataque"
 "+fire"                                 "ataque primario"

diff --git a/keybinds.txt.fr b/keybinds.txt.fr
index 28c2c2cc7b595280507b76a0b4f0ae75583e3580..8a8594864463403daafd7bcf27028be1783d292c 100644 (file)
--- a/keybinds.txt.fr
+++ b/keybinds.txt.fr
@@ -6,6 +6,7 @@
 "+jump"                                 "sauter / nager"
 "+crouch"                               "s'accroupir / couler"
 "+hook"                                 "grappin"
+"+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Attaque"
 "+fire"                                 "tir primaire"

diff --git a/keybinds.txt.hu b/keybinds.txt.hu
index e42a6f78df44bc68f00c01d05f2cd0604410e01f..3ae11f77f76281a331557c0e3e82f45af21e304b 100644 (file)
--- a/keybinds.txt.hu
+++ b/keybinds.txt.hu
@@ -6,6 +6,7 @@
 "+jump"                                 "ugrás / úszás"
 "+crouch"                               "guggolás / süllyedés"
 "+hook"                                 "kézi kampó"
+"+jetpack"                              "rakéta puttony"
 ""                                      ""
 ""                                      "Tüzelés"
 "+fire"                                 "Elsődleges"

diff --git a/keybinds.txt.it b/keybinds.txt.it
index 69d9da2172a32610a21c2bb25086644f9612252c..a01a9731baa6f4ddbd2e52629f44c268c3174f71 100644 (file)
--- a/keybinds.txt.it
+++ b/keybinds.txt.it
@@ -6,6 +6,7 @@
 "+jump"                                 "salta / risalire in acqua"
 "+crouch"                               "abbassarsi / scendere in acqua"
 "+hook"                                 "off-hand hook"
+"+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Attacco"
 "+fire"                                 "fuoco primario"

diff --git a/keybinds.txt.ru b/keybinds.txt.ru
index 68cd41548ce0eeaf162013614070e8595cc6e973..7ab93ff8ff7823cea577dd12a1600fa82d8292c2 100644 (file)
--- a/keybinds.txt.ru
+++ b/keybinds.txt.ru
@@ -6,6 +6,7 @@
 "+jump"                                 "прыжок / плыть"
 "+crouch"                               "пригнуться / погрузиться"
 "+hook"                                 "крюк"
+"+jetpack"                              "реактивный ранец"
 ""                                      ""
 ""                                      "Нападение"
 "+fire"                                 "основной огонь"

diff --git a/keybinds.txt.uk b/keybinds.txt.uk
index fd22526d6b675d73aed3bb0e143e306933f1396f..07812dee8ea5e15efb67bb1d909835666d898275 100644 (file)
--- a/keybinds.txt.uk
+++ b/keybinds.txt.uk
@@ -6,6 +6,7 @@
 "+jump"                                 "стрибок / плисти нагору"
 "+crouch"                               "присідання / занурення"
 "+hook"                                 "гак"
+"+jetpack"                              "реактивний ранець"
 ""                                      ""
 ""                                      "Бій"
 "+fire"                                 "основний вогонь"

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index b1dccc7b5c3bc4e3e6517106fd7919eb5976f393..a933990e858facb02b906da9e21462b8aafe1e83 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1140,6 +1140,10 @@ void ClientConnect (void)
        // Wazat's grappling hook
        SetGrappleHookBindings();
 
+       // Jetpack binds
+       stuffcmd(self, "alias +jetpack +button10\n");
+       stuffcmd(self, "alias -jetpack -button10\n");
+
        // get version info from player
        stuffcmd(self, "cmd clientversion $gameversion\n");
 

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 9718260a9f554c0915c90bb2b5b82aa6734ca8eb..bca53e50d22cfd8485a8154b70cfc36485f5a55c 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -159,9 +159,9 @@ void CheckWaterJump()
 .float multijump_count;
 void CheckPlayerJump()
 {
-       if (self.BUTTON_JUMP)
+       if (self.BUTTON_JUMP || self.BUTTON_JETPACK)
        {
-               if (!PlayerJump() || self.multijump_count > 0)
+               if (self.BUTTON_JUMP && (!PlayerJump() || self.multijump_count > 0) || self.BUTTON_JETPACK)
                {
                        if (!self.jetpack_stopped && (!autocvar_g_jetpack_fuel || self.ammo_fuel > 0 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.frozen)
                        {
@@ -179,10 +179,11 @@ void CheckPlayerJump()
        }
        else
        {
-               self.flags |= FL_JUMPRELEASED;
                self.jetpack_stopped = FALSE;
                self.items &= ~IT_USING_JETPACK;
        }
+       if (!self.BUTTON_JUMP)
+               self.flags |= FL_JUMPRELEASED;
 
        if (self.waterlevel == WATERLEVEL_SWIMMING)
                CheckWaterJump ();

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index ab4dee3185ff06a02cff82b50c3a177d34b1021c..a4f31540670b4991411d1fd329675a0886a3a775 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -13,6 +13,7 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi
 #define BUTTON_USE        buttonuse
 #define BUTTON_DRAG       button8
 #define BUTTON_ZOOMSCRIPT button9
+#define BUTTON_JETPACK    button10
 
 // Globals