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

dreammaster dreammaster at scummvm.org
Fri May 27 05:09:14 CEST 2016


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:
bb0629dfc7 GRAPHICS: Remove virtual inheritance from Graphics::Screen


Commit: bb0629dfc7c2cf1cec49fd3a6cce68b7f613adf0
    https://github.com/scummvm/scummvm/commit/bb0629dfc7c2cf1cec49fd3a6cce68b7f613adf0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-05-26T23:09:07-04:00

Commit Message:
GRAPHICS: Remove virtual inheritance from Graphics::Screen

Changed paths:
    graphics/screen.h



diff --git a/graphics/screen.h b/graphics/screen.h
index 2981612..b3bb2d3 100644
--- a/graphics/screen.h
+++ b/graphics/screen.h
@@ -39,7 +39,7 @@ namespace Graphics {
  * calls, and provides an update that method that blits the affected 
  * areas to the physical screen
  */
-class Screen : virtual public ManagedSurface {
+class Screen : public ManagedSurface {
 private:
 	/**
 	 * List of affected areas of the screen






More information about the Scummvm-git-logs mailing list