diff options
| author | Eugene Sandulenko | 2010-08-18 12:58:22 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:59:01 +0000 |
| commit | b01994a53bbc96da907a4c28934e644184291017 (patch) | |
| tree | 7454011b38391985e9f7ce6bca101f1394d127be /engines/sword25/fmv/movieplayer_script.cpp | |
| parent | 4c4e821326a3772ad59fee836eabd5175bbb84ca (diff) | |
| download | scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.tar.gz scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.tar.bz2 scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.zip | |
SWORD25: removed BS_ prefix from rest of the classes.
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.
svn-id: r53261
Diffstat (limited to 'engines/sword25/fmv/movieplayer_script.cpp')
| -rw-r--r-- | engines/sword25/fmv/movieplayer_script.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp index a89338f224..0b96d4dc34 100644 --- a/engines/sword25/fmv/movieplayer_script.cpp +++ b/engines/sword25/fmv/movieplayer_script.cpp @@ -46,7 +46,7 @@ namespace Sword25 { int LoadMovie(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->LoadMovie(luaL_checkstring(L, 1), lua_gettop(L) == 2 ? static_cast<unsigned int>(luaL_checknumber(L, 2)) : 10)); @@ -57,7 +57,7 @@ int LoadMovie(lua_State *L) { // ------------------------------------------------------------------------- int UnloadMovie(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->UnloadMovie()); @@ -68,7 +68,7 @@ int UnloadMovie(lua_State *L) { // ------------------------------------------------------------------------- int Play(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->Play()); @@ -79,7 +79,7 @@ int Play(lua_State *L) { // ------------------------------------------------------------------------- int Pause(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->Pause()); @@ -90,7 +90,7 @@ int Pause(lua_State *L) { // ------------------------------------------------------------------------- int Update(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); FMVPtr->Update(); @@ -101,7 +101,7 @@ int Update(lua_State *L) { // ------------------------------------------------------------------------- int IsMovieLoaded(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->IsMovieLoaded()); @@ -112,7 +112,7 @@ int IsMovieLoaded(lua_State *L) { // ------------------------------------------------------------------------- int IsPaused(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushbooleancpp(L, FMVPtr->IsPaused()); @@ -123,7 +123,7 @@ int IsPaused(lua_State *L) { // ------------------------------------------------------------------------- int GetScaleFactor(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushnumber(L, FMVPtr->GetScaleFactor()); @@ -134,7 +134,7 @@ int GetScaleFactor(lua_State *L) { // ------------------------------------------------------------------------- int SetScaleFactor(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); FMVPtr->SetScaleFactor(static_cast<float>(luaL_checknumber(L, 1))); @@ -145,7 +145,7 @@ int SetScaleFactor(lua_State *L) { // ------------------------------------------------------------------------- int GetTime(lua_State *L) { - MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV(); + MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); lua_pushnumber(L, FMVPtr->GetTime()); @@ -172,7 +172,7 @@ const luaL_reg LIBRARY_FUNCTIONS[] = { }; bool MoviePlayer::_RegisterScriptBindings() { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script")); BS_ASSERT(pScript); |