aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/pink/cel_decoder.cpp2
-rw-r--r--engines/pink/file.cpp2
-rw-r--r--engines/pink/objects/actions/action_sound.cpp4
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp8
-rw-r--r--engines/pink/objects/actors/pda_button_actor.cpp6
-rw-r--r--engines/pink/objects/inventory.cpp2
-rw-r--r--engines/pink/objects/sequences/sequence.cpp2
-rw-r--r--engines/pink/resource_mgr.cpp2
-rw-r--r--engines/pink/sound.cpp2
9 files changed, 15 insertions, 15 deletions
diff --git a/engines/pink/cel_decoder.cpp b/engines/pink/cel_decoder.cpp
index 77aedc459b..a9f15935d0 100644
--- a/engines/pink/cel_decoder.cpp
+++ b/engines/pink/cel_decoder.cpp
@@ -212,7 +212,7 @@ bool CelDecoder::CelVideoTrack::rewind() {
// 2) I changed behaviour of endOfTrack
_nextFrameStartTime = 0;
- if (_curFrame >= (int) _frameCount - 1 && _fileStream->pos() < _fileStream->size())
+ if (_curFrame >= (int)_frameCount - 1 && _fileStream->pos() < _fileStream->size())
_atRingFrame = true;
else
_fileStream->seek(_offsetFrame1);
diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp
index c0a24c10b4..f399634f43 100644
--- a/engines/pink/file.cpp
+++ b/engines/pink/file.cpp
@@ -38,7 +38,7 @@ void ResourceDescription::load(Common::File &file) {
offset = file.readUint32LE();
size = file.readUint32LE();
- inBro = (bool) file.readUint16LE();
+ inBro = (bool)file.readUint16LE();
}
OrbFile::OrbFile()
diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp
index 9f12297adb..0dcfa85cd7 100644
--- a/engines/pink/objects/actions/action_sound.cpp
+++ b/engines/pink/objects/actions/action_sound.cpp
@@ -40,8 +40,8 @@ void ActionSound::deserialize(Archive &archive) {
_fileName = archive.readString();
_volume = archive.readDWORD();
assert(_volume <= 100);
- _isLoop = (bool) archive.readDWORD();
- _isBackground = (bool) archive.readDWORD();
+ _isLoop = (bool)archive.readDWORD();
+ _isBackground = (bool)archive.readDWORD();
}
void ActionSound::toConsole() {
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 872428d926..4d07106cbb 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -54,10 +54,10 @@ void LeadActor::toConsole() {
}
void LeadActor::loadState(Archive &archive) {
- _state = (State) archive.readByte();
- _nextState = (State) archive.readByte();
- _stateBeforeInventory = (State) archive.readByte();
- _stateBeforePDA = (State) archive.readByte();
+ _state = (State)archive.readByte();
+ _nextState = (State)archive.readByte();
+ _stateBeforeInventory = (State)archive.readByte();
+ _stateBeforePDA = (State)archive.readByte();
_isHaveItem = archive.readByte();
Common::String recepient = archive.readString();
if (!recepient.empty())
diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp
index 6369394d72..240d51a705 100644
--- a/engines/pink/objects/actors/pda_button_actor.cpp
+++ b/engines/pink/objects/actors/pda_button_actor.cpp
@@ -32,8 +32,8 @@ void PDAButtonActor::deserialize(Archive &archive) {
Actor::deserialize(archive);
_x = archive.readDWORD();
_y = archive.readDWORD();
- _hideOnStop = (bool) archive.readDWORD();
- _opaque = (bool) archive.readDWORD();
+ _hideOnStop = (bool)archive.readDWORD();
+ _opaque = (bool)archive.readDWORD();
int type = archive.readDWORD();
assert(type != 0);
@@ -43,7 +43,7 @@ void PDAButtonActor::deserialize(Archive &archive) {
void PDAButtonActor::toConsole() {
debug("PDAButtonActor: _name = %s, _x = %u _y = %u _hideOnStop = %u, _opaque = %u, _commandType = %u, _arg = %s",
- _name.c_str(), _x, _y, _hideOnStop, _opaque, (int) _command.type, _command.arg.c_str());
+ _name.c_str(), _x, _y, _hideOnStop, _opaque, (int)_command.type, _command.arg.c_str());
}
void PDAButtonActor::onClick() {
diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp
index ddf124a194..f6682f17c7 100644
--- a/engines/pink/objects/inventory.cpp
+++ b/engines/pink/objects/inventory.cpp
@@ -189,7 +189,7 @@ void InventoryMgr::showNextItem(bool direction) {
}
void InventoryMgr::loadState(Archive &archive) {
- _state = (State) archive.readByte();
+ _state = (State)archive.readByte();
_isClickedOnItem = archive.readByte();
for (uint i = 0; i < _items.size(); ++i) {
diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp
index 3c0c69d269..7e5a3a2677 100644
--- a/engines/pink/objects/sequences/sequence.cpp
+++ b/engines/pink/objects/sequences/sequence.cpp
@@ -144,7 +144,7 @@ void SequenceAudio::start(bool loadingSave) {
Sequence::start(loadingSave);
uint index = _context->getNextItemIndex();
if (index < _items.size()) {
- SequenceItemLeaderAudio *leaderAudio = (SequenceItemLeaderAudio *) _items[index];
+ SequenceItemLeaderAudio *leaderAudio = (SequenceItemLeaderAudio *)_items[index];
_sample = leaderAudio->getSample();
}
}
diff --git a/engines/pink/resource_mgr.cpp b/engines/pink/resource_mgr.cpp
index 90cf4aa109..65b6c00868 100644
--- a/engines/pink/resource_mgr.cpp
+++ b/engines/pink/resource_mgr.cpp
@@ -62,7 +62,7 @@ Common::String ResourceMgr::loadText(Common::String &name) {
}
static int resDescComp(const void *a, const void *b) {
- return scumm_stricmp((char *) a, (char *) b);
+ return scumm_stricmp((char *)a, (char *)b);
}
Common::SafeSeekableSubReadStream *ResourceMgr::getResourceStream(const Common::String &name) {
diff --git a/engines/pink/sound.cpp b/engines/pink/sound.cpp
index 5771951e3e..2580125827 100644
--- a/engines/pink/sound.cpp
+++ b/engines/pink/sound.cpp
@@ -34,7 +34,7 @@ void Sound::play(Common::SafeSeekableSubReadStream *stream, Audio::Mixer::SoundT
// Vox files in pink have wave format.
// RIFF (little-endian) data, WAVE audio, Microsoft PCM, 8 bit, mono 22050 Hz
- volume = ((int) volume * 255) / 100;
+ volume = ((int)volume * 255) / 100;
Audio::Mixer *mixer = g_system->getMixer();
mixer->stopHandle(_handle);