libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: renamed method

Browse Source
This commit is contained in:
Martin Gerhardy 2021-01-30 14:35:12 +01:00
parent 61ae5fa027
commit 4ca2d937da
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/twine/holomap.cpp
View File

@ -304,7 +304,7 @@ void Holomap::drawHolomapTrajectory(int32 trajectoryIndex) {
_engine->_renderer->setCameraAngle(0, 0, 0, 60, 128, 0, 30000);
_engine->_renderer->setLightVector(0xffffffc4, 128, 0);
const Common::Rect rect(0, 200, 199, 479);
_engine->_interface->drawSplittedBox(rect, COLOR_BLACK);
_engine->_interface->drawFilledRect(rect, COLOR_BLACK);
_engine->_renderer->renderIsoModel(0, 0, 0, 0, newAngle, 0, modelPtr);
_engine->copyBlockPhys(rect);
_engine->_renderer->setCameraPosition(400, 240, 128, 1024, 1024);
@ -513,7 +513,7 @@ void Holomap::processHolomap() {
if (redraw) {
redraw = false;
const Common::Rect rect(170, 0, 470, 330);
_engine->_interface->drawSplittedBox(rect, COLOR_BLACK);
_engine->_interface->drawFilledRect(rect, COLOR_BLACK);
_engine->_renderer->setBaseRotation(xRot, yRot, 0);
_engine->_renderer->setLightVector(xRot, yRot, 0);
renderLocations(xRot, yRot, 0, false);

2
engines/twine/menu/interface.cpp
View File

@ -169,7 +169,7 @@ void Interface::drawTransparentBox(const Common::Rect &rect, int32 colorAdj) {
}
}
void Interface::drawSplittedBox(const Common::Rect &rect, uint8 colorIndex) {
void Interface::drawFilledRect(const Common::Rect &rect, uint8 colorIndex) {
_engine->frontVideoBuffer.fillRect(rect, colorIndex);
}

2
engines/twine/menu/interface.h
View File

@ -66,7 +66,7 @@ public:
*/
void drawTransparentBox(const Common::Rect &rect, int32 colorAdj);
void drawSplittedBox(const Common::Rect &rect, uint8 colorIndex);
void drawFilledRect(const Common::Rect &rect, uint8 colorIndex);
void setClip(const Common::Rect &rect);
void saveClip(); // saveTextWindow

16
engines/twine/menu/menu.cpp
View File

@ -283,7 +283,7 @@ void Menu::drawButtonGfx(const MenuSettings *menuSettings, const Common::Rect &r
if (!(_engine->getRandomNumber() % 5)) {
plasmaEffectPtr[_engine->getRandomNumber() % 140 * 10 + 1900] = 255;
}
_engine->_interface->drawSplittedBox(Common::Rect(newWidth, rect.top, rect.right, rect.bottom), COLOR_RED);
_engine->_interface->drawFilledRect(Common::Rect(newWidth, rect.top, rect.right, rect.bottom), COLOR_RED);
} else {
processPlasmaEffect(rect, 64);
if (!(_engine->getRandomNumber() % 5)) {
@ -806,7 +806,7 @@ void Menu::drawInfoMenu(int16 left, int16 top, int16 width) {
drawBox(rect);
Common::Rect splittedBoxRect(rect);
splittedBoxRect.grow(-1);
_engine->_interface->drawSplittedBox(splittedBoxRect, COLOR_BLACK);
_engine->_interface->drawFilledRect(splittedBoxRect, COLOR_BLACK);
const int32 newBoxLeft2 = left + 9;
@ -818,7 +818,7 @@ void Menu::drawInfoMenu(int16 left, int16 top, int16 width) {
const int32 boxTop = top + 10;
const int32 boxBottom = top + 25;
_engine->_interface->drawSplittedBox(Common::Rect(newBoxLeft, boxTop, boxLeft, boxBottom), COLOR_91);
_engine->_interface->drawFilledRect(Common::Rect(newBoxLeft, boxTop, boxLeft, boxBottom), COLOR_91);
drawBox(newBoxLeft, boxTop, left + 324, boxTop + 14);
if (!_engine->_gameState->inventoryDisabled() && _engine->_gameState->hasItem(InventoryItems::kiTunic)) {
@ -826,7 +826,7 @@ void Menu::drawInfoMenu(int16 left, int16 top, int16 width) {
if (_engine->_gameState->magicLevelIdx > 0) {
const int32 pointBoxRight = _engine->_screens->crossDot(newBoxLeft, boxRight, 80, _engine->_gameState->inventoryMagicPoints);
const Common::Rect pointsRect(newBoxLeft, top + 35, pointBoxRight, top + 50);
_engine->_interface->drawSplittedBox(pointsRect, COLOR_75);
_engine->_interface->drawFilledRect(pointsRect, COLOR_75);
drawBox(newBoxLeft, top + 35, newBoxLeft + _engine->_gameState->magicLevelIdx * 80, top + 35 + 15);
}
}
@ -914,11 +914,11 @@ void Menu::drawBehaviour(HeroBehaviourType behaviour, int32 angle, bool cantDraw
const int32 titleBoxTop = boxRect.bottom + titleOffset;
const int32 titleBoxBottom = titleBoxTop + titleHeight;
_engine->_interface->drawSplittedBox(boxRect, COLOR_BRIGHT_BLUE2);
_engine->_interface->drawFilledRect(boxRect, COLOR_BRIGHT_BLUE2);
// behaviour menu title
const Common::Rect titleRect(titleBoxLeft, titleBoxTop, titleBoxRight, titleBoxBottom);
_engine->_interface->drawSplittedBox(titleRect, COLOR_BLACK);
_engine->_interface->drawFilledRect(titleRect, COLOR_BLACK);
drawBox(titleRect);
_engine->_text->setFontColor(COLOR_WHITE);
@ -929,7 +929,7 @@ void Menu::drawBehaviour(HeroBehaviourType behaviour, int32 angle, bool cantDraw
_engine->_text->drawText(titleBoxCenter - _engine->_text->getTextSize(dialText) / 2, titleBoxTop + 1, dialText);
_engine->copyBlockPhys(titleRect);
} else {
_engine->_interface->drawSplittedBox(boxRect, COLOR_BLACK);
_engine->_interface->drawFilledRect(boxRect, COLOR_BLACK);
}
_engine->_renderer->renderBehaviourModel(boxRect, -600, angle, behaviourEntity);
@ -1074,7 +1074,7 @@ void Menu::drawItem(int32 item, Common::Rect &dirtyRect) {
const int32 top = itemY - 32;
const int32 bottom = itemY + 32;
const Common::Rect rect(left, top, right, bottom);
_engine->_interface->drawSplittedBox(rect, inventorySelectedItem == item ? inventorySelectedColor : COLOR_BLACK);
_engine->_interface->drawFilledRect(rect, inventorySelectedItem == item ? inventorySelectedColor : COLOR_BLACK);
if (item < NUM_INVENTORY_ITEMS && _engine->_gameState->hasItem((InventoryItems)item) && !_engine->_gameState->inventoryDisabled()) {
itemAngle[item] += 8;

2
engines/twine/menu/menuoptions.cpp
View File

@ -150,7 +150,7 @@ void MenuOptions::drawSelectableCharacter(int32 x, int32 y, Common::Rect &dirtyR
const bool selected = _onScreenKeyboardX == x && _onScreenKeyboardY == y;
if (selected) {
_engine->_interface->drawSplittedBox(rect, COLOR_91);
_engine->_interface->drawFilledRect(rect, COLOR_91);
} else {
_engine->_interface->blitBox(rect, _engine->workVideoBuffer, _engine->frontVideoBuffer);
_engine->_interface->drawTransparentBox(rect, 4);

2
engines/twine/renderer/redraw.cpp
View File

@ -618,7 +618,7 @@ void Redraw::renderOverlays() {
const int32 item = overlay->info0;
const Common::Rect rect(10, 10, 69, 69);
_engine->_interface->drawSplittedBox(rect, COLOR_BLACK);
_engine->_interface->drawFilledRect(rect, COLOR_BLACK);
_engine->_interface->setClip(rect);
uint8* bodyPtr = _engine->_resources->inventoryTable[item];

2
engines/twine/script/script_life_v1.cpp
View File

@ -1759,7 +1759,7 @@ static int32 lTEXT(TwinEEngine *engine, LifeScriptContext &ctx) {
static int32 lCLEAR_TEXT(TwinEEngine *engine, LifeScriptContext &ctx) {
lTextYPos = 0;
const Common::Rect rect(0, 0, engine->width() - 1, engine->height() / 2);
engine->_interface->drawSplittedBox(rect, COLOR_BLACK);
engine->_interface->drawFilledRect(rect, COLOR_BLACK);
engine->copyBlockPhys(rect);
return 0;
}

2
engines/twine/text.cpp
View File

@ -785,7 +785,7 @@ void Text::drawAskQuestion(int32 index) {
void Text::drawHolomapLocation(int32 index) {
textClipSmall();
setFontCrossColor(COLOR_WHITE);
_engine->_interface->drawSplittedBox(_dialTextBox, COLOR_BLACK);
_engine->_interface->drawFilledRect(_dialTextBox, COLOR_BLACK);
drawTextProgressive(index, false, false);
}