Keymapper cleanup:

*Removed need to call initGame / cleanupGame on Keymapper

svn-id: r33679

1 files changed, 7 insertions, 27 deletions

diff --git a/backends/common/keymapper.cpp b/backends/common/keymapper.cpp
index 70664b80d9..59fb796187 100644
--- a/backends/common/keymapper.cpp
+++ b/backends/common/keymapper.cpp
@@ -50,38 +50,18 @@ void Keymapper::setDefaultGlobalKeymap(Keymap *keymap) {
 }
 
 void Keymapper::addGameKeymap(const String& name, Keymap *keymap) {
-	if (checkGameInit())
-		_keymapMan->registerGameKeymap(name, keymap);
+	if (ConfMan.getActiveDomain() == 0)
+		error("Call to Keymapper::initGame when no game loaded");
+		
+	_keymapMan->registerGameKeymap(name, keymap);
 }
 
 void Keymapper::setDefaultGameKeymap(Keymap *keymap) {
-	if (checkGameInit()) {
-		_keymapMan->registerDefaultGameKeymap(keymap);
-		pushKeymap(keymap, true);
-	}
-}
-
-bool Keymapper::checkGameInit() {
-	if (_gameId.empty()) {
-		initGame();
-		if (_gameId.empty())
-			return false;
-	}
-	return true;
-}
-
-void Keymapper::initGame() {
 	if (ConfMan.getActiveDomain() == 0)
 		error("Call to Keymapper::initGame when no game loaded");
-
-	if (_gameId.size() > 0)
-		cleanupGame();
-	_gameId = ConfMan.getActiveDomainName();
-}
-
-void Keymapper::cleanupGame() {
-	_keymapMan->unregisterAllGameKeymaps();
-	_gameId.clear();
+	
+	_keymapMan->registerDefaultGameKeymap(keymap);
+	pushKeymap(keymap, true);
 }
 
 bool Keymapper::pushKeymap(const String& name, bool inherit) {