libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed unused parameter from Gfx::flatBlitCnv

Browse Source 
svn-id: r26195
This commit is contained in:
Nicola Mettifogo 2007-03-18 09:16:12 +00:00
parent 03249397e0
commit abaef3f5af
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/parallaction/animation.cpp
View File

@ -581,8 +581,8 @@ void jobRunScripts(void *parm, Job *j) {
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBitBack);
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBit2);
} else {
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBitBack, v18._data1);
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBit2, v18._data1);
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBitBack);
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBit2);
}
break;

10
engines/parallaction/dialogue.cpp
View File

@ -234,7 +234,7 @@ uint16 askDialoguePassword(Dialogue *v60, StaticCnv *v48) {
_vm->_gfx->drawBalloon(r, 1);
_vm->_gfx->displayWrappedString(v60->_answers[0], _answerBalloonX[0], _answerBalloonY[0], MAX_BALLOON_WIDTH, 3);
_vm->_gfx->flatBlitCnv(v48, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront, v48->_data1);
_vm->_gfx->flatBlitCnv(v48, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront);
_vm->_gfx->displayBalloonString(_answerBalloonX[0] + 5, _answerBalloonY[0] + _answerBalloonH[0] - 15, "> ", 0);
Common::Event e;
@ -309,7 +309,7 @@ void displayQuestion(Dialogue *v60, StaticCnv *v5C) {
debugC(1, kDebugDialogue, "runDialogue: showing question '%s'", v60->_text);
_vm->_gfx->flatBlitCnv(v5C, QUESTION_CHARACTER_X, QUESTION_CHARACTER_Y, Gfx::kBitFront, v5C->_data1);
_vm->_gfx->flatBlitCnv(v5C, QUESTION_CHARACTER_X, QUESTION_CHARACTER_Y, Gfx::kBitFront);
_vm->_gfx->getStringExtent(v60->_text, MAX_BALLOON_WIDTH, &question_width, &question_height);
Common::Rect r(question_width, question_height);
@ -396,7 +396,7 @@ void runDialogue(SpeakData *data) {
if (displayedAnswers == true) {
debugC(1, kDebugDialogue, "runDialogue: showing answering face (%p)", (const void*)v48._data0);
_vm->_gfx->flatBlitCnv(&v48, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront, v48._data1);
_vm->_gfx->flatBlitCnv(&v48, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront);
debugC(1, kDebugDialogue, "runDialogue: answering face shown");
if (_askPassword == false) {
@ -473,7 +473,7 @@ int16 selectAnswer(Question *q, StaticCnv *cnv) {
_vm->_gfx->displayWrappedString(q->_answers[_di], _answerBalloonX[_di], _answerBalloonY[_di], MAX_BALLOON_WIDTH, 0);
cnv->_data0 = _vm->_char._talk._array[q->_answer_moods[_di] & 0xF];
// cnv->_data1 = _vm->_char._talk.field_8[q->_answer_moods[_di] & 0xF];
_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront, cnv->_data1);
_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront);
waitUntilLeftClick();
return _di;
}
@ -493,7 +493,7 @@ int16 selectAnswer(Question *q, StaticCnv *cnv) {
_vm->_gfx->displayWrappedString(q->_answers[_si], _answerBalloonX[_si], _answerBalloonY[_si], MAX_BALLOON_WIDTH, 0);
cnv->_data0 = _vm->_char._talk._array[q->_answer_moods[_si] & 0xF];
// cnv->_data1 = _vm->_char._talk.field_8[q->_answer_moods[_si] & 0xF];
_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront, cnv->_data1);
_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront);
}
g_system->delayMillis(30);

10
engines/parallaction/graphics.cpp
View File

@ -418,7 +418,7 @@ void jobDisplayLabel(void *parm, Job *j) {
if (label->_cnv._width == 0)
return;
_vm->_gfx->flatBlitCnv(&label->_cnv, Gfx::_labelPosition[0]._x, Gfx::_labelPosition[0]._y, Gfx::kBitBack, label->_cnv._data1);
_vm->_gfx->flatBlitCnv(&label->_cnv, Gfx::_labelPosition[0]._x, Gfx::_labelPosition[0]._y, Gfx::kBitBack);
return;
}
@ -507,7 +507,7 @@ void Gfx::setMousePointer(int16 index) {
//
// Cnv management
//
void Gfx::flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer, byte *unused) {
void Gfx::flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer) {
Common::Rect r(cnv->_width, cnv->_height);
r.moveTo(x, y);
@ -572,8 +572,8 @@ void Gfx::restoreZoneBackground(const Common::Rect& r, byte *data) {
cnv._width = r.width();
cnv._height = r.height();
flatBlitCnv(&cnv, r.left, r.top, kBitBack, cnv._data1);
flatBlitCnv(&cnv, r.left, r.top, kBit2, cnv._data1);
flatBlitCnv(&cnv, r.left, r.top, kBitBack);
flatBlitCnv(&cnv, r.left, r.top, kBit2);
return;
}
@ -597,7 +597,7 @@ void Gfx::displayString(uint16 x, uint16 y, const char *text) {
tmp._height = _font._height;
tmp._data0 = _font._array[c];
flatBlitCnv(&tmp, x, y, kBitFront, NULL);
flatBlitCnv(&tmp, x, y, kBitFront);
x += (_proportionalFont ? _glyphWidths[(int)c] : 8);

6
engines/parallaction/graphics.h
View File

@ -111,7 +111,11 @@ public:
void copyRect(Gfx::Buffers dstbuffer, const Common::Rect& r, byte *src, uint16 pitch);
void grabRect(byte *dst, const Common::Rect& r, Gfx::Buffers srcbuffer, uint16 pitch);
void floodFill(Gfx::Buffers buffer, const Common::Rect& r, byte color);
void flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer, byte *unused);
// NOTE: flatBlitCnv used to have an additional unused parameter,
// that was always the _data1 member of the StaticCnv parameter.
// DOS version didn't make use of it, but it is probably needed for Amiga stuff.
void flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer);
void blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer);
// palette

