From 631c4390274133697ab57437f8bef13a946aa3b7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 6 Apr 2012 00:44:58 +0300
Subject: Split setup keyboard texts and actions.

---
 src/keyboardconfig.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/keyboardconfig.cpp')

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;
 }
 
-- 
cgit v1.2.3-70-g09d2