3 files changed, 26 insertions, 26 deletions

diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index ea22cfd3db..fffefde5db 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -39,51 +39,51 @@ namespace Sword25 {
 #define BS_LOG_PREFIX "MOVIEPLAYER"
 
 BS_Service *BS_OggTheora_CreateObject(BS_Kernel *pKernel) {
-	return new BS_MoviePlayer(pKernel);
+	return new MoviePlayer(pKernel);
 }
 
-BS_MoviePlayer::BS_MoviePlayer(BS_Kernel *pKernel) : BS_Service(pKernel) {
+MoviePlayer::MoviePlayer(BS_Kernel *pKernel) : BS_Service(pKernel) {
 	if (!_RegisterScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
 	else
 		BS_LOGLN("Script bindings registered.");
 }
 
-bool BS_MoviePlayer::LoadMovie(const Common::String &Filename, unsigned int Z) {
+bool MoviePlayer::LoadMovie(const Common::String &Filename, unsigned int Z) {
 	return true;
 }
 
-bool BS_MoviePlayer::UnloadMovie() {
+bool MoviePlayer::UnloadMovie() {
 	return true;
 }
 
-bool BS_MoviePlayer::Play() {
+bool MoviePlayer::Play() {
 	return true;
 }
 
-bool BS_MoviePlayer::Pause() {
+bool MoviePlayer::Pause() {
 	return true;
 }
 
-void BS_MoviePlayer::Update() {
+void MoviePlayer::Update() {
 }
 
-bool BS_MoviePlayer::IsMovieLoaded() {
+bool MoviePlayer::IsMovieLoaded() {
 	return true;
 }
 
-bool BS_MoviePlayer::IsPaused() {
+bool MoviePlayer::IsPaused() {
 	return true;
 }
 
-float BS_MoviePlayer::GetScaleFactor() {
+float MoviePlayer::GetScaleFactor() {
 	return 1.0f;
 }
 
-void BS_MoviePlayer::SetScaleFactor(float ScaleFactor) {
+void MoviePlayer::SetScaleFactor(float ScaleFactor) {
 }
 
-double BS_MoviePlayer::GetTime() {
+double MoviePlayer::GetTime() {
 	return 1.0;
 }
 
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h
index 08d0012388..ceb7c6dad9 100644
--- a/engines/sword25/fmv/movieplayer.h
+++ b/engines/sword25/fmv/movieplayer.h
@@ -48,14 +48,14 @@ namespace Sword25 {
 // Class definitions
 // -----------------------------------------------------------------------------
 
-class BS_MoviePlayer : public BS_Service {
+class MoviePlayer : public BS_Service {
 public:
 	// -----------------------------------------------------------------------------
 	// Constructor / Destructor
 	// -----------------------------------------------------------------------------
 
-	BS_MoviePlayer(BS_Kernel *pKernel);
-	~BS_MoviePlayer() {};
+	MoviePlayer(BS_Kernel *pKernel);
+	~MoviePlayer() {};
 
 	// -----------------------------------------------------------------------------
 	// Abstract interface must be implemented by each Movie Player
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index 523cc2d4f3..dcf5cd334b 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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
 	FMVPtr->Update();
@@ -101,7 +101,7 @@ int Update(lua_State *L) {
 // -------------------------------------------------------------------------
 
 int IsMovieLoaded(lua_State *L) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_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) {
-	BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushnumber(L, FMVPtr->GetTime());
@@ -171,7 +171,7 @@ const luaL_reg LIBRARY_FUNCTIONS[] = {
 	{ 0, 0 }
 };
 
-bool BS_MoviePlayer::_RegisterScriptBindings() {
+bool MoviePlayer::_RegisterScriptBindings() {
 	BS_Kernel *pKernel = BS_Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	BS_ScriptEngine *pScript = static_cast<BS_ScriptEngine *>(pKernel->GetService("script"));