summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2009-10-09 23:27:51 +0300
committerBlue <bluesansdouze@gmail.com>2010-01-08 23:24:04 +0100
commit104266da0f92ab2a765598dde59bf2e7f6426484 (patch)
treeab3f08a5b362b9a77978513bbea75081afdfb5c5 /src/keyboardconfig.cpp
parentc1ddf4c0840bb15016dc69af4a4751d09908393f (diff)
downloadmana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.gz
mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.bz2
mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.xz
mana-104266da0f92ab2a765598dde59bf2e7f6426484.zip
Show first key binding conflict
Diffstat (limited to 'src/keyboardconfig.cpp')
-rw-r--r--src/keyboardconfig.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 8e021aa6..8dc2f0c5 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -165,10 +165,15 @@ bool KeyboardConfig::hasConflicts()
(mKey[i].value == mKey[j].value)
)
{
+ mBindError = strprintf(_("Conflict \"%s\" and \"%s\" keys. "
+ "Resolve them, or gameplay may result"
+ " in strange behaviour."),
+ mKey[i].caption.c_str(), mKey[j].caption.c_str());
return true;
}
}
}
+ mBindError = "";
return false;
}