Encoding: Refactor mblen() to accept first byte instead of pointer

src/sys/nact.cpp

@@ -299,7 +299,7 @@ void NACT::message(uint8 terminator)
 		const uint8* begin = sco.ptr();
 		const uint8* p = begin;
 		while (is_message(*p))
-			p += encoding->mblen(p);
+			p += encoding->mblen(*p);
 		int len = p - begin;
 		sco.skip(len);
 

src/sys/nact_sys1.cpp

@@ -218,8 +218,7 @@ void NACT_Sys1::cmd_branch()
 			} else if (cmd == '\'' || cmd == '"') {  // SysEng
 				sco.skip_syseng_string(encoding.get(), cmd);
 			} else if (is_message(cmd)) {
-				sco.ungetd();
-				sco.skip(encoding->mblen(sco.ptr()));
+				sco.skip(encoding->mblen(cmd) - 1);
 			} else {
 				sco.unknown_command(cmd);
 			}

src/sys/nact_sys2.cpp

@@ -251,8 +251,7 @@ void NACT_Sys2::cmd_branch()
 			} else if (cmd == '\'' || cmd == '"') {  // SysEng
 				sco.skip_syseng_string(encoding.get(), cmd);
 			} else if (is_message(cmd)) {
-				sco.ungetd();
-				sco.skip(encoding->mblen(sco.ptr()));
+				sco.skip(encoding->mblen(cmd) - 1);
 			} else {
 				sco.unknown_command(cmd);
 			}

src/sys/scenario.cpp

@@ -19,9 +19,9 @@ uint8_t Scenario::fetch_command()
 void Scenario::skip_syseng_string(Encoding *enc, uint8_t terminator)
 {
 	for (uint8_t c = getd(); c != terminator; c = getd()) {
-		if (c != '\\')
-			ungetd();
-		skip(enc->mblen(ptr()));
+		if (c == '\\')
+			c = getd();
+		skip(enc->mblen(c) - 1);
 	}
 }
 
@@ -29,14 +29,14 @@ void Scenario::get_syseng_string(char* buf, int size, Encoding *enc, uint8_t ter
 {
 	int i = 0;
 	for (uint8_t c = getd(); c != terminator; c = getd()) {
-		if (c != '\\')
-			ungetd();
-		int len = enc->mblen(ptr());
+		if (c == '\\')
+			c = getd();
+		int len = enc->mblen(c);
 		if (i + len >= size)
 			sys_error("String buffer overrun at %d:%04x", page_, cmd_addr_);
-		memcpy(&buf[i], ptr(), len);
-		i += len;
-		skip(len);
+		buf[i++] = c;
+		for (int j = 1; j < len; ++j)
+			buf[i++] = getd();
 	}
 	buf[i] = '\0';
 }