Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-10-13 17:58:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kichikuou
2024-12-20 13:59:30 +09:00
parent b000fecf92
commit 24c6041915
6 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/scenario.cpp
+9 -9
View File
@@ -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';
}