[Scummvm-cvs-logs] SF.net SVN: scummvm:[46588] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 46588
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46588&view=rev
Author:   thebluegr
Date:     2009-12-26 14:58:23 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Removed the file and line parameters from the selector handling functions

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.h
    scummvm/trunk/engines/sci/engine/selector.cpp
    scummvm/trunk/engines/sci/gui/gui_animate.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2009-12-26 14:12:38 UTC (rev 46587)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2009-12-26 14:58:23 UTC (rev 46588)
@@ -159,7 +159,7 @@
  * This macro halts on error. 'selector' must be a selector name registered in vm.h's
  * SelectorCache and mapped in script.cpp.
  */
-#define GET_SEL32(segMan, _obj_, _slc_) read_selector(segMan, _obj_, ((SciEngine*)g_engine)->getKernel()->_selectorCache._slc_, __FILE__, __LINE__)
+#define GET_SEL32(segMan, _obj_, _slc_) read_selector(segMan, _obj_, ((SciEngine*)g_engine)->getKernel()->_selectorCache._slc_)
 #define GET_SEL32V(segMan, _obj_, _slc_) (GET_SEL32(segMan, _obj_, _slc_).offset)
 
 /**
@@ -171,7 +171,7 @@
  * This macro halts on error. 'selector' must be a selector name registered in vm.h's
  * SelectorCache and mapped in script.cpp.
  */
-#define PUT_SEL32(segMan, _obj_, _slc_, _val_) write_selector(segMan, _obj_, ((SciEngine*)g_engine)->getKernel()->_selectorCache._slc_, _val_, __FILE__, __LINE__)
+#define PUT_SEL32(segMan, _obj_, _slc_, _val_) write_selector(segMan, _obj_, ((SciEngine*)g_engine)->getKernel()->_selectorCache._slc_, _val_)
 #define PUT_SEL32V(segMan, _obj_, _slc_, _val_) PUT_SEL32(segMan, _obj_, _slc_, make_reg(0, _val_))
 
 
@@ -180,13 +180,13 @@
  * that cannot handle vararg macros.
  */
 #define INV_SEL(_object_, _selector_, _noinvalid_) \
-	s, _object_,  s->_kernel->_selectorCache._selector_, _noinvalid_, argv, argc, __FILE__, __LINE__
+	s, _object_,  s->_kernel->_selectorCache._selector_, _noinvalid_, argv, argc
 
 
-reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id, const char *fname, int line);
-void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_t value, const char *fname, int line);
+reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id);
+void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_t 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, ...);
 
 
 /******************** Text functionality ********************/

Modified: scummvm/trunk/engines/sci/engine/selector.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.cpp	2009-12-26 14:12:38 UTC (rev 46587)
+++ scummvm/trunk/engines/sci/engine/selector.cpp	2009-12-26 14:58:23 UTC (rev 46588)
@@ -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 @@
 		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 @@
 	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;

Modified: scummvm/trunk/engines/sci/gui/gui_animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_animate.cpp	2009-12-26 14:12:38 UTC (rev 46587)
+++ scummvm/trunk/engines/sci/gui/gui_animate.cpp	2009-12-26 14:58:23 UTC (rev 46588)
@@ -93,7 +93,7 @@
 		signal = GET_SEL32V(_s->_segMan, curObject, signal);
 		if (!(signal & kSignalFrozen)) {
 			// Call .doit method of that object
-			invoke_selector(_s, curObject, _s->_kernel->_selectorCache.doit, kContinueOnInvalidSelector, argv, argc, __FILE__, __LINE__, 0);
+			invoke_selector(_s, curObject, _s->_kernel->_selectorCache.doit, kContinueOnInvalidSelector, argv, argc, 0);
 			// Lookup node again, since the nodetable it was in may have been reallocated
 			curNode = _s->_segMan->lookupNode(curAddress);
 		}
@@ -466,7 +466,7 @@
 
 		if (signal & kSignalDisposeMe) {
 			// Call .delete_ method of that object
-			invoke_selector(_s, curObject, _s->_kernel->_selectorCache.delete_, kContinueOnInvalidSelector, argv, argc, __FILE__, __LINE__, 0);
+			invoke_selector(_s, curObject, _s->_kernel->_selectorCache.delete_, kContinueOnInvalidSelector, argv, argc, 0);
 		}
 		listIterator--;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.