thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TWINE: removed unused method parameter

Browse source
This commit is contained in:
Martin Gerhardy 2020-12-24 00:11:17 +01:00
parent c1b89c9878
commit 0ab84e47ba
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/twine/menu/menu.cpp
View file

@ -806,7 +806,7 @@ void Menu::drawInfoMenu(int16 left, int16 top) {
int32 newBoxLeft2 = left + 9;
_engine->_grid->drawSprite(0, newBoxLeft2, top + 13, _engine->_resources->spriteData[SPRITEHQR_LIFEPOINTS]);
_engine->_grid->drawSprite(newBoxLeft2, top + 13, _engine->_resources->spriteData[SPRITEHQR_LIFEPOINTS]);
int32 boxRight = left + 325;
int32 newBoxLeft = left + 25;
@ -818,7 +818,7 @@ void Menu::drawInfoMenu(int16 left, int16 top) {
drawBox(newBoxLeft, boxTop, left + 324, boxTop + 14);
if (!_engine->_gameState->inventoryDisabled() && _engine->_gameState->hasItem(InventoryItems::kiTunic)) {
_engine->_grid->drawSprite(0, newBoxLeft2, top + 36, _engine->_resources->spriteData[SPRITEHQR_MAGICPOINTS]);
_engine->_grid->drawSprite(newBoxLeft2, top + 36, _engine->_resources->spriteData[SPRITEHQR_MAGICPOINTS]);
if (_engine->_gameState->magicLevelIdx > 0) {
_engine->_interface->drawSplittedBox(Common::Rect(newBoxLeft, top + 35, _engine->_screens->crossDot(newBoxLeft, boxRight, 80, _engine->_gameState->inventoryMagicPoints), top + 50), 75);
}
@ -828,13 +828,13 @@ void Menu::drawInfoMenu(int16 left, int16 top) {
boxLeft = left + 340;
/** draw coin sprite */
_engine->_grid->drawSprite(0, boxLeft, top + 15, _engine->_resources->spriteData[SPRITEHQR_KASHES]);
_engine->_grid->drawSprite(boxLeft, top + 15, _engine->_resources->spriteData[SPRITEHQR_KASHES]);
_engine->_text->setFontColor(155);
Common::String inventoryNumKashes = Common::String::format("%d", _engine->_gameState->inventoryNumKashes);
_engine->_text->drawText(left + 370, top + 5, inventoryNumKashes.c_str());
/** draw key sprite */
_engine->_grid->drawSprite(0, boxLeft, top + 55, _engine->_resources->spriteData[SPRITEHQR_KEY]);
_engine->_grid->drawSprite(boxLeft, top + 55, _engine->_resources->spriteData[SPRITEHQR_KEY]);
_engine->_text->setFontColor(155);
Common::String inventoryNumKeys = Common::String::format("%d", _engine->_gameState->inventoryNumKeys);
_engine->_text->drawText(left + 370, top + 40, inventoryNumKeys.c_str());
@ -846,12 +846,12 @@ void Menu::drawInfoMenu(int16 left, int16 top) {
// Clover leaf boxes
for (int32 i = 0; i < _engine->_gameState->inventoryNumLeafsBox; i++) {
_engine->_grid->drawSprite(0, _engine->_screens->crossDot(left + 25, left + 325, 10, i), top + 58, _engine->_resources->spriteData[SPRITEHQR_CLOVERLEAFBOX]);
_engine->_grid->drawSprite(_engine->_screens->crossDot(left + 25, left + 325, 10, i), top + 58, _engine->_resources->spriteData[SPRITEHQR_CLOVERLEAFBOX]);
}
// Clover leafs
for (int32 i = 0; i < _engine->_gameState->inventoryNumLeafs; i++) {
_engine->_grid->drawSprite(0, _engine->_screens->crossDot(left + 25, left + 325, 10, i) + 2, top + 60, _engine->_resources->spriteData[SPRITEHQR_CLOVERLEAF]);
_engine->_grid->drawSprite(_engine->_screens->crossDot(left + 25, left + 325, 10, i) + 2, top + 60, _engine->_resources->spriteData[SPRITEHQR_CLOVERLEAF]);
}
_engine->copyBlockPhys(left, top, left + width, top + 135);

8
engines/twine/renderer/redraw.cpp
View file

@ -438,7 +438,7 @@ void Redraw::processDrawListActorSprites(const DrawListStruct &drawCmd, bool bgR
}
if (_engine->_interface->textWindow.left <= _engine->_interface->textWindow.right && _engine->_interface->textWindow.top <= _engine->_interface->textWindow.bottom) {
_engine->_grid->drawSprite(0, renderRect.left, renderRect.top, spritePtr);
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
actor->dynamicFlags.bIsVisible = 1;
@ -489,7 +489,7 @@ void Redraw::processDrawListExtras(const DrawListStruct &drawCmd) {
renderRect.right = renderRect.left + spriteWidth;
renderRect.bottom = renderRect.top + spriteHeight;
_engine->_grid->drawSprite(0, renderRect.left, renderRect.top, spritePtr);
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
}
_engine->_interface->setClip(renderRect);
@ -580,7 +580,7 @@ void Redraw::renderOverlays() {
renderRect.right = renderRect.left + spriteWidth;
renderRect.bottom = renderRect.top + spriteHeight;
_engine->_grid->drawSprite(0, renderRect.left, renderRect.top, spritePtr);
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
if (_engine->_interface->textWindow.left <= _engine->_interface->textWindow.right && _engine->_interface->textWindow.top <= _engine->_interface->textWindow.bottom) {
addRedrawArea(_engine->_interface->textWindow.left, _engine->_interface->textWindow.top, renderRect.right, renderRect.bottom);
@ -793,7 +793,7 @@ void Redraw::drawBubble(int32 actorIdx) {
_engine->_interface->setClip(renderRect);
_engine->_grid->drawSprite(0, renderRect.left, renderRect.top, spritePtr);
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
if (_engine->_interface->textWindow.left <= _engine->_interface->textWindow.right && _engine->_interface->textWindow.top <= _engine->_interface->textWindow.bottom) {
_engine->copyBlockPhys(renderRect);
}

2
engines/twine/scene/grid.cpp
View file

@ -474,7 +474,7 @@ void Grid::drawSprite(int32 index, int32 posX, int32 posY, const uint8 *ptr) {
drawBrickSprite(index, posX, posY, ptr, true);
}
void Grid::drawSprite(int32 /*index*/, int32 posX, int32 posY, const SpriteData &ptr) {
void Grid::drawSprite(int32 posX, int32 posY, const SpriteData &ptr) {
const int32 left = posX + ptr.offsetX();
if (left > _engine->_interface->textWindow.right) {
return;

2
engines/twine/scene/grid.h
View file

@ -244,7 +244,7 @@ public:
* @param ptr sprite buffer pointer to draw
*/
void drawSprite(int32 index, int32 posX, int32 posY, const uint8 *spritePtr);
void drawSprite(int32 index, int32 posX, int32 posY, const SpriteData &ptr);
void drawSprite(int32 posX, int32 posY, const SpriteData &ptr);
/**
* Draw sprite or bricks in the screen according with the type