[colobot] 09/377: Fixed displaying joystick button 0 name, closes #646

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit f6823389ccd7b3c43d1146561f51bf0d21b5bbe3
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Sep 25 23:24:29 2015 +0200

    Fixed displaying joystick button 0 name, closes #646
---
 src/common/restext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 1c1a27f..c1b8a31 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -876,7 +876,7 @@ bool GetResource(ResType type, unsigned int num, std::string& text)
             text = "Alt";
         else if (num == static_cast<unsigned int>(VIRTUAL_KMOD(GUI)))
             text = "Win"; // TODO: Better description of this key?
-        else if (num > static_cast<unsigned int>(VIRTUAL_JOY(0)))
+        else if (num >= static_cast<unsigned int>(VIRTUAL_JOY(0)))
         {
             text = gettext("Button %1");
             text = StrUtils::Replace(text, "%1", StrUtils::ToString<int>(1 + num - VIRTUAL_JOY(0)));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git