TSAGE: Clean up the dead code introduced for R2R

This commit is contained in:
Paul Gilbert 2012-02-05 20:40:03 +11:00
parent 45e61b985c
commit 4a806d885a

View File

@ -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);
}