[mw-devel] MW3 r1126 - in branches/nomud: . src

[welshbyte at sucs.org]

Author: welshbyte
Date: 2009-12-10 15:15:27 +0000 (Thu, 10 Dec 2009)
New Revision: 1126

Modified:
   branches/nomud/
   branches/nomud/src/js.c
Log:
Merge latest changes from trunk into nomud


Property changes on: branches/nomud
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:1115-1122
   + /trunk:1115-1125

Modified: branches/nomud/src/js.c
===================================================================
--- branches/nomud/src/js.c	2009-12-10 15:02:04 UTC (rev 1125)
+++ branches/nomud/src/js.c	2009-12-10 15:15:27 UTC (rev 1126)
@@ -1183,7 +1183,7 @@
 	return 0;
 }
 
-JSBool js_branch_callback(JSContext *cx, JSScript *script) {
+JSBool js_operation_callback(JSContext *cx) {
 	JSObject *global = JS_GetGlobalObject(cx);
 	if (global) {
 		if (js_interrupted==1) {
@@ -1262,7 +1262,7 @@
 	
 	/* create a callback function that is run when javascript branches backwards */
 	/* allows us to interupt looping scripts */
-	JS_SetBranchCallback(jscx, js_branch_callback);
+	JS_SetOperationCallback(jscx, js_operation_callback, 100 * JS_OPERATION_WEIGHT_BASE);
 	
 	/* initiate local stuff */