From 71f6fede6030fcb6e9e05024146eac0840a8ba18 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 26 Dec 2009 14:58:23 +0000
Subject: Removed the file and line parameters from the selector handling
 functions

svn-id: r46588
---
 engines/sci/engine/selector.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/sci/engine/selector.cpp')

diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp
index f0cf03bb79..5d7d46c4a7 100644
--- a/engines/sci/engine/selector.cpp
+++ b/engines/sci/engine/selector.cpp
@@ -28,7 +28,7 @@
 
 namespace Sci {
 
-reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id, const char *file, int line) {
+reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id) {
 	ObjVarRef address;
 
 	if (lookup_selector(segMan, object, selector_id, &address, NULL) != kSelectorVariable)
@@ -37,24 +37,24 @@ reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id, cons
 		return *address.getPointer(segMan);
 }
 
-void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_t value, const char *fname, int line) {
+void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_t value) {
 	ObjVarRef address;
 
 	if ((selector_id < 0) || (selector_id > (int)((SciEngine*)g_engine)->getKernel()->getSelectorNamesSize())) {
 		warning("Attempt to write to invalid selector %d of"
-		         " object at %04x:%04x (%s L%d).", selector_id, PRINT_REG(object), fname, line);
+		         " object at %04x:%04x.", selector_id, PRINT_REG(object));
 		return;
 	}
 
 	if (lookup_selector(segMan, object, selector_id, &address, NULL) != kSelectorVariable)
 		warning("Selector '%s' of object at %04x:%04x could not be"
-		         " written to (%s L%d)", ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object), fname, line);
+		         " written to", ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object));
 	else
 		*address.getPointer(segMan) = value;
 }
 
 int invoke_selector(EngineState *s, reg_t object, int selector_id, SelectorInvocation noinvalid, 
-	StackPtr k_argp, int k_argc, const char *fname, int line, int argc, ...) {
+	StackPtr k_argp, int k_argc, int argc, ...) {
 	va_list argp;
 	int i;
 	int framesize = 2 + 1 * argc;
@@ -68,8 +68,8 @@ int invoke_selector(EngineState *s, reg_t object, int selector_id, SelectorInvoc
 	slc_type = lookup_selector(s->_segMan, object, selector_id, NULL, &address);
 
 	if (slc_type == kSelectorNone) {
-		warning("Selector '%s' of object at %04x:%04x could not be invoked (%s L%d)",
-		         s->_kernel->getSelectorName(selector_id).c_str(), PRINT_REG(object), fname, line);
+		warning("Selector '%s' of object at %04x:%04x could not be invoked",
+		         s->_kernel->getSelectorName(selector_id).c_str(), PRINT_REG(object));
 		if (noinvalid == kStopOnInvalidSelector)
 			error("[Kernel] Not recoverable: VM was halted");
 		return 1;
-- 
cgit v1.2.3