Merge branch 'hotfix' into devel

dgets · dgets · commit da0e3b69b3f5 · 2015-06-24T10:49:07.000-07:00
diff --git a/load/dmbase.js b/load/dmbase.js
@@ -787,15 +787,18 @@ msg_base = {
 	  console.putmsg("mBase.last_msg = " + mBase.last_msg + "\n");
 	}
 	
-	if (forward) {inc = 1;} else {inc = -1;}
+	if (forward) {
+            inc = 1;
+        } else {
+            inc = -1;
+        }
 	
 	// if starting in reverse from the room prompt, unskip one message
 	if (!forward) {
             tmpPtr += 1;  // so we start with the most recently read
                           // message.  In all other cases we want to skip one.
         }
 	
-	
 	if (userSettings.debug.message_scan) {
 	  console.putmsg("Inc: " + inc + "\tbased on forward\n");
 	}

Original file line number	Diff line number	Diff line change
`@@ -787,15 +787,18 @@ msg_base = {`
`787`	`787`	`console.putmsg("mBase.last_msg = " + mBase.last_msg + "\n");`
`788`	`788`	`}`
`789`	`789`
`790`		`- if (forward) {inc = 1;} else {inc = -1;}`
	`790`	`+ if (forward) {`
	`791`	`+ inc = 1;`
	`792`	`+ } else {`
	`793`	`+ inc = -1;`
	`794`	`+ }`
`791`	`795`
`792`	`796`	`// if starting in reverse from the room prompt, unskip one message`
`793`	`797`	`if (!forward) {`
`794`	`798`	`tmpPtr += 1; // so we start with the most recently read`
`795`	`799`	`// message. In all other cases we want to skip one.`
`796`	`800`	`}`
`797`	`801`
`798`		`-`
`799`	`802`	`if (userSettings.debug.message_scan) {`
`800`	`803`	`console.putmsg("Inc: " + inc + "\tbased on forward\n");`
`801`	`804`	`}`