From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 15 Mar 2012 20:59:12 +0000 (+0200)
Subject: Rename keybinds properly
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=d5d34cbb355c2d8ab99ed89acf2b376b65894134

Rename keybinds properly
---

diff --git a/data/keybinds.txt b/data/keybinds.txt
index 1b9d67a2..d4ee328e 100644
--- a/data/keybinds.txt
+++ b/data/keybinds.txt
@@ -8,11 +8,11 @@
 "+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Attacking"
-"+attack"                               "primary fire"
-"+attack2"                              "secondary fire"
+"+attack"                               "vore"
+"+attack2"                              "attack"
 "reload"                                "reload"
-"+regurgitate"                          "stomach regurgitate"
-"+digest"                               "stomach digest"
+"+regurgitate"                          "regurgitate"
+"+digest"                               "digest"
 ""                                      ""
 ""                                      "View"
 "+zoom"                                 "zoom"
diff --git a/docs/TODO.txt b/docs/TODO.txt
index cfee2452..221e9435 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,8 +116,6 @@
 
 - 0.8: Distributed digestion: Also account the health of each item / player when distributing, not only the count
 
-- 0.7: Rename fire keybinds to difference between weapon attach and vore attack?
-
 - 0.8 BUG: When you get stomach kicked, weapon reloading resets. Is this a bug, or does it actually work better?
 
 - 0.7 | 0.8: Move source branch to mediasource like Xonotic