diff options
author | Colin Snover | 2017-05-01 21:16:20 -0500 |
---|---|---|
committer | Colin Snover | 2017-05-01 21:16:20 -0500 |
commit | bb40889a606cc9b4e777c050b818fdfab5050697 (patch) | |
tree | 44c78ce4f8337488578e939263d4c17432d40253 | |
parent | c02f2674ad3533aebd6c5dbcaf47f3e1d20904a4 (diff) | |
download | scummvm-rg350-bb40889a606cc9b4e777c050b818fdfab5050697.tar.gz scummvm-rg350-bb40889a606cc9b4e777c050b818fdfab5050697.tar.bz2 scummvm-rg350-bb40889a606cc9b4e777c050b818fdfab5050697.zip |
Revert "SCI32: Add debugging calls to GfxCursor32"
This reverts commit c02f2674ad3533aebd6c5dbcaf47f3e1d20904a4.
Two minutes after committing this, the author of the ticket
resolved the problem, which was caused by missing VMDs.
-rw-r--r-- | engines/sci/graphics/cursor32.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/engines/sci/graphics/cursor32.cpp b/engines/sci/graphics/cursor32.cpp index 3d5895c201..2f74873229 100644 --- a/engines/sci/graphics/cursor32.cpp +++ b/engines/sci/graphics/cursor32.cpp @@ -55,8 +55,6 @@ GfxCursor32::~GfxCursor32() { } void GfxCursor32::hide() { - debugC(kDebugLevelGraphics, "[%d, %d] Hiding cursor: %d -> %d hides", _position.x, _position.y, _hideCount, _hideCount + 1); - if (_hideCount++) { return; } @@ -70,12 +68,9 @@ void GfxCursor32::revealCursor() { _cursorBack.rect = _cursor.rect; _cursorBack.rect.clip(_vmapRegion.rect); if (_cursorBack.rect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Not revealing due to empty cursorBack", _position.x, _position.y); return; } - debugC(kDebugLevelGraphics, "[%d, %d] Revealing cursor: %d, %d, %d, %d", _position.x, _position.y, PRINT_RECT(_cursor.rect)); - readVideo(_cursorBack); _drawBuff1.rect = _cursor.rect; copy(_drawBuff1, _cursorBack); @@ -85,14 +80,12 @@ void GfxCursor32::revealCursor() { void GfxCursor32::paint(DrawRegion &target, const DrawRegion &source) { if (source.rect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Not painting due to empty source rect: %d, %d, %d, %d", _position.x, _position.y, PRINT_RECT(source.rect)); return; } Common::Rect drawRect(source.rect); drawRect.clip(target.rect); if (drawRect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Not painting due to empty draw rect: %d, %d, %d, %d (target: %d, %d, %d, %d)", _position.x, _position.y, PRINT_RECT(drawRect), PRINT_RECT(target.rect)); return; } @@ -133,8 +126,6 @@ void GfxCursor32::drawToHardware(const DrawRegion &source) { } void GfxCursor32::unhide() { - debugC(kDebugLevelGraphics, "[%d, %d] Unhiding cursor: %d -> %d hides", _position.x, _position.y, _hideCount, MAX(0, _hideCount - 1)); - if (_hideCount == 0 || --_hideCount) { return; } @@ -144,8 +135,6 @@ void GfxCursor32::unhide() { } void GfxCursor32::show() { - debugC(kDebugLevelGraphics, "[%d, %d] Showing cursor: %d -> 0 hides", _position.x, _position.y, _hideCount); - if (_hideCount) { _hideCount = 0; _cursor.rect.moveTo(_position.x - _hotSpot.x, _position.y - _hotSpot.y); @@ -184,8 +173,6 @@ void GfxCursor32::clearRestrictedArea() { } void GfxCursor32::setView(const GuiResourceId viewId, const int16 loopNo, const int16 celNo) { - debugC(kDebugLevelGraphics, "[%d, %d] Setting cursor view: %d hides", _position.x, _position.y, _hideCount); - hide(); _cursorInfo.resourceId = viewId; @@ -228,7 +215,6 @@ void GfxCursor32::setView(const GuiResourceId viewId, const int16 loopNo, const _cursor.skipColor = 255; Buffer target(_width, _height, _cursor.data); - debugC(kDebugLevelGraphics, "[%d, %d] Cursor view is %d x %d", _position.x, _position.y, _width, _height); if (pixelDouble) { view.draw(target, _cursor.rect, Common::Point(0, 0), false, 2, 2); } else { @@ -312,14 +298,12 @@ void GfxCursor32::readVideo(DrawRegion &target) { void GfxCursor32::copy(DrawRegion &target, const DrawRegion &source) { if (source.rect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Not copying due to empty source rect: %d, %d, %d, %d", _position.x, _position.y, PRINT_RECT(source.rect)); return; } Common::Rect drawRect(source.rect); drawRect.clip(target.rect); if (drawRect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Not copying due to empty draw rect: %d, %d, %d, %d (target %d, %d, %d, %d)", _position.x, _position.y, PRINT_RECT(drawRect), PRINT_RECT(target.rect)); return; } @@ -411,14 +395,12 @@ void GfxCursor32::move() { // Cursor moved onto the screen after being offscreen _cursor.rect.moveTo(_position.x - _hotSpot.x, _position.y - _hotSpot.y); if (_cursorBack.rect.isEmpty()) { - debugC(kDebugLevelGraphics, "[%d, %d] Cursor moved onscreen", _position.x, _position.y); revealCursor(); return; } // Cursor moved offscreen if (!_cursor.rect.intersects(_vmapRegion.rect)) { - debugC(kDebugLevelGraphics, "[%d, %d] Cursor moved offscreen", _position.x, _position.y); drawToHardware(_cursorBack); return; } |