[Scummvm-cvs-logs] SF.net SVN: scummvm:[52498] scummvm/trunk/engines/sci/engine/vm.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Sep 2 20:58:26 CEST 2010


Revision: 52498
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52498&view=rev
Author:   thebluegr
Date:     2010-09-02 18:58:25 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
SCI: Fixed compilation when VM_DEBUG_SEND is enabled

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-09-02 13:50:49 UTC (rev 52497)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-09-02 18:58:25 UTC (rev 52498)
@@ -482,17 +482,6 @@
 
 		case kSelectorMethod:
 
-#ifdef VM_DEBUG_SEND
-			if (_debugState._activeBreakpointTypes & BREAK_SELECTOREXEC)
-				g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector);
-			printf("Funcselector(");
-			for (int i = 0; i < argc; i++) {
-				printf("%04x:%04x", PRINT_REG(argp[i+1]));
-				if (i + 1 < argc)
-					printf(", ");
-			}
-			printf(") at %04x:%04x\n", PRINT_REG(funcp));
-#endif // VM_DEBUG_SEND
 #ifndef VM_DEBUG_SEND
 			if (activeBreakpointTypes & BREAK_SELECTOREXEC) {
 				if (g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector)) {
@@ -518,8 +507,18 @@
 					}
 					printf("\n");
 				}
-#endif
 			}
+#else // VM_DEBUG_SEND
+			if (activeBreakpointTypes & BREAK_SELECTOREXEC)
+				g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector);
+			printf("Funcselector(");
+			for (int i = 0; i < argc; i++) {
+				printf("%04x:%04x", PRINT_REG(argp[i+1]));
+				if (i + 1 < argc)
+					printf(", ");
+			}
+			printf(") at %04x:%04x\n", PRINT_REG(funcp));
+#endif // VM_DEBUG_SEND
 
 			{
 				CallsStruct call;


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




More information about the Scummvm-git-logs mailing list