4 files changed, 1 insertions, 25 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 4917834fb1..3b17823f44 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -98,15 +98,6 @@ enum {
 		s->visual->print(s->visual, 0);
 #endif
 
-#define ASSERT(x) { \
-	int val = !!(x); \
-	if (!val) { \
-		error("Fatal error condition on \"" #x "\""); \
-		BREAKPOINT(); \
-		vm_handle_fatal_error(s, __LINE__, __FILE__); \
-	} \
-}
-
 static inline int sign_extend_byte(int value) {
 	if (value & 0x80)
 		return value - 256;
diff --git a/engines/sci/engine/memobj.cpp b/engines/sci/engine/memobj.cpp
index f3af7ea20c..37f9a3659c 100644
--- a/engines/sci/engine/memobj.cpp
+++ b/engines/sci/engine/memobj.cpp
@@ -303,9 +303,7 @@ void CloneTable::listAllOutgoingReferences(reg_t addr, void *param, NoteCallback
 //	assert(addr.segment == _segId);
 
 	if (!clone_table->isValidEntry(addr.offset)) {
-		warning("Unexpected request for outgoing references from clone at %04x:%04x", PRINT_REG(addr));
-//		BREAKPOINT();
-		return;
+		error("Unexpected request for outgoing references from clone at %04x:%04x", PRINT_REG(addr));
 	}
 
 	clone = &(clone_table->_table[addr.offset]);
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 30e9114e30..6d190ccf41 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -462,10 +462,6 @@ ExecStack *add_exec_stack_entry(EngineState *s, reg_t pc, StackPtr sp, reg_t obj
 #  define kernel_matches_signature(a, b, c, d) 1
 #endif
 
-void vm_handle_fatal_error(EngineState *s, int line, const char *file) {
-	error("Fatal VM error in %s, L%d; aborting...", file, line);
-}
-
 static reg_t pointer_add(EngineState *s, reg_t base, int offset) {
 	MemObject *mobj = s->segMan->getMemObject(base.segment);
 
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index c4670b6a08..57fad31c8f 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -395,15 +395,6 @@ ExecStack *add_exec_stack_varselector(EngineState *s, reg_t objp, int argc,
 void run_vm(EngineState *s, int restoring);
 
 /**
- * Handles a fatal error condition
- * @param[in] s		The state to recover from
- * @param[in] line	Source code line number the error occured in
- * @param[in] file	File the error occured in
- */
-void vm_handle_fatal_error(EngineState *s, int line, const char *file);
-
-
-/**
  * Debugger functionality
  * @param[in] s					The state at which debugging should take place
  * @param[in] bp				Flag, set to true when a breakpoint is triggered