summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-06 00:44:58 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-07 00:11:31 +0300
commit631c4390274133697ab57437f8bef13a946aa3b7 (patch)
tree72e77f602a9cba37ac506708041021f503df7c4d /src/keyboardconfig.cpp
parent1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3 (diff)
downloadmv-631c4390274133697ab57437f8bef13a946aa3b7.tar.gz
mv-631c4390274133697ab57437f8bef13a946aa3b7.tar.bz2
mv-631c4390274133697ab57437f8bef13a946aa3b7.tar.xz
mv-631c4390274133697ab57437f8bef13a946aa3b7.zip
Split setup keyboard texts and actions.
Diffstat (limited to 'src/keyboardconfig.cpp')
-rw-r--r--src/keyboardconfig.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 9552a0844..67d31f7a8 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -58,7 +58,7 @@ void KeyboardConfig::init()
{
mKey[i].configField = keyData[i].configField;
mKey[i].defaultValue = keyData[i].defaultValue;
- mKey[i].caption = gettext(keyData[i].caption.c_str());
+// mKey[i].caption = gettext(keyData[i].caption.c_str());
mKey[i].value = KEY_NO_VALUE;
mKey[i].grp = keyData[i].grp;
mKey[i].action = keyData[i].action;
@@ -66,6 +66,7 @@ void KeyboardConfig::init()
mKey[i].priority = keyData[i].priority;
mKey[i].condition = keyData[i].condition;
}
+/*
for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_48; i ++)
{
mKey[i].caption = strprintf(
@@ -76,6 +77,7 @@ void KeyboardConfig::init()
mKey[i].caption = strprintf(
_("Item Shortcut %d"), i - KEY_SHORTCUT_1 + 1);
}
+*/
mNewKeyIndex = KEY_NO_VALUE;
mEnabled = true;
@@ -113,7 +115,7 @@ void KeyboardConfig::makeDefault()
mKey[i].value = mKey[i].defaultValue;
}
-bool KeyboardConfig::hasConflicts()
+bool KeyboardConfig::hasConflicts(int &key1, int &key2)
{
int i, j;
/**
@@ -135,16 +137,12 @@ bool KeyboardConfig::hasConflicts()
*mKey[i].configField)
)
{
- 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());
+ key1 = i;
+ key2 = j;
return true;
}
}
}
- mBindError = "";
return false;
}