Merge branch 'master' into teenagentRefactor

Conflicts:
	engines/teenagent/callbacks.cpp

1 files changed, 88 insertions, 0 deletions

diff --git a/engines/tony/input.h b/engines/tony/input.h
new file mode 100644
index 0000000000..d07eaefe34
--- /dev/null
+++ b/engines/tony/input.h
@@ -0,0 +1,88 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This code is based on original Tony Tough source code
+ *
+ * Copyright (c) 1997-2003 Nayma Software
+ */
+
+#ifndef TONY_INPUT_H
+#define TONY_INPUT_H
+
+#include "common/events.h"
+#include "tony/utils.h"
+
+namespace Tony {
+
+class RMInput {
+private:
+	Common::Event _event;
+
+	// Mouse related fields
+	RMPoint _mousePos;
+	bool _clampMouse;
+	bool _leftButton, _rightButton;
+	bool _leftClickMouse, _leftReleaseMouse, _rightClickMouse, _rightReleaseMouse;
+
+	// Keyboard related fields
+	bool _keyDown[350];
+
+public:
+	RMInput();
+	~RMInput();
+
+	/**
+	 * Polling (must be performed once per frame)
+	 */
+	void poll();
+
+	/**
+	 * Reading of the mouse
+	 */
+	RMPoint mousePos();
+
+	/**
+	 * Current status of the mouse buttons
+	 */
+	bool mouseLeft();
+	bool mouseRight();
+
+	/**
+	 * Events of mouse clicks
+	 */
+	bool mouseLeftClicked();
+	bool mouseRightClicked();
+	bool mouseBothClicked();
+	bool mouseLeftReleased();
+	bool mouseRightReleased();
+	bool mouseBothReleased();
+
+	/**
+	 * Returns true if the given key is pressed
+	 */
+	bool getAsyncKeyState(Common::KeyCode kc);
+};
+
+} // End of namespace Tony
+
+#endif