diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/pink/archive.cpp | 208 | ||||
-rw-r--r-- | engines/pink/cel_decoder.cpp | 2 | ||||
-rw-r--r-- | engines/pink/file.cpp | 4 | ||||
-rw-r--r-- | engines/pink/objects/actors/supporting_actor.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler_mgr.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/module.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/walk/walk_shortest_path.cpp | 2 |
8 files changed, 112 insertions, 112 deletions
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp index c5737ba840..2c156c2dc9 100644 --- a/engines/pink/archive.cpp +++ b/engines/pink/archive.cpp @@ -104,110 +104,110 @@ static const struct RuntimeClass { {"WalkLocation", kWalkLocation} }; -static Object* createObject(int objectId){ - switch (objectId){ - case kActionHide: - return new ActionHide; - case kActionLoop: - return new ActionLoop; - case kActionPlay: - return new ActionPlay; - case kActionPlayWithSfx: - return new ActionPlayWithSfx; - case kActionSfx: - return new ActionSfx; - case kActionSound: - return new ActionSound; - case kActionStill: - return new ActionStill; - case kActionTalk: - return new ActionTalk; - case kActionText: - return new ActionText; - case kActor: - return new Actor; - case kAudioInfoPDAButton: - return new AudioInfoPDAButton; - case kConditionGameVariable: - return new ConditionGameVariable; - case kConditionInventoryItemOwner: - return new ConditionInventoryItemOwner; - case kConditionModuleVariable: - return new ConditionModuleVariable; - case kConditionNotInventoryItemOwner: - return new ConditionNotInventoryItemOwner; - case kConditionNotModuleVariable: - return new ConditionNotModuleVariable; - case kConditionNotPageVariable: - return new ConditionNotPageVariable; - case kConditionPageVariable: - return new ConditionPageVariable; - case kCursorActor: - return new CursorActor; - case kGamePage: - return new GamePage; - case kHandlerLeftClick: - return new HandlerLeftClick; - case kHandlerStartPage: - return new HandlerStartPage; - case kHandlerTimer: - case kHandlerTimerActions: - return new HandlerTimerActions; // hack for Peril, but behavior is correct - case kHandlerTimerSequences: - return new HandlerTimerSequences; - case kHandlerUseClick: - return new HandlerUseClick; - case kInventoryActor: - return new InventoryActor; - case kInventoryItem: - return new InventoryItem; - case kLeadActor: - return new LeadActor; - case kModuleProxy: - return new ModuleProxy; - case kPDAButtonActor: - return new PDAButtonActor; - case kParlSqPink: - return new ParlSqPink; - case kPubPink: - return new PubPink; - case kSeqTimer: - return new SeqTimer; - case kSequence: - return new Sequence; - case kSequenceAudio: - return new SequenceAudio; - case kSequenceItem: - return new SequenceItem; - case kSequenceItemDefaultAction: - return new SequenceItemDefaultAction; - case kSequenceItemLeader: - return new SequenceItemLeader; - case kSequenceItemLeaderAudio: - return new SequenceItemLeaderAudio; - case kSideEffectExit: - return new SideEffectExit; - case kSideEffectGameVariable: - return new SideEffectGameVariable; - case kSideEffectInventoryItemOwner: - return new SideEffectInventoryItemOwner; - case kSideEffectLocation: - return new SideEffectLocation; - case kSideEffectModuleVariable: - return new SideEffectModuleVariable; - case kSideEffectPageVariable: - return new SideEffectPageVariable; - case kSideEffectRandomPageVariable: - return new SideEffectRandomPageVariable; - case kSupportingActor: - return new SupportingActor; - case kWalkAction: - return new WalkAction; - case kWalkLocation: - return new WalkLocation; - default: - error("Unknown object id"); - return nullptr; +static Object* createObject(int objectId) { + switch (objectId) { + case kActionHide: + return new ActionHide; + case kActionLoop: + return new ActionLoop; + case kActionPlay: + return new ActionPlay; + case kActionPlayWithSfx: + return new ActionPlayWithSfx; + case kActionSfx: + return new ActionSfx; + case kActionSound: + return new ActionSound; + case kActionStill: + return new ActionStill; + case kActionTalk: + return new ActionTalk; + case kActionText: + return new ActionText; + case kActor: + return new Actor; + case kAudioInfoPDAButton: + return new AudioInfoPDAButton; + case kConditionGameVariable: + return new ConditionGameVariable; + case kConditionInventoryItemOwner: + return new ConditionInventoryItemOwner; + case kConditionModuleVariable: + return new ConditionModuleVariable; + case kConditionNotInventoryItemOwner: + return new ConditionNotInventoryItemOwner; + case kConditionNotModuleVariable: + return new ConditionNotModuleVariable; + case kConditionNotPageVariable: + return new ConditionNotPageVariable; + case kConditionPageVariable: + return new ConditionPageVariable; + case kCursorActor: + return new CursorActor; + case kGamePage: + return new GamePage; + case kHandlerLeftClick: + return new HandlerLeftClick; + case kHandlerStartPage: + return new HandlerStartPage; + case kHandlerTimer: + case kHandlerTimerActions: + return new HandlerTimerActions; // hack for Peril, but behavior is correct + case kHandlerTimerSequences: + return new HandlerTimerSequences; + case kHandlerUseClick: + return new HandlerUseClick; + case kInventoryActor: + return new InventoryActor; + case kInventoryItem: + return new InventoryItem; + case kLeadActor: + return new LeadActor; + case kModuleProxy: + return new ModuleProxy; + case kPDAButtonActor: + return new PDAButtonActor; + case kParlSqPink: + return new ParlSqPink; + case kPubPink: + return new PubPink; + case kSeqTimer: + return new SeqTimer; + case kSequence: + return new Sequence; + case kSequenceAudio: + return new SequenceAudio; + case kSequenceItem: + return new SequenceItem; + case kSequenceItemDefaultAction: + return new SequenceItemDefaultAction; + case kSequenceItemLeader: + return new SequenceItemLeader; + case kSequenceItemLeaderAudio: + return new SequenceItemLeaderAudio; + case kSideEffectExit: + return new SideEffectExit; + case kSideEffectGameVariable: + return new SideEffectGameVariable; + case kSideEffectInventoryItemOwner: + return new SideEffectInventoryItemOwner; + case kSideEffectLocation: + return new SideEffectLocation; + case kSideEffectModuleVariable: + return new SideEffectModuleVariable; + case kSideEffectPageVariable: + return new SideEffectPageVariable; + case kSideEffectRandomPageVariable: + return new SideEffectRandomPageVariable; + case kSupportingActor: + return new SupportingActor; + case kWalkAction: + return new WalkAction; + case kWalkLocation: + return new WalkLocation; + default: + error("Unknown object id"); + return nullptr; } } diff --git a/engines/pink/cel_decoder.cpp b/engines/pink/cel_decoder.cpp index 4e5b8a08fe..5dbe9430c0 100644 --- a/engines/pink/cel_decoder.cpp +++ b/engines/pink/cel_decoder.cpp @@ -86,7 +86,7 @@ void CelDecoder::setEndOfTrack() { } CelDecoder::CelVideoTrack::CelVideoTrack(Common::SeekableReadStream *stream, uint16 frameCount, uint16 width, uint16 height, bool skipHeader) - : FlicVideoTrack(stream, frameCount, width, height, 1), _center(0,0), _transparentColourIndex(0){ + : FlicVideoTrack(stream, frameCount, width, height, 1), _center(0,0), _transparentColourIndex(0) { readHeader(); } diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp index 17968d36ea..34a7218642 100644 --- a/engines/pink/file.cpp +++ b/engines/pink/file.cpp @@ -100,13 +100,13 @@ static int objDescComp(const void *a, const void *b) { return scumm_stricmp((char *) a, (char *) b); } -ObjectDescription *OrbFile::getObjDesc(const char *name){ +ObjectDescription *OrbFile::getObjDesc(const char *name) { ObjectDescription *desc = (ObjectDescription*) bsearch(name, _table, _tableSize, sizeof(ObjectDescription), objDescComp); assert(desc != nullptr); return desc; } -ResourceDescription *OrbFile::createResDescTable(ObjectDescription *objDesc){ +ResourceDescription *OrbFile::createResDescTable(ObjectDescription *objDesc) { ResourceDescription *table = new ResourceDescription[objDesc->resourcesCount]; seek(objDesc->resourcesOffset); diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp index 826226712b..426b358628 100644 --- a/engines/pink/objects/actors/supporting_actor.cpp +++ b/engines/pink/objects/actors/supporting_actor.cpp @@ -55,7 +55,7 @@ bool SupportingActor::isUseClickHandlers(InventoryItem *item) { } void SupportingActor::onMouseOver(Common::Point point, CursorMgr *mgr) { - if (isLeftClickHandlers()){ + if (isLeftClickHandlers()) { if (!_cursor.empty()) mgr->setCursor(_cursor, point); else diff --git a/engines/pink/objects/handlers/handler_mgr.cpp b/engines/pink/objects/handlers/handler_mgr.cpp index cf5b6ca004..e68b63e243 100644 --- a/engines/pink/objects/handlers/handler_mgr.cpp +++ b/engines/pink/objects/handlers/handler_mgr.cpp @@ -55,7 +55,7 @@ bool HandlerMgr::isLeftClickHandler(Actor *actor) { return false; } -bool HandlerMgr::isUseClickHandler(Actor *actor, const Common::String &itemName){ +bool HandlerMgr::isUseClickHandler(Actor *actor, const Common::String &itemName) { for (uint i = 0; i < _useClickHandlers.size(); ++i) { if (itemName == _useClickHandlers[i]->getInventoryItem() && _useClickHandlers[i]->isSuitable(actor)) diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp index 859b96a6be..ddf124a194 100644 --- a/engines/pink/objects/inventory.cpp +++ b/engines/pink/objects/inventory.cpp @@ -76,7 +76,7 @@ bool InventoryMgr::isPinkOwnsAnyItems() { return true; for (uint i = 0; i < _items.size(); ++i) { - if (_items[i]->getCurrentOwner() == _lead->getName()){ + if (_items[i]->getCurrentOwner() == _lead->getName()) { _item = _items[i]; return true; } diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index ec17105b58..b1f10873ae 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -41,7 +41,7 @@ Module::~Module() { } } -void Module::load(Archive &archive){ +void Module::load(Archive &archive) { archive.mapObject(this); NamedObject::deserialize(archive); diff --git a/engines/pink/objects/walk/walk_shortest_path.cpp b/engines/pink/objects/walk/walk_shortest_path.cpp index 4f16f54328..9bc86d14ab 100644 --- a/engines/pink/objects/walk/walk_shortest_path.cpp +++ b/engines/pink/objects/walk/walk_shortest_path.cpp @@ -74,7 +74,7 @@ WalkLocation *WalkShortestPath::build() { } WalkLocation *WalkShortestPath::getNearestNeighbor(WalkLocation *location) { - for(uint i = 0; i < _visited.size(); ++i){ + for(uint i = 0; i < _visited.size(); ++i) { if (_visited[i] == location) return _nearestNeigbor[i]; } |