diff options
author | Matthew Stewart | 2018-07-03 23:55:30 -0400 |
---|---|---|
committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
commit | 8c71f2db84b06862b4fefbe3e79fb042e7a60666 (patch) | |
tree | 7391b512e479707aa14d6855606f00454f3e5662 /engines/startrek/startrek.cpp | |
parent | 051ea8c238510db03505cd146025c1db441ace84 (diff) | |
download | scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.tar.gz scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.tar.bz2 scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.zip |
STARTREK: Make Action struct POD again
Diffstat (limited to 'engines/startrek/startrek.cpp')
-rw-r--r-- | engines/startrek/startrek.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp index db664011fc..876c1f6389 100644 --- a/engines/startrek/startrek.cpp +++ b/engines/startrek/startrek.cpp @@ -459,7 +459,7 @@ void StarTrekEngine::updateActorAnimations() { if (nextAnimFrame == actor->numAnimFrames - 1) { actor->field62++; if (actor->triggerActionWhenAnimFinished) { - addAction(Action(ACTION_FINISHED_ANIMATION, actor->finishedAnimActionParam, 0, 0)); + addAction(ACTION_FINISHED_ANIMATION, actor->finishedAnimActionParam, 0, 0); } } } @@ -530,7 +530,7 @@ void StarTrekEngine::updateActorAnimations() { if (actor->iwSrcPosition == -1) { if (actor->triggerActionWhenAnimFinished) { actor->triggerActionWhenAnimFinished = false; - addAction(Action(ACTION_FINISHED_WALKING, actor->finishedAnimActionParam & 0xff, 0, 0)); + addAction(ACTION_FINISHED_WALKING, actor->finishedAnimActionParam & 0xff, 0, 0); } actor->sprite.bitmap.reset(); @@ -1056,15 +1056,15 @@ int StarTrekEngine::selectObjectForUseAction() { return clickedObject; else if (isObjectUnusable(OBJECT_KIRK, ACTION_USE)) continue; - else if (_room->actionHasCode(Action(ACTION_USE, OBJECT_KIRK, clickedObject, 0)) - || _room->actionHasCode(Action(ACTION_GET, clickedObject, 0, 0)) - || _room->actionHasCode(Action(ACTION_WALK, clickedObject, 0, 0))) { + else if (_room->actionHasCode(ACTION_USE, OBJECT_KIRK, clickedObject, 0) + || _room->actionHasCode(ACTION_GET, clickedObject, 0, 0) + || _room->actionHasCode(ACTION_WALK, clickedObject, 0, 0)) { _awayMission.activeObject = OBJECT_KIRK; _awayMission.passiveObject = clickedObject; _awayMission.activeAction = ACTION_USE; clickedObject = OBJECT_KIRK; if (!walkActiveObjectToHotspot()) - addAction(Action(_awayMission.activeAction, _awayMission.activeObject, _awayMission.passiveObject, 0)); + addAction(_awayMission.activeAction, _awayMission.activeObject, _awayMission.passiveObject, 0); return clickedObject; } else @@ -1160,7 +1160,7 @@ bool StarTrekEngine::walkActiveObjectToHotspot() { else { // If this action has code defined for it in this room, buffer the action to be // done after the object finished walking there. - Action action(_awayMission.activeAction, _awayMission.activeObject, 0, 0); + Action action = {_awayMission.activeAction, _awayMission.activeObject, 0, 0}; if (_awayMission.activeAction == ACTION_USE) action.b2 = _awayMission.passiveObject; |