[Scummvm-cvs-logs] scummvm master -> b9e4d77ade60a3293f426f6d01e176e33d729f95

djwillis John.Willis at Distant-earth.com
Thu Mar 24 23:47:07 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b9e4d77ade GPH: Removed some unimplemented and unneeded definitions.


Commit: b9e4d77ade60a3293f426f6d01e176e33d729f95
    https://github.com/scummvm/scummvm/commit/b9e4d77ade60a3293f426f6d01e176e33d729f95
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-03-24T15:43:12-07:00

Commit Message:
GPH: Removed some unimplemented and unneeded definitions.

 - Thanks to digitall for proving that 2 sets of eyes spot a really simple
   problem much quicker than one set ;).

mount.sh: Fixed some small errors#	../../../../scummvm.gph

Changed paths:
    backends/events/gph/gph-events.cpp
    backends/events/gph/gph-events.h



diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 8a5bee9..05fd747 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -122,9 +122,9 @@ enum {
 	TAPMODE_HOVER		= 2
 };
 
-//GPHEventSource::GPHEventSource()
-//	: _buttonStateL(false){
-//}
+GPHEventSource::GPHEventSource()
+	: _buttonStateL(false){
+}
 
 //void GPHEventSource::fillMouseEvent(Common::Event &event, int x, int y) {
 //	if (GPHGraphicsManager::_videoMode.mode == GFX_HALF && !GPHGraphicsManager::_overlayVisible){
diff --git a/backends/events/gph/gph-events.h b/backends/events/gph/gph-events.h
index f929a14..7672bff 100644
--- a/backends/events/gph/gph-events.h
+++ b/backends/events/gph/gph-events.h
@@ -30,8 +30,8 @@
  */
 
 class GPHEventSource : public SdlEventSource {
-//public:
-//	GPHEventSource();
+public:
+	GPHEventSource();
 
 protected:
 	bool _stickBtn[32];
@@ -46,16 +46,11 @@ protected:
 	 */
 	void moveStick();
 
-	virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event);
-	virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
-	virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
-	virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
-	virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
-	virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);
-
-//	void fillMouseEvent(Common::Event &event, int x, int y);
-	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
-	virtual void SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event);
+	bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
+	bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
+	bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
+	bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
+	bool remapKey(SDL_Event &ev, Common::Event &event);
 };
 
 #endif /* BACKEND_EVENTS_GPH_H */






More information about the Scummvm-git-logs mailing list