diff options
| author | Eugene Sandulenko | 2010-07-31 11:49:39 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:15:10 +0000 |
| commit | bed623b11ef007bb46b26f1f995b6073914383c5 (patch) | |
| tree | 823c2cf9aeea3e45256f2e08cbdf147c76aa1eb9 /engines/sword25/fmv | |
| parent | 6a55700935983efc0d7e9fd37563c14dcc199027 (diff) | |
| download | scummvm-rg350-bed623b11ef007bb46b26f1f995b6073914383c5.tar.gz scummvm-rg350-bed623b11ef007bb46b26f1f995b6073914383c5.tar.bz2 scummvm-rg350-bed623b11ef007bb46b26f1f995b6073914383c5.zip | |
SWORD25: Fix compilation
svn-id: r53193
Diffstat (limited to 'engines/sword25/fmv')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 13 | ||||
| -rw-r--r-- | engines/sword25/fmv/movieplayer.h | 2 | ||||
| -rw-r--r-- | engines/sword25/fmv/movieplayer_script.cpp | 31 |
3 files changed, 20 insertions, 26 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 20a780f201..bfba6d1b7a 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -32,20 +32,17 @@ * */ -// ----------------------------------------------------------------------------- -// Includes -// ----------------------------------------------------------------------------- - #include "sword25/fmv/movieplayer.h" -#define BS_LOG_PREFIX "MOVIEPLAYER" +namespace Sword25 { -// ----------------------------------------------------------------------------- +#define BS_LOG_PREFIX "MOVIEPLAYER" -BS_MoviePlayer::BS_MoviePlayer(BS_Kernel * pKernel) : BS_Service(pKernel) -{ +BS_MoviePlayer::BS_MoviePlayer(BS_Kernel * pKernel) : BS_Service(pKernel) { if (!_RegisterScriptBindings()) BS_LOG_ERRORLN("Script bindings could not be registered."); else BS_LOGLN("Script bindings registered."); } + +} // End of namespace Sword25 diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h index 365ec99af5..9988b5e182 100644 --- a/engines/sword25/fmv/movieplayer.h +++ b/engines/sword25/fmv/movieplayer.h @@ -71,7 +71,7 @@ public: * @param Z Z indicates the position of the film on the main graphics layer * @return Returns false if an error occured while loading, otherwise true. */ - virtual bool LoadMovie(const std::string & Filename, unsigned int Z) = 0; + virtual bool LoadMovie(const Common::String &Filename, unsigned int Z) = 0; /** * Unloads the currently loaded movie file. diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp index b04cff35f7..f95dc90b1d 100644 --- a/engines/sword25/fmv/movieplayer_script.cpp +++ b/engines/sword25/fmv/movieplayer_script.cpp @@ -43,9 +43,7 @@ #include "sword25/fmv/movieplayer.h" -namespace -{ - // ------------------------------------------------------------------------- +namespace Sword25 { int LoadMovie(lua_State * L) { @@ -171,21 +169,18 @@ namespace const luaL_reg LIBRARY_FUNCTIONS[] = { - "LoadMovie", LoadMovie, - "UnloadMovie", UnloadMovie, - "Play", Play, - "Pause", Pause, - "Update", Update, - "IsMovieLoaded", IsMovieLoaded, - "IsPaused", IsPaused, - "GetScaleFactor", GetScaleFactor, - "SetScaleFactor", SetScaleFactor, - "GetTime", GetTime, - 0, 0, + { "LoadMovie", LoadMovie }, + { "UnloadMovie", UnloadMovie }, + { "Play", Play }, + { "Pause", Pause }, + { "Update", Update }, + { "IsMovieLoaded", IsMovieLoaded }, + { "IsPaused", IsPaused }, + { "GetScaleFactor", GetScaleFactor }, + { "SetScaleFactor", SetScaleFactor }, + { "GetTime", GetTime }, + { 0, 0 } }; -} - -// ----------------------------------------------------------------------------- bool BS_MoviePlayer::_RegisterScriptBindings() { @@ -200,3 +195,5 @@ bool BS_MoviePlayer::_RegisterScriptBindings() return true; } + +} // End of namespace Sword25 |