Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

This commit is contained in:
thrust26 2018-09-02 17:48:02 +02:00
commit f607fab9bb
4 changed files with 7 additions and 4 deletions

View File

@ -59,6 +59,7 @@
"iostream": "cpp",
"cstdint": "cpp",
"ostream": "cpp",
"__memory": "cpp"
"__memory": "cpp",
"iosfwd": "cpp"
}
}

View File

@ -256,7 +256,7 @@ ZipHandler::zip_error ZipHandler::zip_file_open(const char* filename, zip_file**
goto error;
}
strcpy_s(string, strlen(filename) + 1, filename);
strncpy(string, filename, strlen(filename) + 1);
newzip->filename = string;
*zip = newzip;

View File

@ -689,7 +689,7 @@ void PromptWidget::textPaste()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PromptWidget::addToHistory(const char* str)
{
strncpy_s(_history[_historyIndex], str, kLineBufferSize - 1);
strncpy(_history[_historyIndex], str, kLineBufferSize - 1);
_historyIndex = (_historyIndex + 1) % kHistorySize;
_historyLine = 0;

View File

@ -1242,7 +1242,9 @@ void TIA::cycle(uInt32 colorClocks)
if (++myHctr >= 228)
nextLine();
myAudio.tick();
#ifdef SOUND_SUPPORT
myAudio.tick();
#endif
++myTimestamp;
}