diff options
| author | Max Horn | 2010-07-01 16:04:29 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-01 16:04:29 +0000 |
| commit | 3f429d64a2ef826782bf9af8971ba397b0e2743c (patch) | |
| tree | 8f366f8353dfc1a4badb420d6f9cf434171b00b4 /engines/sci/engine/kernel32.cpp | |
| parent | e309f05162b3b49b3236ebd8faaed124d9c5862a (diff) | |
| download | scummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.tar.gz scummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.tar.bz2 scummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.zip | |
SCI: Rename some variables to match our naming conventions
svn-id: r50549
Diffstat (limited to 'engines/sci/engine/kernel32.cpp')
| -rw-r--r-- | engines/sci/engine/kernel32.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index 1773046308..5975c7b3bc 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -609,13 +609,13 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) { if (argv[1].segment == s->_segMan->getSysStringsSegment()) { // Resize if necessary const uint16 sysStringId = argv[1].toUint16(); - if ((uint32)s->_segMan->sysStrings->_strings[sysStringId]._maxSize < index1 + count) { - free(s->_segMan->sysStrings->_strings[sysStringId]._value); - s->_segMan->sysStrings->_strings[sysStringId]._maxSize = index1 + count; - s->_segMan->sysStrings->_strings[sysStringId]._value = (char *)calloc(index1 + count, sizeof(char)); + if ((uint32)s->_segMan->_sysStrings->_strings[sysStringId]._maxSize < index1 + count) { + free(s->_segMan->_sysStrings->_strings[sysStringId]._value); + s->_segMan->_sysStrings->_strings[sysStringId]._maxSize = index1 + count; + s->_segMan->_sysStrings->_strings[sysStringId]._value = (char *)calloc(index1 + count, sizeof(char)); } - strncpy(s->_segMan->sysStrings->_strings[sysStringId]._value + index1, string2 + index2, count); + strncpy(s->_segMan->_sysStrings->_strings[sysStringId]._value + index1, string2 + index2, count); } else { SciString *string1 = s->_segMan->lookupString(argv[1]); |