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

cleanup / minor tweak

Browse Source 
svn-id: r7890
This commit is contained in:
Max Horn 2003-05-24 16:11:47 +00:00
parent 41df21ed6b
commit 07df5bd181
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
scumm/gfx.cpp
View File

@ -2355,7 +2355,9 @@ void Scumm::actorFollowCamera(int act) {
#pragma mark -
void Scumm::fadeIn(int effect) {
updatePalette();
switch (effect) {
case 1:
case 2:
@ -2389,48 +2391,48 @@ void Scumm::fadeIn(int effect) {
void Scumm::fadeOut(int effect) {
VirtScreen *vs;
updatePalette();
setDirtyRange(0, 0, 0);
if (!(_features & GF_AFTER_V7))
camera._last.x = camera._cur.x;
if (!_screenEffectFlag)
return;
_screenEffectFlag = false;
if (effect == 0)
return;
// Fill screen 0 with black
vs = &virtscr[0];
memset(vs->screenPtr + vs->xstart, 0, vs->size);
// Fade to black with the specified effect, if any.
switch (effect) {
case 1:
case 2:
case 3:
case 4:
transitionEffect(effect - 1);
break;
case 128:
unkScreenEffect6();
break;
case 129:
// Just blit screen 0 to the display (i.e. display will be black)
setDirtyRange(0, 0, vs->height);
updateDirtyScreen(0);
break;
case 134:
dissolveEffect(1, 1);
break;
case 135:
unkScreenEffect5(1);
break;
default:
warning("fadeOut: default case %d", effect);
if (_screenEffectFlag && effect != 0) {
// Fill screen 0 with black
vs = &virtscr[0];
memset(vs->screenPtr + vs->xstart, 0, vs->size);
// Fade to black with the specified effect, if any.
switch (effect) {
case 1:
case 2:
case 3:
case 4:
transitionEffect(effect - 1);
break;
case 128:
unkScreenEffect6();
break;
case 129:
// Just blit screen 0 to the display (i.e. display will be black)
setDirtyRange(0, 0, vs->height);
updateDirtyScreen(0);
break;
case 134:
dissolveEffect(1, 1);
break;
case 135:
unkScreenEffect5(1);
break;
default:
warning("fadeOut: default case %d", effect);
}
}
// Update the palette at the end (once we faded to black) to avoid
// some nasty effects when the palette is changed
updatePalette();
_screenEffectFlag = false;
}
/* Transition effect. There are four different effects possible,

8
scumm/script_v5.cpp
View File

@ -731,11 +731,11 @@ void Scumm_v5::o5_divide() {
}
void Scumm_v5::o5_doSentence() {
int a;
int verb;
SentenceTab *st;
a = getVarOrDirectByte(0x80);
if (a == 0xFE) {
verb = getVarOrDirectByte(0x80);
if (verb == 0xFE) {
_sentenceNum = 0;
stopScript(VAR(VAR_SENTENCE_SCRIPT));
clearClickedStatus();
@ -744,7 +744,7 @@ void Scumm_v5::o5_doSentence() {
st = &_sentence[_sentenceNum++];
st->verb = a;
st->verb = verb;
st->objectA = getVarOrDirectWord(0x40);
st->objectB = getVarOrDirectWord(0x20);
st->preposition = (st->objectB != 0);