4
engines/parallaction/menu.cpp
View File

@ -332,8 +332,8 @@ void Menu::selectCharacter() {
r.moveTo(_si * BLOCK_X_OFFSET + BLOCK_X, BLOCK_Y - _si * BLOCK_Y_OFFSET);
_vm->_gfx->grabRect(v14._data0, r, Gfx::kBitFront, BLOCK_WIDTH);
_vm->_gfx->flatBlitCnv(&v14, _di * SLOT_WIDTH + SLOT_X, SLOT_Y, Gfx::kBitBack, 0);
_vm->_gfx->flatBlitCnv(&v14, _di * SLOT_WIDTH + SLOT_X, SLOT_Y, Gfx::kBitFront, 0);
_vm->_gfx->flatBlitCnv(&v14, _di * SLOT_WIDTH + SLOT_X, SLOT_Y, Gfx::kBitBack);
_vm->_gfx->flatBlitCnv(&v14, _di * SLOT_WIDTH + SLOT_X, SLOT_Y, Gfx::kBitFront);
beep();

18
engines/parallaction/zone.cpp
View File

@ -295,7 +295,7 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
u->door->_background = (byte*)malloc(vE0._width*vE0._height);
_gfx->backupDoorBackground(u->door, z->_left, z->_top);
_gfx->flatBlitCnv(&vE0, z->_left, z->_top, Gfx::kBitBack, vE0._data1);
_gfx->flatBlitCnv(&vE0, z->_left, z->_top, Gfx::kBitBack);
}
if (!scumm_stricmp(_tokens[0], "startpos")) {
@ -314,7 +314,7 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
if ((z->_flags & kFlagsRemove) == 0) {
_gfx->backupGetBackground(u->get, z->_left, z->_top);
_gfx->flatBlitCnv(vE4, z->_left, z->_top, Gfx::kBitBack, vE4->_data1);
_gfx->flatBlitCnv(vE4, z->_left, z->_top, Gfx::kBitBack);
}
}
@ -372,7 +372,7 @@ void displayCharacterComment(ExamineData *data) {
v3C._data1 = NULL; //_talk.field_8[0];
_vm->_gfx->setFont("comic");
_vm->_gfx->flatBlitCnv(&v3C, 190, 80, Gfx::kBitFront, v3C._data1);
_vm->_gfx->flatBlitCnv(&v3C, 190, 80, Gfx::kBitFront);
int16 v26, v28;
_vm->_gfx->getStringExtent(data->_description, 130, &v28, &v26);
@ -404,7 +404,7 @@ void displayItemComment(ExamineData *data) {
char v68[PATH_LEN];
strcpy(v68, data->_filename);
_vm->_disk->loadStatic(v68, &data->_cnv);
_vm->_gfx->flatBlitCnv(&data->_cnv, 140, (SCREEN_HEIGHT - data->_cnv._height)/2, Gfx::kBitFront, data->_cnv._data1);
_vm->_gfx->flatBlitCnv(&data->_cnv, 140, (SCREEN_HEIGHT - data->_cnv._height)/2, Gfx::kBitFront);
_vm->_gfx->freeStaticCnv(&data->_cnv);
int16 v6A = 0, v6C = 0;
@ -414,7 +414,7 @@ void displayItemComment(ExamineData *data) {
Common::Rect r(v6C, v6A);
r.moveTo(0, 90);
_vm->_gfx->drawBalloon(r, 0);
_vm->_gfx->flatBlitCnv(&_vm->_char._head, 100, 152, Gfx::kBitFront, _vm->_char._head._data1);
_vm->_gfx->flatBlitCnv(&_vm->_char._head, 100, 152, Gfx::kBitFront);
_vm->_gfx->displayWrappedString(data->_description, 0, 90, 130, 0);
jobEraseAnimations((void*)1, NULL);
@ -498,8 +498,8 @@ void jobToggleDoor(void *parm, Job *j) {
v14._data0 = v18->_array[_ax];
_vm->_gfx->flatBlitCnv(&v14, z->_left, z->_top, Gfx::kBitBack, v14._data1);
_vm->_gfx->flatBlitCnv(&v14, z->_left, z->_top, Gfx::kBit2, v14._data1);
_vm->_gfx->flatBlitCnv(&v14, z->_left, z->_top, Gfx::kBitBack);
_vm->_gfx->flatBlitCnv(&v14, z->_left, z->_top, Gfx::kBit2);
}
count++;
@ -551,8 +551,8 @@ void jobDisplayDroppedItem(void *parm, Job *j) {
_vm->_gfx->backupGetBackground(z->u.get, z->_left, z->_top);
}
_vm->_gfx->flatBlitCnv(&z->u.get->_cnv, z->_left, z->_top, Gfx::kBitBack, z->u.get->_cnv._data1);
_vm->_gfx->flatBlitCnv(&z->u.get->_cnv, z->_left, z->_top, Gfx::kBit2, z->u.get->_cnv._data1);
_vm->_gfx->flatBlitCnv(&z->u.get->_cnv, z->_left, z->_top, Gfx::kBitBack);
_vm->_gfx->flatBlitCnv(&z->u.get->_cnv, z->_left, z->_top, Gfx::kBit2);
}
j->_count++;