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

LAB: Rename waiteffect -> waitForEffect

Browse source
This commit is contained in:
Filippos Karapetis 2015-02-24 18:51:44 +02:00 • committed by Eugene Sandulenko
parent a83c50cf66
commit 83e58fe452
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/lab/engine.cpp
View file

@ -47,7 +47,7 @@ bool LongWinInFront = false;
TextFont *MsgFont; TextFont *MsgFont;
extern bool DoBlack, waiteffect, EffectPlaying, stopsound, DoNotDrawMessage, IsHiRes, nopalchange, DoMusic; extern bool DoBlack, waitForEffect, EffectPlaying, stopsound, DoNotDrawMessage, IsHiRes, nopalchange, DoMusic;
/* Global parser data */ /* Global parser data */
@ -612,9 +612,9 @@ static bool doUse(uint16 CurInv) {
} }
DoBlack = false; DoBlack = false;
waiteffect = true; waitForEffect = true;
readPict("Music:Click", true); readPict("Music:Click", true);
waiteffect = false; waitForEffect = false;
DoBlack = false; DoBlack = false;
Test = getInvName(CurInv); Test = getInvName(CurInv);

8
engines/lab/processroom.cpp
View file

@ -62,7 +62,7 @@ const char *ViewPath = "LAB:Rooms/";
const char *NewFileName; const char *NewFileName;
extern bool DoNotDrawMessage; extern bool DoNotDrawMessage;
extern bool NoFlip, IsBM, noupdatediff, waiteffect, mwaiteffect, QuitLab, EffectPlaying, soundplaying, MusicOn, DoBlack, ContMusic, DoNotReset; extern bool NoFlip, IsBM, noupdatediff, waitForEffect, mwaitForEffect, QuitLab, EffectPlaying, soundplaying, MusicOn, DoBlack, ContMusic, DoNotReset;
extern char diffcmap[256 * 3]; extern char diffcmap[256 * 3];
extern CloseDataPtr CPtr; extern CloseDataPtr CPtr;
@ -406,14 +406,14 @@ static void doActions(ActionPtr APtr, CloseDataPtr *LCPtr) {
switch (APtr->ActionType) { switch (APtr->ActionType) {
case PLAYSOUND: case PLAYSOUND:
mwaiteffect = true; /* Plays a sound, but waits for it to be done before continuing */ mwaitForEffect = true; /* Plays a sound, but waits for it to be done before continuing */
ContMusic = false; ContMusic = false;
readMusic((char *)APtr->Data); readMusic((char *)APtr->Data);
mwaiteffect = false; mwaitForEffect = false;
break; break;
case PLAYSOUNDB: case PLAYSOUNDB:
mwaiteffect = false; /* Plays a sound in the background. */ mwaitForEffect = false; /* Plays a sound in the background. */
ContMusic = false; ContMusic = false;
readMusic((char *)APtr->Data); readMusic((char *)APtr->Data);
break; break;

12
engines/lab/readdiff.cpp
View file

@ -58,9 +58,9 @@ bool NoFlip = false, /* Don't flip the new picture to front */
stopsound = false, stopsound = false,
soundplaying = false, soundplaying = false,
screenbuffer = false, screenbuffer = false,
waiteffect = false, /* Wait for each sound effect to finish waitForEffect = false, /* Wait for each sound effect to finish
before coninuing. */ before coninuing. */
mwaiteffect = false; mwaitForEffect = false;
uint16 DataBytesPerRow; uint16 DataBytesPerRow;
@ -273,7 +273,7 @@ void diffNextFrame() {
case 30L: case 30L:
case 31L: { case 31L: {
if (waiteffect) { if (waitForEffect) {
while (EffectPlaying) { while (EffectPlaying) {
g_music->updateMusic(); g_music->updateMusic();
waitTOF(); waitTOF();
@ -298,7 +298,7 @@ void diffNextFrame() {
if ((framenumber == 1) || PlayOnce || StopPlayingEnd) { if ((framenumber == 1) || PlayOnce || StopPlayingEnd) {
int didTOF = 0; int didTOF = 0;
if (waiteffect) { if (waitForEffect) {
while (EffectPlaying) { while (EffectPlaying) {
g_music->updateMusic(); g_music->updateMusic();
waitTOF(); waitTOF();
@ -544,7 +544,7 @@ void readSound() {
swapULong(&size_); swapULong(&size_);
if ((header_ == 30) || (header_ == 31)) { if ((header_ == 30) || (header_ == 31)) {
if (mwaiteffect) { if (mwaitForEffect) {
while (EffectPlaying) { while (EffectPlaying) {
g_music->updateMusic(); g_music->updateMusic();
waitTOF(); waitTOF();
@ -565,7 +565,7 @@ void readSound() {
playSoundEffect(samplespeed_, 64, musicsize, true, music); playSoundEffect(samplespeed_, 64, musicsize, true, music);
} else if (header_ == 65535L) { } else if (header_ == 65535L) {
if (mwaiteffect) { if (mwaitForEffect) {
while (EffectPlaying) { while (EffectPlaying) {
g_music->updateMusic(); g_music->updateMusic();
waitTOF(); waitTOF();