aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gui/gui.cpp22
-rw-r--r--engines/sci/gui/gui_font.cpp2
-rw-r--r--engines/sci/gui/gui_gfx.cpp78
-rw-r--r--engines/sci/gui/gui_picture.cpp14
-rw-r--r--engines/sci/gui/gui_screen.cpp42
-rw-r--r--engines/sci/gui/gui_screen.h24
-rw-r--r--engines/sci/gui/gui_view.cpp4
7 files changed, 93 insertions, 93 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 7d74877ba6..432d50a9b4 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -213,7 +213,7 @@ void SciGui::display(const char *text, int argc, reg_t *argv) {
currport->curTop = tTop;
currport->curLeft = tLeft;
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::textSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight) {
@@ -243,7 +243,7 @@ void SciGui::drawPicture(GuiResourceId pictureId, uint16 style, uint16 flags, in
_gfx->drawPicture(pictureId, style, addToFlag, EGApaletteNo);
_windowMgr->EndUpdate(_windowMgr->_picWind);
}
- _screen->UpdateWhole();
+ _screen->updateScreen();
_gfx->SetPort(oldPort);
_gfx->_picNotValid = true;
@@ -252,7 +252,7 @@ void SciGui::drawPicture(GuiResourceId pictureId, uint16 style, uint16 flags, in
void SciGui::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo) {
_gfx->drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo);
_gfx->SetCLUT(&_gfx->_sysPalette);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool inverse) {
@@ -267,7 +267,7 @@ void SciGui::drawControlButton(Common::Rect rect, reg_t obj, const char *text, i
rect.grow(1);
_gfx->FrameRect(rect);
}
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool inverse) {
@@ -278,27 +278,27 @@ void SciGui::drawControlText(Common::Rect rect, reg_t obj, const char *text, int
if (style & 8) { // selected
_gfx->FrameRect(rect);
}
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::graphFillBoxForeground(Common::Rect rect) {
_gfx->PaintRect(rect);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::graphFillBoxBackground(Common::Rect rect) {
_gfx->EraseRect(rect);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::graphFillBox(Common::Rect rect, uint16 colorMask, int16 color, int16 priority, int16 control) {
_gfx->FillRect(rect, colorMask, color, priority, control);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::graphDrawLine(Common::Rect rect, int16 color, int16 priority, int16 control) {
_gfx->Draw_Line(rect.left, rect.top, rect.right, rect.bottom, color, priority, control);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
reg_t SciGui::graphSaveBox(Common::Rect rect, uint16 flags) {
@@ -307,7 +307,7 @@ reg_t SciGui::graphSaveBox(Common::Rect rect, uint16 flags) {
void SciGui::graphRestoreBox(reg_t handle) {
_gfx->RestoreBits(handle);
- _screen->UpdateWhole();
+ _screen->updateScreen();
}
void SciGui::paletteSet(int resourceNo, int flags) {
@@ -377,7 +377,7 @@ void SciGui::animate(reg_t listReference, bool cycle, int argc, reg_t *argv) {
}
//_gfx->AnimateUpdateScreen();
- _screen->UpdateWhole();
+ _screen->updateScreen();
_gfx->AnimateRestoreAndDelete();
_gfx->SetPort(oldPort);
diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/gui/gui_font.cpp
index 4ae488e682..31bd0233cc 100644
--- a/engines/sci/gui/gui_font.cpp
+++ b/engines/sci/gui/gui_font.cpp
@@ -86,7 +86,7 @@ void SciGuiFont::draw(SciGuiScreen *screen, int16 chr, int16 top, int16 left, by
if ((done & 7) == 0) // fetching next data byte
b = *(pIn++) & mask;
if (b & 0x80) // if MSB is set - paint it
- screen->Put_Pixel(left + done, y, 1, color, 0, 0);
+ screen->putPixel(left + done, y, 1, color, 0, 0);
b = b << 1;
}
}
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index c1484ca171..62494ca627 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -433,18 +433,18 @@ void SciGuiGfx::FillRect(const Common::Rect &rect, int16 drawFlags, byte clrPen,
if (oldPenMode == 2) { // invert mode
for (y = r.top; y < r.bottom; y++) {
for (x = r.left; x < r.right; x++) {
- curVisual = _screen->Get_Visual(x, y);
+ curVisual = _screen->getVisual(x, y);
if (curVisual == clrPen) {
- _screen->Put_Pixel(x, y, 1, clrBack, 0, 0);
+ _screen->putPixel(x, y, 1, clrBack, 0, 0);
} else if (curVisual == clrBack) {
- _screen->Put_Pixel(x, y, 1, clrPen, 0, 0);
+ _screen->putPixel(x, y, 1, clrPen, 0, 0);
}
}
}
} else { // just fill rect with ClrPen
for (y = r.top; y < r.bottom; y++) {
for (x = r.left; x < r.right; x++) {
- _screen->Put_Pixel(x, y, 1, clrPen, 0, 0);
+ _screen->putPixel(x, y, 1, clrPen, 0, 0);
}
}
}
@@ -457,13 +457,13 @@ void SciGuiGfx::FillRect(const Common::Rect &rect, int16 drawFlags, byte clrPen,
if (oldPenMode != 2) {
for (y = r.top; y < r.bottom; y++) {
for (x = r.left; x < r.right; x++) {
- _screen->Put_Pixel(x, y, drawFlags, 0, clrBack, bControl);
+ _screen->putPixel(x, y, drawFlags, 0, clrBack, bControl);
}
}
} else {
for (y = r.top; y < r.bottom; y++) {
for (x = r.left; x < r.right; x++) {
- _screen->Put_Pixel(x, y, drawFlags, 0, !_screen->Get_Priority(x, y), !_screen->Get_Control(x, y));
+ _screen->putPixel(x, y, drawFlags, 0, !_screen->getPriority(x, y), !_screen->getControl(x, y));
}
}
}
@@ -832,7 +832,7 @@ void SciGuiGfx::ShowBits(const Common::Rect &r, uint16 flags) {
OffsetRect(rect);
assert((flags&0x8000) == 0);
- _screen->UpdateWhole();
+ _screen->updateScreen();
// _system->copyRectToScreen(GetSegment(flags) + _baseTable[rect.top] + rect.left, 320, rect.left, rect.top, rect.width(), rect.height());
// _system->updateScreen();
}
@@ -850,11 +850,11 @@ GuiMemoryHandle SciGuiGfx::SaveBits(const Common::Rect &rect, byte screenMask) {
OffsetRect(r); //local port coords to screen coords
// now actually ask _screen how much space it will need for saving
- size = _screen->BitsGetDataSize(r, screenMask);
+ size = _screen->getBitsDataSize(r, screenMask);
memoryId = kalloc(_s->_segMan, "SaveBits()", size);
memoryPtr = kmem(_s->_segMan, memoryId);
- _screen->BitsSave(r, screenMask, memoryPtr);
+ _screen->saveBits(r, screenMask, memoryPtr);
return memoryId;
}
@@ -862,14 +862,14 @@ void SciGuiGfx::RestoreBits(GuiMemoryHandle memoryHandle) {
byte *memoryPtr = kmem(_s->_segMan, memoryHandle);;
if (memoryPtr) {
- _screen->BitsRestore(memoryPtr);
+ _screen->restoreBits(memoryPtr);
kfree(_s->_segMan, memoryHandle);
}
}
void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte color, byte prio, byte control) {
//set_drawing_flag
- byte flag = _screen->GetDrawingMask(color, prio, control);
+ byte flag = _screen->getDrawingMask(color, prio, control);
prio &= 0xF0;
control &= 0x0F;
@@ -897,8 +897,8 @@ void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte
dx = ABS(dx) << 1;
// setting the 1st and last pixel
- _screen->Put_Pixel(left, top, flag, color, prio, control);
- _screen->Put_Pixel(right, bottom, flag, color, prio, control);
+ _screen->putPixel(left, top, flag, color, prio, control);
+ _screen->putPixel(right, bottom, flag, color, prio, control);
// drawing the line
if (dx > dy) // going horizontal
{
@@ -910,7 +910,7 @@ void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte
}
left += stepx;
fraction += dy;
- _screen->Put_Pixel(left, top, flag, color, prio, control);
+ _screen->putPixel(left, top, flag, color, prio, control);
}
} else // going vertical
{
@@ -922,7 +922,7 @@ void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte
}
top += stepy;
fraction += dx;
- _screen->Put_Pixel(left, top, flag, color, prio, control);
+ _screen->putPixel(left, top, flag, color, prio, control);
}
}
//g_sci->eventMgr->waitUntil(5);
@@ -933,7 +933,7 @@ void SciGuiGfx::Draw_Horiz(int16 left, int16 right, int16 top, byte flag, byte c
if (right < left)
SWAP(right, left);
for (int i = left; i <= right; i++)
- _screen->Put_Pixel(i, top, flag, color, prio, control);
+ _screen->putPixel(i, top, flag, color, prio, control);
}
//--------------------------------
@@ -941,7 +941,7 @@ void SciGuiGfx::Draw_Vert(int16 top, int16 bottom, int16 left, byte flag, byte c
if (top > bottom)
SWAP(top, bottom);
for (int i = top; i <= bottom; i++)
- _screen->Put_Pixel(left, i, flag, color, prio, control);
+ _screen->putPixel(left, i, flag, color, prio, control);
}
// Bitmap for drawing sierra circles
@@ -1059,25 +1059,25 @@ const byte pattern_TextureOffset[128] = {
};
void SciGuiGfx::Draw_Box(Common::Rect box, byte color, byte prio, byte control) {
- byte flag = _screen->GetDrawingMask(color, prio, control);
+ byte flag = _screen->getDrawingMask(color, prio, control);
int y, x;
for (y = box.top; y < box.bottom; y++) {
for (x = box.left; x < box.right; x++) {
- _screen->Put_Pixel(x, y, flag, color, prio, control);
+ _screen->putPixel(x, y, flag, color, prio, control);
}
}
}
void SciGuiGfx::Draw_TexturedBox(Common::Rect box, byte color, byte prio, byte control, byte texture) {
- byte flag = _screen->GetDrawingMask(color, prio, control);
+ byte flag = _screen->getDrawingMask(color, prio, control);
const bool *textureData = &pattern_Textures[pattern_TextureOffset[texture]];
int y, x;
for (y = box.top; y < box.bottom; y++) {
for (x = box.left; x < box.right; x++) {
if (*textureData) {
- _screen->Put_Pixel(x, y, flag, color, prio, control);
+ _screen->putPixel(x, y, flag, color, prio, control);
}
textureData++;
}
@@ -1085,7 +1085,7 @@ void SciGuiGfx::Draw_TexturedBox(Common::Rect box, byte color, byte prio, byte c
}
void SciGuiGfx::Draw_Circle(Common::Rect box, byte size, byte color, byte prio, byte control) {
- byte flag = _screen->GetDrawingMask(color, prio, control);
+ byte flag = _screen->getDrawingMask(color, prio, control);
byte *circle = (byte *)&pattern_Circles[size];
byte circleBitmap;
int y, x;
@@ -1094,7 +1094,7 @@ void SciGuiGfx::Draw_Circle(Common::Rect box, byte size, byte color, byte prio,
circleBitmap = *circle;
for (x = box.left; x < box.right; x++) {
if (circleBitmap & 1) {
- _screen->Put_Pixel(x, y, flag, color, prio, control);
+ _screen->putPixel(x, y, flag, color, prio, control);
}
circleBitmap = circleBitmap >> 1;
}
@@ -1103,7 +1103,7 @@ void SciGuiGfx::Draw_Circle(Common::Rect box, byte size, byte color, byte prio,
}
void SciGuiGfx::Draw_TexturedCircle(Common::Rect box, byte size, byte color, byte prio, byte control, byte texture) {
- byte flag = _screen->GetDrawingMask(color, prio, control);
+ byte flag = _screen->getDrawingMask(color, prio, control);
byte *circle = (byte *)&pattern_Circles[size];
byte circleBitmap;
const bool *textureData = &pattern_Textures[pattern_TextureOffset[texture]];
@@ -1114,7 +1114,7 @@ void SciGuiGfx::Draw_TexturedCircle(Common::Rect box, byte size, byte color, byt
for (x = box.left; x < box.right; x++) {
if (circleBitmap & 1) {
if (*textureData) {
- _screen->Put_Pixel(x, y, flag, color, prio, control);
+ _screen->putPixel(x, y, flag, color, prio, control);
}
textureData++;
}
@@ -1157,7 +1157,7 @@ void SciGuiGfx::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control)
Common::Stack<Common::Point> stack;
Common::Point p, p1;
- byte flag = _screen->GetDrawingMask(color, prio, control), fmatch;
+ byte flag = _screen->getDrawingMask(color, prio, control), fmatch;
p.x = x + _curPort->left;
p.y = y + _curPort->top;
stack.push(p);
@@ -1166,9 +1166,9 @@ void SciGuiGfx::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control)
if ((flag & 2 && prio == 0) || (flag & 3 && control == 0))
return;
- byte t_col = _screen->Get_Visual(p.x, p.y);
- byte t_pri = _screen->Get_Priority(p.x, p.y);
- byte t_con = _screen->Get_Control(p.x, p.y);
+ byte t_col = _screen->getVisual(p.x, p.y);
+ byte t_pri = _screen->getPriority(p.x, p.y);
+ byte t_con = _screen->getControl(p.x, p.y);
int16 w, e, a_set, b_set;
// if in 1st point priority,control or color is already set to target, clear the flag
if (!_s->resMan->isVGA()) {
@@ -1194,20 +1194,20 @@ void SciGuiGfx::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control)
int b = _curPort->rect.bottom + _curPort->top - 1;
while (stack.size()) {
p = stack.pop();
- if ((fmatch = _screen->IsFillMatch(p.x, p.y, flag, t_col, t_pri, t_con)) == 0) // already filled
+ if ((fmatch = _screen->isFillMatch(p.x, p.y, flag, t_col, t_pri, t_con)) == 0) // already filled
continue;
- _screen->Put_Pixel(p.x, p.y, flag, color, prio, control);
+ _screen->putPixel(p.x, p.y, flag, color, prio, control);
w = p.x;
e = p.x;
// moving west and east pointers as long as there is a matching color to fill
- while (w > l && (fmatch = _screen->IsFillMatch(w - 1, p.y, flag, t_col, t_pri, t_con)))
- _screen->Put_Pixel(--w, p.y, fmatch, color, prio, control);
- while (e < r && (fmatch = _screen->IsFillMatch(e + 1, p.y, flag, t_col, t_pri, t_con)))
- _screen->Put_Pixel(++e, p.y, fmatch, color, prio, control);
+ while (w > l && (fmatch = _screen->isFillMatch(w - 1, p.y, flag, t_col, t_pri, t_con)))
+ _screen->putPixel(--w, p.y, fmatch, color, prio, control);
+ while (e < r && (fmatch = _screen->isFillMatch(e + 1, p.y, flag, t_col, t_pri, t_con)))
+ _screen->putPixel(++e, p.y, fmatch, color, prio, control);
// checking lines above and below for possible flood targets
a_set = b_set = 0;
while (w <= e) {
- if (p.y > t && _screen->IsFillMatch(w, p.y - 1, flag, t_col, t_pri, t_con)) { // one line above
+ if (p.y > t && _screen->isFillMatch(w, p.y - 1, flag, t_col, t_pri, t_con)) { // one line above
if (a_set == 0) {
p1.x = w;
p1.y = p.y - 1;
@@ -1217,7 +1217,7 @@ void SciGuiGfx::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control)
} else
a_set = 0;
- if (p.y < b && _screen->IsFillMatch(w, p.y + 1, flag, t_col, t_pri, t_con)) { // one line below
+ if (p.y < b && _screen->isFillMatch(w, p.y + 1, flag, t_col, t_pri, t_con)) { // one line below
if (b_set == 0) {
p1.x = w;
p1.y = p.y + 1;
@@ -1310,13 +1310,13 @@ int16 SciGuiGfx::onControl(uint16 screenMask, Common::Rect rect) {
if (screenMask & SCI_SCREEN_MASK_PRIORITY) {
for (y = outRect.top; y < outRect.bottom; y++) {
for (x = outRect.left; x < outRect.right; x++) {
- result |= 1 << _screen->Get_Priority(x, y);
+ result |= 1 << _screen->getPriority(x, y);
}
}
} else {
for (y = outRect.top; y < outRect.bottom; y++) {
for (x = outRect.left; x < outRect.right; x++) {
- result |= 1 << _screen->Get_Control(x, y);
+ result |= 1 << _screen->getControl(x, y);
}
}
}
diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp
index c10105279f..d779cf5e75 100644
--- a/engines/sci/gui/gui_picture.cpp
+++ b/engines/sci/gui/gui_picture.cpp
@@ -77,7 +77,7 @@ void SciGuiPicture::reset() {
int16 x, y;
for (y = _curPort->top; y < _screen->_height; y++) {
for (x = 0; x < _screen->_width; x++) {
- _screen->Put_Pixel(x, y, SCI_SCREEN_MASK_ALL, 255, 0, 0);
+ _screen->putPixel(x, y, SCI_SCREEN_MASK_ALL, 255, 0, 0);
}
}
}
@@ -168,8 +168,8 @@ void SciGuiPicture::drawCel(int16 x, int16 y, byte *pdata, int size) {
switch (b & 0xC0) {
case 0: // copy bytes as-is but skip transparent ones
while (brun-- && y < lasty && ptr < pend) {
- if ((b = *ptr++) != clr && priority >= _screen->Get_Priority(x, y)) {
- _screen->Put_Pixel(x, y, 3, b, priority, 0);
+ if ((b = *ptr++) != clr && priority >= _screen->getPriority(x, y)) {
+ _screen->putPixel(x, y, 3, b, priority, 0);
}
x++;
if (x >= _screen->_width) {
@@ -180,8 +180,8 @@ void SciGuiPicture::drawCel(int16 x, int16 y, byte *pdata, int size) {
case 0x80: // fill with color
b = *ptr++;
while (brun-- && y < lasty) {
- if (priority >= _screen->Get_Priority(x, y)) {
- _screen->Put_Pixel(x, y, 3, b, priority, 0);
+ if (priority >= _screen->getPriority(x, y)) {
+ _screen->putPixel(x, y, 3, b, priority, 0);
}
x++;
if (x >= _screen->_width) {
@@ -221,8 +221,8 @@ void SciGuiPicture::drawCelAmiga(int16 x, int16 y, byte *pdata, int size) {
bytes = op & 0x07;
col = op >> 3;
while (bytes-- && y < lasty) {
- if (priority >= _screen->Get_Priority(x, y)) {
- _screen->Put_Pixel(x, y, 3, col, priority, 0);
+ if (priority >= _screen->getPriority(x, y)) {
+ _screen->putPixel(x, y, 3, col, priority, 0);
}
x++;
if (x >= _screen->_width) {
diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/gui/gui_screen.cpp
index caf665a4ef..44d36cac93 100644
--- a/engines/sci/gui/gui_screen.cpp
+++ b/engines/sci/gui/gui_screen.cpp
@@ -49,7 +49,7 @@ void SciGuiScreen::init() {
_height = 200;
_pixels = _width * _height;
- // if you want to do scaling, adjust Put_Pixel() accordingly
+ // if you want to do scaling, adjust putPixel() accordingly
_displayWidth = 320;
_displayHeight = 200;
_displayPixels = _displayWidth * _displayHeight;
@@ -72,12 +72,12 @@ byte *SciGuiScreen::initScreen(uint16 pixelCount) {
return screen;
}
-void SciGuiScreen::UpdateWhole() {
+void SciGuiScreen::updateScreen() {
_system->copyRectToScreen(_displayScreen, _displayWidth, 0, 0, _displayWidth, _displayHeight);
_system->updateScreen();
}
-byte SciGuiScreen::GetDrawingMask(byte color, byte prio, byte control) {
+byte SciGuiScreen::getDrawingMask(byte color, byte prio, byte control) {
byte flag = 0;
if (color != 255)
flag |= SCI_SCREEN_MASK_VISUAL;
@@ -88,7 +88,7 @@ byte SciGuiScreen::GetDrawingMask(byte color, byte prio, byte control) {
return flag;
}
-void SciGuiScreen::Put_Pixel(int x, int y, byte drawMask, byte color, byte priority, byte control) {
+void SciGuiScreen::putPixel(int x, int y, byte drawMask, byte color, byte priority, byte control) {
int offset = _baseTable[y] + x;
if (drawMask & SCI_SCREEN_MASK_VISUAL) {
@@ -105,19 +105,19 @@ void SciGuiScreen::Put_Pixel(int x, int y, byte drawMask, byte color, byte prior
*(_controlScreen + offset) = control;
}
-byte SciGuiScreen::Get_Visual(int x, int y) {
+byte SciGuiScreen::getVisual(int x, int y) {
return _visualScreen[_baseTable[y] + x];
}
-byte SciGuiScreen::Get_Priority(int x, int y) {
+byte SciGuiScreen::getPriority(int x, int y) {
return _priorityScreen[_baseTable[y] + x];
}
-byte SciGuiScreen::Get_Control(int x, int y) {
+byte SciGuiScreen::getControl(int x, int y) {
return _controlScreen[_baseTable[y] + x];
}
-byte SciGuiScreen::IsFillMatch(int16 x, int16 y, byte flag, byte t_color, byte t_pri, byte t_con) {
+byte SciGuiScreen::isFillMatch(int16 x, int16 y, byte flag, byte t_color, byte t_pri, byte t_con) {
int offset = _baseTable[y] + x;
byte match = 0;
@@ -130,7 +130,7 @@ byte SciGuiScreen::IsFillMatch(int16 x, int16 y, byte flag, byte t_color, byte t
return match;
}
-int SciGuiScreen::BitsGetDataSize(Common::Rect rect, byte mask) {
+int SciGuiScreen::getBitsDataSize(Common::Rect rect, byte mask) {
int byteCount = sizeof(rect) + sizeof(mask);
int pixels = rect.width() * rect.height();
if (mask & SCI_SCREEN_MASK_VISUAL) {
@@ -145,23 +145,23 @@ int SciGuiScreen::BitsGetDataSize(Common::Rect rect, byte mask) {
return byteCount;
}
-void SciGuiScreen::BitsSave(Common::Rect rect, byte mask, byte *memoryPtr) {
+void SciGuiScreen::saveBits(Common::Rect rect, byte mask, byte *memoryPtr) {
memcpy(memoryPtr, (void *)&rect, sizeof(rect)); memoryPtr += sizeof(rect);
memcpy(memoryPtr, (void *)&mask, sizeof(mask)); memoryPtr += sizeof(mask);
if (mask & SCI_SCREEN_MASK_VISUAL) {
- BitsSaveScreen(rect, _visualScreen, memoryPtr);
- BitsSaveScreen(rect, _displayScreen, memoryPtr);
+ saveBitsScreen(rect, _visualScreen, memoryPtr);
+ saveBitsScreen(rect, _displayScreen, memoryPtr);
}
if (mask & SCI_SCREEN_MASK_PRIORITY) {
- BitsSaveScreen(rect, _priorityScreen, memoryPtr);
+ saveBitsScreen(rect, _priorityScreen, memoryPtr);
}
if (mask & SCI_SCREEN_MASK_CONTROL) {
- BitsSaveScreen(rect, _controlScreen, memoryPtr);
+ saveBitsScreen(rect, _controlScreen, memoryPtr);
}
}
-void SciGuiScreen::BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memoryPtr) {
+void SciGuiScreen::saveBitsScreen(Common::Rect rect, byte *screen, byte *&memoryPtr) {
int width = rect.width();
int y;
@@ -173,7 +173,7 @@ void SciGuiScreen::BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memory
}
}
-void SciGuiScreen::BitsRestore(byte *memoryPtr) {
+void SciGuiScreen::restoreBits(byte *memoryPtr) {
Common::Rect rect;
byte mask;
@@ -181,18 +181,18 @@ void SciGuiScreen::BitsRestore(byte *memoryPtr) {
memcpy((void *)&mask, memoryPtr, sizeof(mask)); memoryPtr += sizeof(mask);
if (mask & SCI_SCREEN_MASK_VISUAL) {
- BitsRestoreScreen(rect, memoryPtr, _visualScreen);
- BitsRestoreScreen(rect, memoryPtr, _displayScreen);
+ restoreBitsScreen(rect, memoryPtr, _visualScreen);
+ restoreBitsScreen(rect, memoryPtr, _displayScreen);
}
if (mask & SCI_SCREEN_MASK_PRIORITY) {
- BitsRestoreScreen(rect, memoryPtr, _priorityScreen);
+ restoreBitsScreen(rect, memoryPtr, _priorityScreen);
}
if (mask & SCI_SCREEN_MASK_CONTROL) {
- BitsRestoreScreen(rect, memoryPtr, _controlScreen);
+ restoreBitsScreen(rect, memoryPtr, _controlScreen);
}
}
-void SciGuiScreen::BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *screen) {
+void SciGuiScreen::restoreBitsScreen(Common::Rect rect, byte *&memoryPtr, byte *screen) {
int width = rect.width();
int y;
diff --git a/engines/sci/gui/gui_screen.h b/engines/sci/gui/gui_screen.h
index a8c3776173..1b0466fc65 100644
--- a/engines/sci/gui/gui_screen.h
+++ b/engines/sci/gui/gui_screen.h
@@ -46,18 +46,18 @@ public:
void init(void);
byte *initScreen(uint16 pixelCount);
- void UpdateWhole();
+ void updateScreen();
- byte GetDrawingMask(byte color, byte prio, byte control);
- void Put_Pixel(int x, int y, byte drawMask, byte color, byte prio, byte control);
- byte Get_Visual(int x, int y);
- byte Get_Priority(int x, int y);
- byte Get_Control(int x, int y);
- byte IsFillMatch(int16 x, int16 y, byte drawMask, byte t_color, byte t_pri, byte t_con);
+ byte getDrawingMask(byte color, byte prio, byte control);
+ void putPixel(int x, int y, byte drawMask, byte color, byte prio, byte control);
+ byte getVisual(int x, int y);
+ byte getPriority(int x, int y);
+ byte getControl(int x, int y);
+ byte isFillMatch(int16 x, int16 y, byte drawMask, byte t_color, byte t_pri, byte t_con);
- int BitsGetDataSize(Common::Rect rect, byte mask);
- void BitsSave(Common::Rect rect, byte mask, byte *memoryPtr);
- void BitsRestore(byte *memoryPtr);
+ int getBitsDataSize(Common::Rect rect, byte mask);
+ void saveBits(Common::Rect rect, byte mask, byte *memoryPtr);
+ void restoreBits(byte *memoryPtr);
GuiPalette _sysPalette;
@@ -70,8 +70,8 @@ public:
byte _bytesPerDisplayPixel;
private:
- void BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *screen);
- void BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memoryPtr);
+ void restoreBitsScreen(Common::Rect rect, byte *&memoryPtr, byte *screen);
+ void saveBitsScreen(Common::Rect rect, byte *screen, byte *&memoryPtr);
OSystem *_system;
EngineState *_s;
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp
index 61995f0731..4eaf45e662 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/gui/gui_view.cpp
@@ -337,8 +337,8 @@ void SciGuiView::draw(Common::Rect rect, Common::Rect clipRect, GuiViewLoopNo lo
for (y = clipRect.top; y < clipRect.top + height; y++, bitmap += celWidth) {
for (x = 0; x < width; x++) {
color = bitmap[x];
- if (color != clearKey && priority >= _screen->Get_Priority(clipRect.left + x, y))
- _screen->Put_Pixel(clipRect.left + x, y, drawMask, palette->mapping[color], priority, 0);
+ if (color != clearKey && priority >= _screen->getPriority(clipRect.left + x, y))
+ _screen->putPixel(clipRect.left + x, y, drawMask, palette->mapping[color], priority, 0);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-15 07:28:54 +0000