diff options
| author | Eugene Sandulenko | 2014-01-02 16:03:39 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-02 16:03:39 +0200 |
| commit | c42648fd00265aadf2708558b8b7d9ef75e613fe (patch) | |
| tree | c0c2b458debb61936aff2f11cffe6cb956a6c54d /engines/fullpipe/scenes | |
| parent | e1b19375708a1af89ec621bb91228cdff4964fdd (diff) | |
| download | scummvm-rg350-c42648fd00265aadf2708558b8b7d9ef75e613fe.tar.gz scummvm-rg350-c42648fd00265aadf2708558b8b7d9ef75e613fe.tar.bz2 scummvm-rg350-c42648fd00265aadf2708558b8b7d9ef75e613fe.zip | |
FULLPIPE: Plug scene20 in
Diffstat (limited to 'engines/fullpipe/scenes')
| -rw-r--r-- | engines/fullpipe/scenes/scene20.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp index 0dc24df702..c10ff2e6b8 100644 --- a/engines/fullpipe/scenes/scene20.cpp +++ b/engines/fullpipe/scenes/scene20.cpp @@ -32,7 +32,7 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" - +#include "fullpipe/floaters.h" namespace Fullpipe { @@ -56,19 +56,19 @@ void scene20_initScene(Scene *sc) { g_fp->setObjectState(sO_Grandma, g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe)); if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnStool)) { - StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STOOL); + g_vars->scene20_grandma->changeStatics2(ST_GMA20_STOOL); } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor)) { - StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_FLOOR); + g_vars->scene20_grandma->changeStatics2(ST_GMA20_FLOOR); } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe) || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) { - StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STAND); + g_vars->scene20_grandma->changeStatics2(ST_GMA20_STAND); } else { - StaticANIObject_hide(g_vars->scene20_grandma); + g_vars->scene20_grandma->hide(); } scene20_setExits(sc); - g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_20")); + g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_20")); for (int i = 0; i < 3; i++) { g_fp->_floaters->genFlies(sc, g_fp->_rnd->getRandomNumber(101) + 70, g_fp->_rnd->getRandomNumber(51) + 175, 100, 0); |