diff options
author | Paul Gilbert | 2012-02-05 20:40:03 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-02-05 20:40:03 +1100 |
commit | 4a806d885a95082d2b6d7eef2461adac5dc1ae6a (patch) | |
tree | 2f524f1573aefd20bc6d39f98e62ab6a5d2c5a32 /engines | |
parent | 45e61b985c200a9189d172e8a1410915e7f81f95 (diff) | |
download | scummvm-rg350-4a806d885a95082d2b6d7eef2461adac5dc1ae6a.tar.gz scummvm-rg350-4a806d885a95082d2b6d7eef2461adac5dc1ae6a.tar.bz2 scummvm-rg350-4a806d885a95082d2b6d7eef2461adac5dc1ae6a.zip |
TSAGE: Clean up the dead code introduced for R2R
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/graphics.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index 3bcad91d66..2ceb007cbc 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -1308,30 +1308,14 @@ int GfxManager::getAngle(const Common::Point &p1, const Common::Point &p2) { } } -// FIXME: The two checks for screenSurface inside these two copyFrom() methods -// are meant for Ringworld 2, but the corresponding setBounds cases cause -// issues with the popup menus when right clicking in all games (e.g. the popup -// menu is always shown on the top left of the screen). Therefore, these two -// code fragments are disabled for now, till the glitches they cause are fixed. - void GfxManager::copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion) { -#if 0 - if (&_surface == &(GLOBALS._screenSurface)) - _surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height())); - else -#endif - _surface.setBounds(_bounds); + _surface.setBounds(_bounds); _surface.copyFrom(src, destBounds, priorityRegion); } void GfxManager::copyFrom(GfxSurface &src, int destX, int destY) { -#if 0 - if (&_surface == &(GLOBALS._screenSurface)) - _surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height())); - else -#endif - _surface.setBounds(_bounds); + _surface.setBounds(_bounds); _surface.copyFrom(src, destX, destY); } |