aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects
diff options
context:
space:
mode:
authorEugene Sandulenko2018-06-20 13:58:00 +0200
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commitc3e1157d18022795f23b37a876ae51e31c38adba (patch)
treecafefec29b7db1e84511a17426432b602a68f4e5 /engines/pink/objects
parent5142ed203c241386b620237d7fd8814d9273dac2 (diff)
downloadscummvm-rg350-c3e1157d18022795f23b37a876ae51e31c38adba.tar.gz
scummvm-rg350-c3e1157d18022795f23b37a876ae51e31c38adba.tar.bz2
scummvm-rg350-c3e1157d18022795f23b37a876ae51e31c38adba.zip
PINK: JANITORIAL: More formatting fixes
Diffstat (limited to 'engines/pink/objects')
-rw-r--r--engines/pink/objects/actions/action.cpp2
-rw-r--r--engines/pink/objects/actions/action_play_with_sfx.cpp2
-rw-r--r--engines/pink/objects/actors/actor.cpp2
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp6
-rw-r--r--engines/pink/objects/inventory.h2
-rw-r--r--engines/pink/objects/pages/game_page.cpp10
-rw-r--r--engines/pink/objects/sequences/seq_timer.cpp2
-rw-r--r--engines/pink/objects/sequences/sequence.cpp4
-rw-r--r--engines/pink/objects/sequences/sequence_context.cpp2
-rw-r--r--engines/pink/objects/walk/walk_mgr.cpp2
10 files changed, 17 insertions, 17 deletions
diff --git a/engines/pink/objects/actions/action.cpp b/engines/pink/objects/actions/action.cpp
index 24233ad253..6a306b94c7 100644
--- a/engines/pink/objects/actions/action.cpp
+++ b/engines/pink/objects/actions/action.cpp
@@ -28,7 +28,7 @@ namespace Pink {
void Action::deserialize(Archive &archive) {
NamedObject::deserialize(archive);
- _actor = static_cast<Actor*>(archive.readObject());
+ _actor = static_cast<Actor *>(archive.readObject());
}
bool Action::initPalette(Director *director) {
diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp
index 2e94098f39..b70cb56086 100644
--- a/engines/pink/objects/actions/action_play_with_sfx.cpp
+++ b/engines/pink/objects/actions/action_play_with_sfx.cpp
@@ -74,7 +74,7 @@ void ActionSfx::deserialize(Pink::Archive &archive) {
_volume = archive.readDWORD();
assert(_volume <= 100);
_sfxName = archive.readString();
- _sprite = (ActionPlayWithSfx*) archive.readObject();
+ _sprite = (ActionPlayWithSfx *)archive.readObject();
}
void ActionSfx::toConsole() {
diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp
index 0fc6e89a3c..4a70e1daef 100644
--- a/engines/pink/objects/actors/actor.cpp
+++ b/engines/pink/objects/actors/actor.cpp
@@ -41,7 +41,7 @@ Actor::~Actor() {
void Actor::deserialize(Archive &archive) {
NamedObject::deserialize(archive);
- _page = static_cast<Page*>(archive.readObject());
+ _page = static_cast<Page *>(archive.readObject());
_actions.deserialize(archive);
}
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 4168568b98..872428d926 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -41,9 +41,9 @@ LeadActor::LeadActor()
void LeadActor::deserialize(Archive &archive) {
_state = kReady;
Actor::deserialize(archive);
- _cursorMgr = static_cast<CursorMgr*>(archive.readObject());
- _walkMgr = static_cast<WalkMgr*>(archive.readObject());
- _sequencer = static_cast<Sequencer*>(archive.readObject());
+ _cursorMgr = static_cast<CursorMgr *>(archive.readObject());
+ _walkMgr = static_cast<WalkMgr *>(archive.readObject());
+ _sequencer = static_cast<Sequencer *>(archive.readObject());
}
void LeadActor::toConsole() {
diff --git a/engines/pink/objects/inventory.h b/engines/pink/objects/inventory.h
index c9357fc62a..15c21bf153 100644
--- a/engines/pink/objects/inventory.h
+++ b/engines/pink/objects/inventory.h
@@ -62,7 +62,7 @@ public:
bool start(bool paused);
void setLeadActor(LeadActor *lead) { _lead = lead; }
- InventoryItem* findInventoryItem(const Common::String &name);
+ InventoryItem *findInventoryItem(const Common::String &name);
bool isPinkOwnsAnyItems();
void setItemOwner(const Common::String &owner, InventoryItem *item);
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp
index 4c05da012e..5b69be1dd3 100644
--- a/engines/pink/objects/pages/game_page.cpp
+++ b/engines/pink/objects/pages/game_page.cpp
@@ -50,8 +50,8 @@ void GamePage::toConsole() {
void GamePage::deserialize(Archive &archive) {
Page::deserialize(archive);
- _module = static_cast<Module*>(archive.readObject());
- assert(dynamic_cast<Module*>(_module) != 0);
+ _module = static_cast<Module *>(archive.readObject());
+ assert(dynamic_cast<Module *>(_module) != 0);
}
void GamePage::load(Archive &archive) {
@@ -62,7 +62,7 @@ void GamePage::load(Archive &archive) {
Page::load(archive);
- _leadActor = static_cast<LeadActor*>(archive.readObject());
+ _leadActor = static_cast<LeadActor *>(archive.readObject());
_walkMgr->deserialize(archive);
_sequencer->deserialize(archive);
@@ -131,7 +131,7 @@ void GamePage::setVariable(Common::String &variable, Common::String &value) {
}
void GamePage::loadStateFromMem() {
- Archive archive(static_cast<Common::SeekableReadStream*>(_memFile));
+ Archive archive(static_cast<Common::SeekableReadStream *>(_memFile));
_variables.deserialize(archive);
for (uint i = 0; i < _actors.size(); ++i) {
@@ -141,7 +141,7 @@ void GamePage::loadStateFromMem() {
void GamePage::saveStateToMem() {
_memFile = new Common::MemoryReadWriteStream(DisposeAfterUse::YES);
- Archive archive(static_cast<Common::WriteStream*>(_memFile));
+ Archive archive(static_cast<Common::WriteStream *>(_memFile));
_variables.serialize(archive);
for (uint i = 0; i < _actors.size(); ++i) {
diff --git a/engines/pink/objects/sequences/seq_timer.cpp b/engines/pink/objects/sequences/seq_timer.cpp
index 8d639acb85..c1eff0765f 100644
--- a/engines/pink/objects/sequences/seq_timer.cpp
+++ b/engines/pink/objects/sequences/seq_timer.cpp
@@ -38,7 +38,7 @@ void SeqTimer::deserialize(Archive &archive) {
_actor = archive.readString();
_period = archive.readDWORD();
_range = archive.readDWORD();
- _sequencer = static_cast<Sequencer*>(archive.readObject());
+ _sequencer = static_cast<Sequencer *>(archive.readObject());
}
void SeqTimer::toConsole() {
diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp
index a700e99196..3c0c69d269 100644
--- a/engines/pink/objects/sequences/sequence.cpp
+++ b/engines/pink/objects/sequences/sequence.cpp
@@ -45,7 +45,7 @@ Sequence::~Sequence() {
void Sequence::deserialize(Archive &archive) {
NamedObject::deserialize(archive);
- _sequencer = static_cast<Sequencer*>(archive.readObject());
+ _sequencer = static_cast<Sequencer *>(archive.readObject());
_items.deserialize(archive);
}
@@ -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/objects/sequences/sequence_context.cpp b/engines/pink/objects/sequences/sequence_context.cpp
index 2e48554325..2c8d10d7fb 100644
--- a/engines/pink/objects/sequences/sequence_context.cpp
+++ b/engines/pink/objects/sequences/sequence_context.cpp
@@ -46,7 +46,7 @@ SequenceContext::SequenceContext(Sequence *sequence)
_segment(1), _actor(nullptr)
{
sequence->setContext(this);
- Common::Array<SequenceItem*> &items = sequence->getItems();
+ Common::Array<SequenceItem *> &items = sequence->getItems();
debug("SequenceContext for %s", _sequence->getName().c_str());
for (uint i = 0; i < items.size(); ++i) {
diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp
index 7e88ac95cf..e9d2bb06c9 100644
--- a/engines/pink/objects/walk/walk_mgr.cpp
+++ b/engines/pink/objects/walk/walk_mgr.cpp
@@ -98,7 +98,7 @@ WalkAction *WalkMgr::getWalkAction() {
Action *action = _leadActor->findAction(walkActionName);
- return static_cast<WalkAction*>(action);
+ return static_cast<WalkAction *>(action);
}
double WalkMgr::getLengthBetweenLocations(WalkLocation *first, WalkLocation *second) {