libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PINK: JANITORIAL: More whitespace fixes

Browse Source
This commit is contained in:
Eugene Sandulenko 2018-06-20 14:02:01 +02:00
parent c3e1157d18
commit a224e41edc
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/pink/cel_decoder.cpp
View File

@ -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);

2
engines/pink/file.cpp
View File

@ -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()

4
engines/pink/objects/actions/action_sound.cpp
View File

@ -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() {

8
engines/pink/objects/actors/lead_actor.cpp
View File

@ -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())

6
engines/pink/objects/actors/pda_button_actor.cpp
View File

@ -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() {

2
engines/pink/objects/inventory.cpp
View File

@ -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) {

2
engines/pink/objects/sequences/sequence.cpp
View File

@ -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();
}
}

2
engines/pink/resource_mgr.cpp
View File

@ -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) {

2
engines/pink/sound.cpp
View File

@ -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);