Rename keybinds properly

diff --git a/data/keybinds.txt b/data/keybinds.txt
index 1b9d67a248c57171cf169e3c8e3a18809e618cd2..d4ee328e462b5148db02a1708c267c84d0bd446e 100644 (file)
--- a/data/keybinds.txt
+++ b/data/keybinds.txt
@@ -8,11 +8,11 @@
 "+jetpack"                              "jet pack"\r
 ""                                      ""\r
 ""                                      "Attacking"\r
-"+attack"                               "primary fire"\r
-"+attack2"                              "secondary fire"\r
+"+attack"                               "vore"\r
+"+attack2"                              "attack"\r
 "reload"                                "reload"\r
-"+regurgitate"                          "stomach regurgitate"\r
-"+digest"                               "stomach digest"\r
+"+regurgitate"                          "regurgitate"\r
+"+digest"                               "digest"\r
 ""                                      ""\r
 ""                                      "View"\r
 "+zoom"                                 "zoom"\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index cfee2452d0b0f7c09cce587773ad6e57e3cae8cc..221e943588d908fbefbe421a425404fceef308f2 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,8 +116,6 @@
 \r
 - 0.8: Distributed digestion: Also account the health of each item / player when distributing, not only the count\r
 \r
-- 0.7: Rename fire keybinds to difference between weapon attach and vore attack?\r
-\r
 - 0.8 BUG: When you get stomach kicked, weapon reloading resets. Is this a bug, or does it actually work better?\r
 \r
 - 0.7 | 0.8: Move source branch to mediasource like Xonotic\r