diff options
| author | Peter Kohaut | 2016-10-08 21:06:22 +0200 |
|---|---|---|
| committer | Peter Kohaut | 2016-10-08 21:06:22 +0200 |
| commit | f30f3c46e38d91729983a36e87f629d6b3a47a34 (patch) | |
| tree | 5f1026a7fdbb339ffbe15cd0c02a1b1970538433 /engines/bladerunner/script | |
| parent | c934941e4f1d72723924f6f6fb7b76712784ff82 (diff) | |
| download | scummvm-rg350-f30f3c46e38d91729983a36e87f629d6b3a47a34.tar.gz scummvm-rg350-f30f3c46e38d91729983a36e87f629d6b3a47a34.tar.bz2 scummvm-rg350-f30f3c46e38d91729983a36e87f629d6b3a47a34.zip | |
BLADERUNNER: added item pickup effect
also added support for rendering items on screen (not in the world)
pickup effect can be tested in debug compilation by clicking on any object (not item, but object like, hydrant, or doors) in first scene
Diffstat (limited to 'engines/bladerunner/script')
| -rw-r--r-- | engines/bladerunner/script/rc01.cpp | 3 | ||||
| -rw-r--r-- | engines/bladerunner/script/script.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/bladerunner/script/rc01.cpp b/engines/bladerunner/script/rc01.cpp index d94f104403..ebb67b75f3 100644 --- a/engines/bladerunner/script/rc01.cpp +++ b/engines/bladerunner/script/rc01.cpp @@ -202,6 +202,9 @@ bool ScriptRC01::MouseClick(int x, int y) { } bool ScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { +#if _DEBUG + Item_Pickup_Spin_Effect(938, 426, 316); +#endif if (Object_Query_Click("BARICADE01", objectName) || Object_Query_Click("BARICADE03", objectName) || Object_Query_Click("BARICADE04", objectName) diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 8c6afc6b16..9e11402b5f 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -34,6 +34,8 @@ #include "bladerunner/combat.h" #include "bladerunner/gameflags.h" #include "bladerunner/gameinfo.h" +#include "bladerunner/items.h" +#include "bladerunner/item_pickup.h" #include "bladerunner/movement_track.h" #include "bladerunner/settings.h" #include "bladerunner/set_effects.h" @@ -47,7 +49,6 @@ #include "bladerunner/script/ai_00_mccoy.h" #include "bladerunner/script/aiscript_officer_leroy.h" -#include "bladerunner/items.h" namespace BladeRunner { @@ -680,9 +681,8 @@ void ScriptBase::Item_Flag_As_Non_Target(int itemId) { warning("Item_Flag_As_Non_Target(%d)", itemId); } -void ScriptBase::Item_Pickup_Spin_Effect(int a1, int a2, int a3) { - //TODO - warning("Item_Pickup_Spin_Effect(%d, %d, %d)", a1, a2, a3); +void ScriptBase::Item_Pickup_Spin_Effect(int animationId, int x, int y) { + _vm->_itemPickup->setup(animationId, x, y); } int ScriptBase::Animation_Open() { |