diff options
| author | Jonathan Gray | 2004-07-31 13:34:43 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2004-07-31 13:34:43 +0000 |
| commit | 59c88e428b044914fefc48fa6c7bc1e3ac569de7 (patch) | |
| tree | 5ff5ddc47984d602a02ac40a8e22d8221f8e9f1c /saga/sfuncs.cpp | |
| parent | d53a852c16c45bc75861ce793171cd37436e3ad2 (diff) | |
| download | scummvm-rg350-59c88e428b044914fefc48fa6c7bc1e3ac569de7.tar.gz scummvm-rg350-59c88e428b044914fefc48fa6c7bc1e3ac569de7.tar.bz2 scummvm-rg350-59c88e428b044914fefc48fa6c7bc1e3ac569de7.zip | |
merge animation.h and animation_mod.h into a class
svn-id: r14388
Diffstat (limited to 'saga/sfuncs.cpp')
| -rw-r--r-- | saga/sfuncs.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index ddfa77ee25..d98558cdc4 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -26,11 +26,12 @@ #include "reinherit.h" #include "actor_mod.h" -#include "animation_mod.h" +#include "animation.h" #include "console_mod.h" #include "interface_mod.h" #include "text_mod.h" +#include "saga.h" #include "script.h" #include "sfuncs.h" @@ -272,8 +273,8 @@ int SF_startAnim(R_SCRIPTFUNC_PARAMS) { frame_count = SDATA_ReadWordS(frame_parm); anim_id = SDATA_ReadWordS(anim_id_parm); - if (ANIM_Play(anim_id, 0) != R_SUCCESS) { - CON_Print(S_WARN_PREFIX "SF.26: ANIM_Play() failed. Anim id: %u\n", anim_id); + if (_vm->_anim->play(anim_id, 0) != R_SUCCESS) { + CON_Print(S_WARN_PREFIX "SF.26: Anim::play() failed. Anim id: %u\n", anim_id); return R_FAILURE; } @@ -487,8 +488,8 @@ int SF_linkAnim(R_SCRIPTFUNC_PARAMS) { anim_id1 = SDATA_ReadWordU(anim1_parm); anim_id2 = SDATA_ReadWordU(anim2_parm); - if (ANIM_Link(anim_id1, anim_id2) != R_SUCCESS) { - CON_Print(S_WARN_PREFIX "SF.41: ANIM_Link() failed. (%u->%u)\n", anim_id1, anim_id2); + if (_vm->_anim->link(anim_id1, anim_id2) != R_SUCCESS) { + CON_Print(S_WARN_PREFIX "SF.41: Anim::link() failed. (%u->%u)\n", anim_id1, anim_id2); return R_FAILURE; } |