aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2015-02-24 18:51:44 +0200
committerEugene Sandulenko2015-12-15 00:05:02 +0100
commit83e58fe452828f29d59aa1b324d2040b1d6c539b (patch)
tree5ffe69a039df90cf583be164e5257a4c8237c26f /engines
parenta83c50cf66e72d105ef64b29a10e3f9603e0141b (diff)
downloadscummvm-rg350-83e58fe452828f29d59aa1b324d2040b1d6c539b.tar.gz
scummvm-rg350-83e58fe452828f29d59aa1b324d2040b1d6c539b.tar.bz2
scummvm-rg350-83e58fe452828f29d59aa1b324d2040b1d6c539b.zip
LAB: Rename waiteffect -> waitForEffect
Diffstat (limited to 'engines')
-rw-r--r--engines/lab/engine.cpp6
-rw-r--r--engines/lab/processroom.cpp8
-rw-r--r--engines/lab/readdiff.cpp12
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 5a51c636b0..f8391d3f0d 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -47,7 +47,7 @@ bool LongWinInFront = false;
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 */
@@ -612,9 +612,9 @@ static bool doUse(uint16 CurInv) {
}
DoBlack = false;
- waiteffect = true;
+ waitForEffect = true;
readPict("Music:Click", true);
- waiteffect = false;
+ waitForEffect = false;
DoBlack = false;
Test = getInvName(CurInv);
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 70eac05cc7..9c5055f01e 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -62,7 +62,7 @@ const char *ViewPath = "LAB:Rooms/";
const char *NewFileName;
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 CloseDataPtr CPtr;
@@ -406,14 +406,14 @@ static void doActions(ActionPtr APtr, CloseDataPtr *LCPtr) {
switch (APtr->ActionType) {
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;
readMusic((char *)APtr->Data);
- mwaiteffect = false;
+ mwaitForEffect = false;
break;
case PLAYSOUNDB:
- mwaiteffect = false; /* Plays a sound in the background. */
+ mwaitForEffect = false; /* Plays a sound in the background. */
ContMusic = false;
readMusic((char *)APtr->Data);
break;
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index 5eb62878a9..3f7cdc7409 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -58,9 +58,9 @@ bool NoFlip = false, /* Don't flip the new picture to front */
stopsound = false,
soundplaying = false,
screenbuffer = false,
- waiteffect = false, /* Wait for each sound effect to finish
+ waitForEffect = false, /* Wait for each sound effect to finish
before coninuing. */
- mwaiteffect = false;
+ mwaitForEffect = false;
uint16 DataBytesPerRow;
@@ -273,7 +273,7 @@ void diffNextFrame() {
case 30L:
case 31L: {
- if (waiteffect) {
+ if (waitForEffect) {
while (EffectPlaying) {
g_music->updateMusic();
waitTOF();
@@ -298,7 +298,7 @@ void diffNextFrame() {
if ((framenumber == 1) || PlayOnce || StopPlayingEnd) {
int didTOF = 0;
- if (waiteffect) {
+ if (waitForEffect) {
while (EffectPlaying) {
g_music->updateMusic();
waitTOF();
@@ -544,7 +544,7 @@ void readSound() {
swapULong(&size_);
if ((header_ == 30) || (header_ == 31)) {
- if (mwaiteffect) {
+ if (mwaitForEffect) {
while (EffectPlaying) {
g_music->updateMusic();
waitTOF();
@@ -565,7 +565,7 @@ void readSound() {
playSoundEffect(samplespeed_, 64, musicsize, true, music);
} else if (header_ == 65535L) {
- if (mwaiteffect) {
+ if (mwaitForEffect) {
while (EffectPlaying) {
g_music->updateMusic();
waitTOF();