[Scummvm-cvs-logs] SF.net SVN: scummvm: [27961] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jul 8 14:02:39 CEST 2007


Revision: 27961
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27961&view=rev
Author:   fingolfin
Date:     2007-07-08 05:02:38 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Removed various obsolete methods from OSystem (screenToOverlayX/Y, overlayToScreenX/Y)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
    scummvm/trunk/backends/platform/dc/dc.h
    scummvm/trunk/backends/platform/dc/display.cpp
    scummvm/trunk/common/system.h

Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h	2007-07-08 09:22:08 UTC (rev 27960)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h	2007-07-08 12:02:38 UTC (rev 27961)
@@ -196,10 +196,6 @@
 	
 	virtual int16 getOverlayHeight();
 	virtual int16 getOverlayWidth();
-	virtual int screenToOverlayX(int x);
-	virtual int screenToOverlayY(int y);
-	virtual int overlayToScreenX(int x);
-	virtual int overlayToScreenY(int y);
 	
 	virtual OverlayColor ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b);
 	virtual void colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b);

Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h	2007-07-08 09:22:08 UTC (rev 27960)
+++ scummvm/trunk/backends/platform/dc/dc.h	2007-07-08 12:02:38 UTC (rev 27961)
@@ -144,10 +144,6 @@
   // Overlay
   int16 getOverlayHeight();
   int16 getOverlayWidth();
-  int screenToOverlayX(int x);
-  int screenToOverlayY(int y);
-  int overlayToScreenX(int x);
-  int overlayToScreenY(int y);
   void showOverlay();
   void hideOverlay();
   void clearOverlay();

Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp	2007-07-08 09:22:08 UTC (rev 27960)
+++ scummvm/trunk/backends/platform/dc/display.cpp	2007-07-08 12:02:38 UTC (rev 27961)
@@ -645,23 +645,3 @@
   return OVL_W;
 }
 
-int OSystem_Dreamcast::screenToOverlayX(int x)
-{
-  return x - _overlay_x;
-}
-
-int OSystem_Dreamcast::screenToOverlayY(int y)
-{
-  return y - _overlay_y;
-}
-
-int OSystem_Dreamcast::overlayToScreenX(int x)
-{
-  return x + _overlay_x;
-}
-
-int OSystem_Dreamcast::overlayToScreenY(int y)
-{
-  return y + _overlay_y;
-}
-

Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h	2007-07-08 09:22:08 UTC (rev 27960)
+++ scummvm/trunk/common/system.h	2007-07-08 12:02:38 UTC (rev 27961)
@@ -599,11 +599,6 @@
 	 */
 	virtual int16 getOverlayWidth()   { return getWidth(); }
 
-	virtual int screenToOverlayX(int x) { return x; }
-	virtual int screenToOverlayY(int y) { return y; }
-	virtual int overlayToScreenX(int x) { return x; }
-	virtual int overlayToScreenY(int y) { return y; }
-
 	/**
 	* Convert the given RGB triplet into an OverlayColor. A OverlayColor can
 	 * be 8bit, 16bit or 32bit, depending on the target system. The default


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list