Remove jetpack from input menu, jetpack/hook conflict notices

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2939ddf98df7f07340feac19c4d481ed1c320e9a..bcfa179809cc9e7f7fd04bc1a6085310768f7e25 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1087,7 +1087,7 @@ seta cl_gentle_gibs 0             "client side gentle mode (only replaces gibs); when set t
 seta cl_gentle_messages 0      "client side gentle mode (only replaces frag messages/centerprints)"
 seta cl_gentle_damage 0                "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomily colored flash is used instead"
 
-set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)"
+set g_jetpack 0 "Jetpack mutator"
 
 set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."
 set g_bastet 0 "don't try"

diff --git a/keybinds.txt b/keybinds.txt
index 0458a548f06839238c17ee38cb0484d04b48a118..3428f60fa22f848cdb44c47bf53e88ded3ed7a52 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -5,7 +5,7 @@
 "+moveright"                            "strafe right"
 "+jump"                                 "jump / swim"
 "+crouch"                               "crouch / sink"
-"+hook"                                 "off-hand hook / jet pack"
+"+hook"                                 "off-hand hook"
 ""                                      ""
 ""                                      "Attacking"
 "+fire"                                 "primary fire"

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 9a6d9e98272e3214c8e8bdb86fef39f2f169c5fa..4642fdd05556a46a4e40e3e576ca43257644f833 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -5,7 +5,7 @@
 "+moveright"                            "rechts"
 "+jump"                                 "springen / schwimmen"
 "+crouch"                               "ducken / sinken"
-"+hook"                                 "Enterhaken / Jetpack"
+"+hook"                                 "Enterhaken"
 ""                                      ""
 ""                                      "Angriff"
 "+fire"                                 "1. Feuermodus"

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

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

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

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

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

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

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 03081ff4b1526e5f3cc0a486aec68f50c874ee23..de110cd476c2a8c62fbfc56a91f420e646e26442 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1458,8 +1458,6 @@ void spawnfunc_item_fuel_regen(void)
 
 void spawnfunc_item_jetpack(void)
 {
-       if(g_grappling_hook)
-               return; // sorry, but these two can't coexist (same button); spawn fuel instead
        if(!self.ammo_fuel)
                self.ammo_fuel = g_pickup_fuel_jetpack;
        if(start_items & IT_JETPACK)