diff options
author | Peter Kohaut | 2016-10-02 00:20:56 +0200 |
---|---|---|
committer | Peter Kohaut | 2016-10-02 00:20:56 +0200 |
commit | 2c15b164d736d1339998f9dcf7a4a230984cdff5 (patch) | |
tree | 587d77b4e6ebd6d17d146c2f422057c4856983d2 /engines/bladerunner/script | |
parent | fe2add5d5fb955724af9f0308d07c46c3110baad (diff) | |
download | scummvm-rg350-2c15b164d736d1339998f9dcf7a4a230984cdff5.tar.gz scummvm-rg350-2c15b164d736d1339998f9dcf7a4a230984cdff5.tar.bz2 scummvm-rg350-2c15b164d736d1339998f9dcf7a4a230984cdff5.zip |
BLADERUNNER: added support for rendering items in scenes
Diffstat (limited to 'engines/bladerunner/script')
-rw-r--r-- | engines/bladerunner/script/script.cpp | 6 | ||||
-rw-r--r-- | engines/bladerunner/script/script.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index dd6e293163..2b944f40b8 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -46,6 +46,7 @@ #include "bladerunner/script/ai_00_mccoy.h" #include "bladerunner/script/aiscript_officer_leroy.h" +#include "bladerunner/items.h" namespace BladeRunner { @@ -631,9 +632,8 @@ void ScriptBase::Actor_Set_Immunity_To_Obstacles(int actorId, bool isImmune) { _vm->_actors[actorId]->setImmunityToObstacles(isImmune); } -void ScriptBase::Item_Add_To_World(int itemId, int animationId, int sceneIndex, float x, float y, float z, signed int angle, int height, int width, bool isTargetable, bool isObstacle, bool isPoliceMazeEnemy, bool updateOnly) { - //TODO - warning("Item_Add_To_World(%d, %d, %d, %f, %f, %f, %d, %d, %d, %d, %d, %d, %d)", itemId, animationId, sceneIndex, x, y, z, angle, height, width, isTargetable, isObstacle, isPoliceMazeEnemy, updateOnly); +void ScriptBase::Item_Add_To_World(int itemId, int animationId, int setId, float x, float y, float z, signed int facing, int height, int width, bool isTargetable, bool isObstacle, bool isPoliceMazeEnemy, bool updateOnly) { + _vm->_items->add(itemId, animationId, setId, Vector3(x, y, z), facing, height, width, isTargetable, isObstacle, isPoliceMazeEnemy, updateOnly == 0); } void ScriptBase::Item_Remove_From_World(int itemId) { diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h index 0ab9efa65f..222cd4c935 100644 --- a/engines/bladerunner/script/script.h +++ b/engines/bladerunner/script/script.h @@ -119,7 +119,7 @@ protected: void Actor_Clues_Transfer_New_From_Mainframe(int actorId); void Actor_Set_Invisible(int actorId, bool isInvisible); void Actor_Set_Immunity_To_Obstacles(int actorId, bool isImmune); - void Item_Add_To_World(int itemId, int animationId, int sceneIndex, float x, float y, float z, signed int angle, int height, int width, bool isTargetable, bool isObstacle, bool isPoliceMazeEnemy, bool updateOnly); + void Item_Add_To_World(int itemId, int animationId, int setId, float x, float y, float z, signed int facing, int height, int width, bool isTargetable, bool isObstacle, bool isPoliceMazeEnemy, bool updateOnly); void Item_Remove_From_World(int itemId); void Item_Spin_In_World(int itemId); void Item_Flag_As_Target(int itemId); |