From 581f950e10b40f2af4ede56c3fa78f13eccb610b Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 2 Dec 2011 22:49:54 +0200
Subject: Fix script error reporting a bit

---
 src/server.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index b8bdd8830..e345d8811 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -982,7 +982,7 @@ Server::Server(
 	if(!success){
 		errorstream<<"Server: Failed to load and run "
 				<<builtinpath<<std::endl;
-		assert(0);
+		exit(1);
 	}
 	// Load and run "mod" scripts
 	core::list<ModSpec> mods = getMods(m_modspaths);
@@ -991,11 +991,11 @@ Server::Server(
 		ModSpec mod = *i;
 		infostream<<"Server: Loading mod \""<<mod.name<<"\""<<std::endl;
 		std::string scriptpath = mod.path + DIR_DELIM + "init.lua";
-		bool success = script_load(m_lua, scriptpath.c_str());
+		bool success = scriptapi_loadmod(m_lua, scriptpath, mod.name);
 		if(!success){
 			errorstream<<"Server: Failed to load and run "
 					<<scriptpath<<std::endl;
-			assert(0);
+			exit(1);
 		}
 	}
 	
-- 
cgit v1.2.3