Keymapper WIP:

* Implemented stack-based active map in Keymapper
* Started proper testing by adding code to OSystem_SDL to set up simple HardwareKeySet and Keymap

svn-id: r33660

2 files changed, 5 insertions, 2 deletions

diff --git a/common/events.h b/common/events.h
index ba31610e92..2cc81ada23 100644
--- a/common/events.h
+++ b/common/events.h
@@ -119,6 +119,7 @@ struct Event {
 	Common::Point mouse;
 };
 
+class Keymapper;
 
 /**
  * The EventManager provides user input events to the client code.
@@ -178,6 +179,8 @@ public:
 
 	// TODO: Consider removing OSystem::getScreenChangeID and
 	// replacing it by a generic getScreenChangeID method here
+
+	virtual Common::Keymapper *getKeymapper() = 0;
 };
 
 } // End of namespace Common
diff --git a/common/image-map.cpp b/common/image-map.cpp
index f9201618a4..393417315d 100644
--- a/common/image-map.cpp
+++ b/common/image-map.cpp
@@ -33,7 +33,7 @@ ImageMap::~ImageMap() {
 
 Rect *ImageMap::createRectArea(const String& id) {
 	if (_areas.contains(id)) {
-		warning("Image map already contains an area with target of '%s'");
+		warning("Image map already contains an area with target of '%s'", id.c_str());
 		return 0;
 	}
 	Rect *r = new Rect();
@@ -43,7 +43,7 @@ Rect *ImageMap::createRectArea(const String& id) {
 
 Polygon *ImageMap::createPolygonArea(const String& id) {
 	if (_areas.contains(id)) {
-		warning("Image map already contains an area with target of '%s'");
+		warning("Image map already contains an area with target of '%s'", id.c_str());
 		return 0;
 	}
 	Polygon *p = new Polygon();