3rdParty: update mupen64plus-core

This commit is contained in:
Rosalie Wanders committed 2023-08-27 19:18:30 +02:00
1 parent 010035d697
commit 2d64acdcfe
2 files changed
+7 -7

No files matched your search

+4 -4
View File
@@ -4,9 +4,9 @@
; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
;
[subrepo]
remote = git@github.com:mupen64plus/mupen64plus-core.git
branch = master
commit = 7d02ab97bd13be9b1b58ee11a1d3df6919d89f17
parent = 422f7d08015d8964d39b878ad2a4b6807bb64f9a
remote = git@github.com:/Rosalie241/mupen64plus-core.git
branch = memchr
commit = 6f926b6a9026f100020cb350e5e28aee68d34e4c
parent = 010035d697d2514e5a19ed9e6c9344e67fad7478
method = merge
cmdver = 0.4.6
@@ -67,9 +67,9 @@ void write_is_viewer(void* opaque, uint32_t address, uint32_t value, uint32_t ma
memcpy(&is_viewer->output_buffer[is_viewer->buffer_pos], &is_viewer->data[0x20], word);
is_viewer->buffer_pos += word;
/* process new lines in buffer to prevent empty debug messages without losing data */
char* newline = strchr(is_viewer->output_buffer, '\n');
char* newline = memchr(is_viewer->output_buffer, '\n', is_viewer->buffer_pos);
while (newline)
{
size_t index = (newline - is_viewer->output_buffer) + 1;
@@ -77,7 +77,7 @@ void write_is_viewer(void* opaque, uint32_t address, uint32_t value, uint32_t ma
DebugMessage(M64MSG_INFO, "IS64: %s", is_viewer->output_buffer);
memcpy(&is_viewer->output_buffer, &is_viewer->output_buffer[index], IS_BUFFER_SIZE - index);
is_viewer->buffer_pos -= index;
newline = strchr(is_viewer->output_buffer, '\n');
newline = memchr(is_viewer->output_buffer, '\n', is_viewer->buffer_pos);
}
}
}