SWORD25: Replaced BS_ASSERT() with assert()

svn-id: r55464

2 files changed, 20 insertions, 20 deletions

diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index aa854448ff..dce9048438 100644
--- a/engines/sword25/fmv/movieplayer_script.cpp
+++ b/engines/sword25/fmv/movieplayer_script.cpp
@@ -45,7 +45,7 @@ namespace Sword25 {
 
 int loadMovie(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->loadMovie(luaL_checkstring(L, 1), lua_gettop(L) == 2 ? static_cast<uint>(luaL_checknumber(L, 2)) : 10));
 
@@ -54,7 +54,7 @@ int loadMovie(lua_State *L) {
 
 int unloadMovie(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->unloadMovie());
 
@@ -63,7 +63,7 @@ int unloadMovie(lua_State *L) {
 
 int play(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->play());
 
@@ -72,7 +72,7 @@ int play(lua_State *L) {
 
 int pause(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->pause());
 
@@ -81,7 +81,7 @@ int pause(lua_State *L) {
 
 int update(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	FMVPtr->update();
 
@@ -90,7 +90,7 @@ int update(lua_State *L) {
 
 int isMovieLoaded(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->isMovieLoaded());
 
@@ -99,7 +99,7 @@ int isMovieLoaded(lua_State *L) {
 
 int isPaused(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->isPaused());
 
@@ -108,7 +108,7 @@ int isPaused(lua_State *L) {
 
 int getScaleFactor(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushnumber(L, FMVPtr->getScaleFactor());
 
@@ -117,7 +117,7 @@ int getScaleFactor(lua_State *L) {
 
 int setScaleFactor(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	FMVPtr->setScaleFactor(static_cast<float>(luaL_checknumber(L, 1)));
 
@@ -126,7 +126,7 @@ int setScaleFactor(lua_State *L) {
 
 int getTime(lua_State *L) {
 	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
-	BS_ASSERT(FMVPtr);
+	assert(FMVPtr);
 
 	lua_pushnumber(L, FMVPtr->getTime());
 
@@ -151,9 +151,9 @@ const luaL_reg LIBRARY_FUNCTIONS[] = {
 
 bool MoviePlayer::registerScriptBindings() {
 	ScriptEngine *pScript = Kernel::getInstance()->getScript();
-	BS_ASSERT(pScript);
+	assert(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
-	BS_ASSERT(L);
+	assert(L);
 
 	if (!LuaBindhelper::addFunctionsToLib(L, LIBRARY_NAME, LIBRARY_FUNCTIONS)) return false;
 
diff --git a/engines/sword25/fmv/yuvtorgba.cpp b/engines/sword25/fmv/yuvtorgba.cpp
index e9d0189265..80add1d3e0 100644
--- a/engines/sword25/fmv/yuvtorgba.cpp
+++ b/engines/sword25/fmv/yuvtorgba.cpp
@@ -167,16 +167,16 @@ static const int CLAMP_TAB[1024] = {
 void YUVtoBGRA::translate(th_ycbcr_buffer &YUVBuffer, const th_info &theoraInfo, byte *pixelData, int pixelsSize) {
 
 	// Width and height of all buffers have to be divisible by 2.
-	BS_ASSERT((YUVBuffer[0].width & 1)   == 0);
-	BS_ASSERT((YUVBuffer[0].height & 1)  == 0);
-	BS_ASSERT((YUVBuffer[1].width & 1)   == 0);
-	BS_ASSERT((YUVBuffer[2].width & 1)  == 0);
+	assert((YUVBuffer[0].width & 1)   == 0);
+	assert((YUVBuffer[0].height & 1)  == 0);
+	assert((YUVBuffer[1].width & 1)   == 0);
+	assert((YUVBuffer[2].width & 1)  == 0);
 
 	// UV images have to have a quarter of the Y image resolution
-	BS_ASSERT(YUVBuffer[1].width  == YUVBuffer[0].width >> 1);
-	BS_ASSERT(YUVBuffer[2].width  == YUVBuffer[0].width >> 1);
-	BS_ASSERT(YUVBuffer[1].height == YUVBuffer[0].height >> 1);
-	BS_ASSERT(YUVBuffer[2].height == YUVBuffer[0].height >> 1);
+	assert(YUVBuffer[1].width  == YUVBuffer[0].width >> 1);
+	assert(YUVBuffer[2].width  == YUVBuffer[0].width >> 1);
+	assert(YUVBuffer[1].height == YUVBuffer[0].height >> 1);
+	assert(YUVBuffer[2].height == YUVBuffer[0].height >> 1);
 
 	const int *cl = &CLAMP_TAB[320];