aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/script_v100he.cpp6
-rw-r--r--engines/scumm/he/script_v60he.cpp2
-rw-r--r--engines/scumm/he/script_v72he.cpp4
-rw-r--r--engines/scumm/he/script_v90he.cpp6
-rw-r--r--engines/scumm/he/sound_he.cpp4
-rw-r--r--engines/scumm/he/sprite_he.cpp6
-rw-r--r--engines/scumm/he/wiz_he.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_music.cpp4
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.cpp6
-rw-r--r--engines/scumm/input.cpp2
-rw-r--r--engines/scumm/insane/insane_ben.cpp2
-rw-r--r--engines/scumm/insane/insane_enemy.cpp8
-rw-r--r--engines/scumm/insane/insane_scenes.cpp2
-rw-r--r--engines/scumm/plugin.cpp2
-rw-r--r--engines/scumm/smush/chunk.cpp2
-rw-r--r--engines/scumm/smush/codec37.cpp2
-rw-r--r--engines/scumm/smush/codec47.cpp2
-rw-r--r--engines/scumm/smush/imuse_channel.cpp4
-rw-r--r--engines/scumm/smush/saud_channel.cpp2
-rw-r--r--engines/scumm/smush/smush_player.cpp4
20 files changed, 36 insertions, 36 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index e824bff129..d20a0487a6 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -1968,7 +1968,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- switch(args[1]) {
+ switch (args[1]) {
case 0:
_sprite->setSpriteFlagXFlipped(spriteId, args[0]);
break;
@@ -2434,7 +2434,7 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
type = pop();
spriteGroupId = pop();
if (spriteGroupId) {
- switch(type) {
+ switch (type) {
case 0:
push(_sprite->getGroupXMul(spriteGroupId));
break;
@@ -2775,7 +2775,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
flags = pop();
spriteId = pop();
if (spriteId) {
- switch(flags) {
+ switch (flags) {
case 0:
push(_sprite->getSpriteFlagXFlipped(spriteId));
break;
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 24efa9eabc..7c6cd10711 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -999,7 +999,7 @@ void ScummEngine_v60he::o60_openFile() {
}
if (slot != -1) {
- switch(mode) {
+ switch (mode) {
case 1:
// TODO / FIXME: Consider using listSavefiles to avoid unneccessary openForLoading calls
_hInFileTable[slot] = _saveFileMan->openForLoading(filename);
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index a502df6929..cbd68a20e9 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -594,7 +594,7 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) {
chr = string[num++];
if (chr == '%') {
chr = string[num++];
- switch(chr) {
+ switch (chr) {
case 'b':
//dst += sprintf((char *)dst, "%b", args[val++]);
break;
@@ -1738,7 +1738,7 @@ void ScummEngine_v72he::o72_openFile() {
}
if (slot != -1) {
- switch(mode) {
+ switch (mode) {
case 1:
// TODO / FIXME: Consider using listSavefiles to avoid unneccessary openForLoading calls
_hInFileTable[slot] = _saveFileMan->openForLoading(filename);
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index a7c40c590f..7032a1fc97 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -952,7 +952,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
flags = pop();
spriteId = pop();
if (spriteId) {
- switch(flags) {
+ switch (flags) {
case 0:
push(_sprite->getSpriteFlagXFlipped(spriteId));
break;
@@ -1167,7 +1167,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- switch(args[1]) {
+ switch (args[1]) {
case 0:
_sprite->setSpriteFlagXFlipped(spriteId, args[0]);
break;
@@ -1479,7 +1479,7 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() {
type = pop();
spriteGroupId = pop();
if (spriteGroupId) {
- switch(type) {
+ switch (type) {
case 0:
push(_sprite->getGroupXMul(spriteGroupId));
break;
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 1a2dd25e86..f7dc7989a2 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -369,7 +369,7 @@ void SoundHE::processSoundCode() {
assert(codePtr);
codePtr += _heChannel[chan].codeOffs;
- while(1) {
+ while (1) {
size = READ_LE_UINT16(codePtr);
time = READ_LE_UINT32(codePtr + 2);
@@ -414,7 +414,7 @@ void SoundHE::processSoundCode() {
void SoundHE::processSoundOpcodes(int sound, byte *codePtr, int *soundVars) {
int arg, opcode, var, val;
- while(READ_LE_UINT16(codePtr) != 0) {
+ while (READ_LE_UINT16(codePtr) != 0) {
codePtr += 2;
opcode = READ_LE_UINT16(codePtr); codePtr += 2;
opcode = (opcode & 0xFFF) >> 4;
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 6983dc147a..5b0fb0f7fa 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -370,7 +370,7 @@ int Sprite::getSpriteGeneralProperty(int spriteId, int type) {
// XXX U32 related check
- switch(type) {
+ switch (type) {
case 0x7B:
return _spriteTable[spriteId].imgFlags;
case 0x7D:
@@ -677,7 +677,7 @@ void Sprite::setSpriteFlagAutoAnim(int spriteId, int value) {
void Sprite::setSpriteFlagUpdateType(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- switch(value) {
+ switch (value) {
case 2:
_spriteTable[spriteId].flags &= ~(kSFMarkDirty);
_spriteTable[spriteId].flags |= kSFBlitDirectly;
@@ -740,7 +740,7 @@ void Sprite::setSpriteGeneralProperty(int spriteId, int type, int value) {
// XXX U32 related check
- switch(type) {
+ switch (type) {
case 0x7B:
_spriteTable[spriteId].imgFlags = value;
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 4636090d42..74414fc2cc 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1917,7 +1917,7 @@ void Wiz::processWizImage(const WizParameters *params) {
if (params->processFlags & kWPFUseFile) {
Common::File f;
- switch(params->fileWriteMode) {
+ switch (params->fileWriteMode) {
case 2:
_vm->VAR(119) = -1;
break;
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp
index 4c7b30c701..d9a922cc80 100644
--- a/engines/scumm/imuse_digi/dimuse_music.cpp
+++ b/engines/scumm/imuse_digi/dimuse_music.cpp
@@ -171,7 +171,7 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table
fadeOutMusic(120);
- switch(table->opcode) {
+ switch (table->opcode) {
case 0:
case 5:
case 6:
@@ -425,7 +425,7 @@ int IMuseDigital::getSoundIdByName(const char *soundName) {
void IMuseDigital::playFtMusic(const char *songName, int opcode, int volume) {
fadeOutMusic(200);
- switch(opcode) {
+ switch (opcode) {
case 0:
case 4:
break;
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 19d34eabc9..65e003d0ec 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -60,7 +60,7 @@ void ImuseDigiSndMgr::countElements(byte *ptr, int &numRegions, int &numJumps, i
do {
tag = READ_BE_UINT32(ptr); ptr += 4;
- switch(tag) {
+ switch (tag) {
case MKID_BE('TEXT'):
case MKID_BE('STOP'):
case MKID_BE('FRMT'):
@@ -154,7 +154,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) {
}
offset += 4;
len >>= 8;
- switch(code) {
+ switch (code) {
case 0:
quit = true;
break;
@@ -211,7 +211,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) {
do {
tag = READ_BE_UINT32(ptr); ptr += 4;
- switch(tag) {
+ switch (tag) {
case MKID_BE('FRMT'):
ptr += 12;
sound->bits = READ_BE_UINT32(ptr); ptr += 4;
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 7dfe6fa782..e078d56c22 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -331,7 +331,7 @@ void ScummEngine::processKbd(bool smushMode) {
if (_voiceMode == 3)
_voiceMode = 0;
- switch(_voiceMode) {
+ switch (_voiceMode) {
case 0:
sprintf(buf, "Speech Only");
ConfMan.setBool("speech_mute", false);
diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index 64566fe628..35ad7004a3 100644
--- a/engines/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
@@ -501,7 +501,7 @@ int32 Insane::calcBenDamage(bool arg_0, bool arg_4) {
void Insane::actor02Reaction(int32 buttons) {
int32 tmp, tmp2;
- switch(_actor[0].act[2].state) {
+ switch (_actor[0].act[2].state) {
case 1:
smlayer_setActorLayer(0, 2, 5);
_actor[0].weaponClass = 2;
diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index 1c3830154b..ec38aa9fe8 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -178,7 +178,7 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) {
break;
}
} else {
- switch(_vm->_rnd.getRandomNumber(14)) {
+ switch (_vm->_rnd.getRandomNumber(14)) {
case 2:
if (!_enemyState[EN_ROTT1][2]) {
_enemyState[EN_ROTT1][2] = 1;
@@ -342,7 +342,7 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) {
break;
}
} else {
- switch(_vm->_rnd.getRandomNumber(14)) {
+ switch (_vm->_rnd.getRandomNumber(14)) {
case 2:
if (!_enemyState[EN_ROTT2][2]) {
_enemyState[EN_ROTT2][2] = 1;
@@ -1353,7 +1353,7 @@ void Insane::actor11Reaction(int32 buttons) {
chooseEnemyWeaponAnim(buttons);
- switch(_actor[1].tilt) {
+ switch (_actor[1].tilt) {
case -3:
if (_actor[1].act[1].state != 41 || _actor[1].weaponClass != _actor[1].animWeaponClass) {
setEnemyAnimation(1, 6);
@@ -1617,7 +1617,7 @@ void Insane::setEnemyState(void) {
void Insane::actor12Reaction(int32 buttons) {
int32 tmp, tmp2;
- switch(_actor[1].act[2].state) {
+ switch (_actor[1].act[2].state) {
case 1:
smlayer_setActorLayer(1, 2, 5);
_actor[1].weaponClass = 2;
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 343299425f..52a54edee8 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -344,7 +344,7 @@ int Insane::loadSceneData(int scene, int flag, int phase) {
break;
case 3:
case 13:
- switch(_currEnemy) {
+ switch (_currEnemy) {
case EN_TORQUE:
smlayer_loadSound(59, flag, phase);
smlayer_loadSound(93, flag, phase);
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index d1e8c3d912..ffb19d7650 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -824,7 +824,7 @@ Common::String ScummEngine::generateFilename(const int room) const {
if (_heV7DiskOffsets)
disk = _heV7DiskOffsets[room];
- switch(disk) {
+ switch (disk) {
case 2:
id = 'b';
snprintf(buf, sizeof(buf), "%s.(b)", _filenamePattern.pattern);
diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index 7f409bce20..2d457e0d85 100644
--- a/engines/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
@@ -65,7 +65,7 @@ uint32 BaseChunk::getSize() const {
}
bool BaseChunk::seek(int32 delta, seek_type dir) {
- switch(dir) {
+ switch (dir) {
case seek_cur:
_curPos += delta;
break;
diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp
index ba323c03f2..0078237c30 100644
--- a/engines/scumm/smush/codec37.cpp
+++ b/engines/scumm/smush/codec37.cpp
@@ -519,7 +519,7 @@ void Codec37Decoder::decode(byte *dst, const byte *src) {
maketable(pitch, src[1]);
int32 tmp;
- switch(src[0]) {
+ switch (src[0]) {
case 0:
if ((_deltaBufs[_curtable] - _deltaBuf) > 0) {
memset(_deltaBuf, 0, _deltaBufs[_curtable] - _deltaBuf);
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index 5e44492a8e..e7cb767c46 100644
--- a/engines/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
@@ -573,7 +573,7 @@ bool Codec47Decoder::decode(byte *dst, const byte *src) {
gfx_data += 32896;
}
- switch(src[2]) {
+ switch (src[2]) {
case 0:
memcpy(_curBuf, gfx_data, _frameSize);
break;
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index 76a10a9e9e..9afbfe8d47 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -140,7 +140,7 @@ bool ImuseChannel::handleStop(Chunk &src) {
bool ImuseChannel::handleMap(Chunk &map) {
while (!map.eof()) {
Chunk *sub = map.subBlock();
- switch(sub->getType()) {
+ switch (sub->getType()) {
case TYPE_FRMT:
handleFormat(*sub);
break;
@@ -213,7 +213,7 @@ bool ImuseChannel::handleSubTags(int32 &offset) {
Chunk::type type = READ_BE_UINT32(_tbuffer + offset);
uint32 size = READ_BE_UINT32(_tbuffer + offset + 4);
uint32 available_size = _tbufferSize - offset;
- switch(type) {
+ switch (type) {
case TYPE_MAP_:
_inData = false;
if (available_size >= (size + 8)) {
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 9969ac4bc9..662da3ee76 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -52,7 +52,7 @@ bool SaudChannel::handleSubTags(int32 &offset) {
uint32 size = READ_BE_UINT32(_tbuffer + offset + 4);
uint32 available_size = _tbufferSize - offset;
- switch(type) {
+ switch (type) {
case TYPE_STRK:
_inData = false;
if (available_size >= (size + 8)) {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index ba51b472da..8b22e42867 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -227,7 +227,7 @@ void SmushPlayer::timerCallback(void *refCon) {
((SmushPlayer *)refCon)->_inTimerCount++;
#endif
#ifdef __SYMBIAN32__
- if(((SmushPlayer *)refCon)->_closeOnTextTick) {
+ if (((SmushPlayer *)refCon)->_closeOnTextTick) {
delete ((SmushPlayer *)refCon)->_base;
((SmushPlayer *)refCon)->_base = NULL;
((SmushPlayer *)refCon)->_closeOnTextTick = false;
@@ -313,7 +313,7 @@ void SmushPlayer::release() {
#ifdef __SYMBIAN32__
_closeOnTextTick = true;
// Wait for _closeOnTextTick to be set to false to indicate file closure
- while(_closeOnTextTick) {
+ while (_closeOnTextTick) {
User::After(15624);
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 04:48:37 +0000