SWORD25: Replaced BS_ASSERT() with assert()

svn-id: r55464

4 files changed, 26 insertions, 28 deletions

diff --git a/engines/sword25/kernel/common.h b/engines/sword25/kernel/common.h
index 4372bf2dc5..487bfc5c78 100644
--- a/engines/sword25/kernel/common.h
+++ b/engines/sword25/kernel/common.h
@@ -54,6 +54,4 @@
 #include "sword25/kernel/common.h"
 #include "common/debug.h"
 
-#define BS_ASSERT(EXP) assert(EXP)
-
 #endif
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index c328cfdc68..7c6a683907 100644
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -139,7 +139,7 @@ Kernel::~Kernel() {
  * @param Max       The maximum allowed value
  */
 int Kernel::getRandomNumber(int min, int max) {
-	BS_ASSERT(min <= max);
+	assert(min <= max);
 
 	return min + _rnd.getRandomNumber(max - min + 1);
 }
diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index d4b9a56d8e..49ad678a00 100644
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -86,7 +86,7 @@ static int getServiceIdentifier(lua_State *L) {
 
 static int getMilliTicks(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 
 	lua_pushnumber(L, pKernel->getMilliTicks());
 
@@ -95,7 +95,7 @@ static int getMilliTicks(lua_State *L) {
 
 static int getTimer(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 
 	lua_pushnumber(L, static_cast<lua_Number>(pKernel->getMilliTicks()) / 1000.0);
 
@@ -112,23 +112,23 @@ static int startService(lua_State *L) {
 
 static int sleep(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	pKernel->sleep(static_cast<uint>(luaL_checknumber(L, 1) * 1000));
 	return 0;
 }
 
 static int crash(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	pKernel->crash();
 	return 0;
 }
 
 static int executeFile(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ScriptEngine *pSE = pKernel->getScript();
-	BS_ASSERT(pSE);
+	assert(pSE);
 
 	lua_pushbooleancpp(L, pSE->executeFile(luaL_checkstring(L, 1)));
 
@@ -370,9 +370,9 @@ static const luaL_reg WINDOW_FUNCTIONS[] = {
 
 static int precacheResource(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	lua_pushbooleancpp(L, pResource->precacheResource(luaL_checkstring(L, 1)));
 
@@ -381,9 +381,9 @@ static int precacheResource(lua_State *L) {
 
 static int forcePrecacheResource(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	lua_pushbooleancpp(L, pResource->precacheResource(luaL_checkstring(L, 1), true));
 
@@ -392,9 +392,9 @@ static int forcePrecacheResource(lua_State *L) {
 
 static int getMaxMemoryUsage(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	lua_pushnumber(L, pResource->getMaxMemoryUsage());
 
@@ -403,9 +403,9 @@ static int getMaxMemoryUsage(lua_State *L) {
 
 static int setMaxMemoryUsage(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	pResource->setMaxMemoryUsage(static_cast<uint>(lua_tonumber(L, 1)));
 
@@ -414,9 +414,9 @@ static int setMaxMemoryUsage(lua_State *L) {
 
 static int emptyCache(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	pResource->emptyCache();
 
@@ -425,9 +425,9 @@ static int emptyCache(lua_State *L) {
 
 static int isLogCacheMiss(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	lua_pushbooleancpp(L, pResource->isLogCacheMiss());
 
@@ -436,9 +436,9 @@ static int isLogCacheMiss(lua_State *L) {
 
 static int setLogCacheMiss(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	pResource->setLogCacheMiss(lua_tobooleancpp(L, 1));
 
@@ -447,9 +447,9 @@ static int setLogCacheMiss(lua_State *L) {
 
 static int dumpLockedResources(lua_State *L) {
 	Kernel *pKernel = Kernel::getInstance();
-	BS_ASSERT(pKernel);
+	assert(pKernel);
 	ResourceManager *pResource = pKernel->getResourceManager();
-	BS_ASSERT(pResource);
+	assert(pResource);
 
 	pResource->dumpLockedResources();
 
@@ -535,9 +535,9 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = {
 
 bool Kernel::registerScriptBindings() {
 	ScriptEngine *pScript = getScript();
-	BS_ASSERT(pScript);
+	assert(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
-	BS_ASSERT(L);
+	assert(L);
 
 	if (!LuaBindhelper::addFunctionsToLib(L, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false;
 	if (!LuaBindhelper::addFunctionsToLib(L, WINDOW_LIBRARY_NAME, WINDOW_FUNCTIONS)) return false;
diff --git a/engines/sword25/kernel/resource.cpp b/engines/sword25/kernel/resource.cpp
index 2ec7c6736a..f16cb3aaf2 100644
--- a/engines/sword25/kernel/resource.cpp
+++ b/engines/sword25/kernel/resource.cpp
@@ -42,7 +42,7 @@ Resource::Resource(const Common::String &fileName, RESOURCE_TYPES type) :
 	_type(type),
 	_refCount(0) {
 	PackageManager *pPM = Kernel::getInstance()->getPackage();
-	BS_ASSERT(pPM);
+	assert(pPM);
 
 	_fileName = pPM->getAbsolutePath(fileName);
 }