aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/graphics.cpp83
-rw-r--r--engines/hopkins/graphics.h12
-rw-r--r--engines/hopkins/script.cpp2
3 files changed, 36 insertions, 61 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index ea65ad7432..c998a3b011 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -47,7 +47,6 @@ GraphicsManager::GraphicsManager() {
_scrollPosX = 0;
_largeScreenFl = false;
_oldScrollPosX = 0;
- _dirtyRectCount = 0;
_vesaScreen = NULL;
_vesaBuffer = NULL;
_screenBuffer = NULL;
@@ -76,10 +75,6 @@ GraphicsManager::GraphicsManager() {
Common::fill(&_colorTable[0], &_colorTable[PALETTE_EXT_BLOCK_SIZE], 0);
Common::fill(&_palette[0], &_palette[PALETTE_EXT_BLOCK_SIZE], 0);
Common::fill(&_oldPalette[0], &_oldPalette[PALETTE_EXT_BLOCK_SIZE], 0);
-
- for (int i = 0; i < DIRTY_RECTS_SIZE; ++i)
- Common::fill((byte *)&_dirtyRects[i], (byte *)&_dirtyRects[i] + sizeof(BlocItem), 0);
-
}
GraphicsManager::~GraphicsManager() {
@@ -1095,72 +1090,62 @@ void GraphicsManager::displayAllBob() {
}
void GraphicsManager::resetVesaSegment() {
- for (int idx = 0; idx <= _dirtyRectCount; idx++)
- _dirtyRects[idx]._activeFl = false;
-
- _dirtyRectCount = 0;
+ _dirtyRects.clear();
}
// Add VESA Segment
void GraphicsManager::addDirtyRect(int x1, int y1, int x2, int y2) {
- bool addFlag = true;
-
x1 = CLIP(x1, _minX, _maxX);
y1 = CLIP(y1, _minY, _maxY);
x2 = CLIP(x2, _minX, _maxX);
y2 = CLIP(y2, _minY, _maxY);
- for (int blocIndex = 0; blocIndex <= _dirtyRectCount; blocIndex++) {
- BlocItem &bloc = _dirtyRects[blocIndex];
- if (bloc._activeFl && x1 >= bloc._x1 && x2 <= bloc._x2 && y1 >= bloc._y1 && y2 <= bloc._y2)
- addFlag = false;
- };
-
- if (addFlag && (x2 > x1) && (y2 > y1)) {
- assert(_dirtyRectCount < DIRTY_RECTS_SIZE);
- BlocItem &bloc = _dirtyRects[++_dirtyRectCount];
-
- bloc._activeFl = true;
- bloc._x1 = x1;
- bloc._x2 = x2;
- bloc._y1 = y1;
- bloc._y2 = y2;
+ Common::Rect newRect(x1, y1, x2, y2);
+ if (!newRect.isValidRect())
+ return;
+
+ // Don't bother adding the rect if it's contained within another existing one
+ for (uint rectIndex = 0; rectIndex < _dirtyRects.size(); ++rectIndex) {
+ const Common::Rect &r = _dirtyRects[rectIndex];
+ if (r.contains(newRect))
+ return;
}
+
+ assert(_dirtyRects.size() < DIRTY_RECTS_SIZE);
+ _dirtyRects.push_back(newRect);
}
// Display VESA Segment
void GraphicsManager::displayVesaSegment() {
- if (_dirtyRectCount == 0)
+ if (_dirtyRects.size() == 0)
return;
lockScreen();
- for (int idx = 1; idx <= _dirtyRectCount; ++idx) {
- BlocItem &bloc = _dirtyRects[idx];
- Common::Rect &dstRect = dstrect[idx - 1];
- if (!bloc._activeFl)
- continue;
+ for (uint idx = 0; idx < _dirtyRects.size(); ++idx) {
+ Common::Rect &r = _dirtyRects[idx];
+ Common::Rect &dstRect = dstrect[idx];
if (_vm->_eventsManager._breakoutFl) {
- Copy_Vga16(_vesaBuffer, bloc._x1, bloc._y1, bloc._x2 - bloc._x1, bloc._y2 - bloc._y1, bloc._x1, bloc._y1);
- dstRect.left = bloc._x1 * 2;
- dstRect.top = bloc._y1 * 2 + 30;
- dstRect.setWidth((bloc._x2 - bloc._x1) * 2);
- dstRect.setHeight((bloc._y2 - bloc._y1) * 2);
- } else if (bloc._x2 > _vm->_eventsManager._startPos.x && bloc._x1 < _vm->_eventsManager._startPos.x + SCREEN_WIDTH) {
- if (bloc._x1 < _vm->_eventsManager._startPos.x)
- bloc._x1 = _vm->_eventsManager._startPos.x;
- if (bloc._x2 > _vm->_eventsManager._startPos.x + SCREEN_WIDTH)
- bloc._x2 = _vm->_eventsManager._startPos.x + SCREEN_WIDTH;
+ Copy_Vga16(_vesaBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left, r.top);
+ dstRect.left = r.left * 2;
+ dstRect.top = r.top * 2 + 30;
+ dstRect.setWidth((r.right - r.left) * 2);
+ dstRect.setHeight((r.bottom - r.top) * 2);
+ } else if (r.right > _vm->_eventsManager._startPos.x && r.left < _vm->_eventsManager._startPos.x + SCREEN_WIDTH) {
+ if (r.left < _vm->_eventsManager._startPos.x)
+ r.left = _vm->_eventsManager._startPos.x;
+ if (r.right > _vm->_eventsManager._startPos.x + SCREEN_WIDTH)
+ r.right = _vm->_eventsManager._startPos.x + SCREEN_WIDTH;
// WORKAROUND: Original didn't lock the screen for access
lockScreen();
- m_scroll16(_vesaBuffer, bloc._x1, bloc._y1, bloc._x2 - bloc._x1, bloc._y2 - bloc._y1, bloc._x1 - _vm->_eventsManager._startPos.x, bloc._y1);
+ m_scroll16(_vesaBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left - _vm->_eventsManager._startPos.x, r.top);
- dstRect.left = bloc._x1 - _vm->_eventsManager._startPos.x;
- dstRect.top = bloc._y1;
- dstRect.setWidth(bloc._x2 - bloc._x1);
- dstRect.setHeight(bloc._y2 - bloc._y1);
+ dstRect.left = r.left - _vm->_eventsManager._startPos.x;
+ dstRect.top = r.top;
+ dstRect.setWidth(r.right - r.left);
+ dstRect.setHeight(r.bottom - r.top);
unlockScreen();
}
@@ -1168,12 +1153,10 @@ void GraphicsManager::displayVesaSegment() {
byte *srcP = _videoPtr + WinScan * dstRect.top + (dstRect.left * 2);
g_system->copyRectToScreen(srcP, WinScan, dstRect.left, dstRect.top,
dstRect.width(), dstRect.height());
-
- _dirtyRects[idx]._activeFl = false;
}
unlockScreen();
- _dirtyRectCount = 0;
+ resetVesaSegment();
}
void GraphicsManager::AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, int idx, bool addSegment) {
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 0db51a09a1..72fd87c7c3 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -24,6 +24,7 @@
#define HOPKINS_GRAPHICS_H
#include "common/scummsys.h"
+#include "common/array.h"
#include "common/endian.h"
#include "common/rect.h"
#include "common/str.h"
@@ -46,14 +47,6 @@ struct RGB8 {
byte b;
};
-struct BlocItem {
- uint16 _activeFl;
- int _x1;
- int _y1;
- int _x2;
- int _y2;
-};
-
class HopkinsEngine;
class GraphicsManager {
@@ -111,8 +104,7 @@ public:
bool _skipVideoLockFl;
int _fadeDefaultSpeed;
- int _dirtyRectCount;
- BlocItem _dirtyRects[DIRTY_RECTS_SIZE];
+ Common::Array<Common::Rect> _dirtyRects;
int WinScan;
byte *PAL_PIXELS;
bool MANU_SCROLL;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 993bd2b335..55cbe00930 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -2337,7 +2337,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
memcpy(_vm->_graphicsManager._oldPalette, _vm->_graphicsManager._palette, 769);
_vm->_animationManager.playAnim2("PLAN.ANM", 50, 10, 800);
}
- _vm->_graphicsManager._dirtyRectCount = 0;
+ _vm->_graphicsManager.resetVesaSegment();
break;
case 608:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 11:52:09 +0000