diff options
| author | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
| commit | 66e81d633f987310f12038147ae01b8ce4f640f7 (patch) | |
| tree | 6035a7124789c3e6cdff5f603e9933529b7efdc7 /engines/kyra/debugger.cpp | |
| parent | affaa1f4d6cf5f27f654029133b1aec7b9eca4b5 (diff) | |
| parent | 72da8ef5adf82d8a65da299207f30af5058ca8a9 (diff) | |
| download | scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.gz scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.bz2 scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'engines/kyra/debugger.cpp')
| -rw-r--r-- | engines/kyra/debugger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index e8dd9e9a15..4a48ac0674 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -71,7 +71,7 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) { } if (_vm->game() != GI_KYRA1 && _vm->resource()->getFileSize(argv[1]) != 768) { - uint8 *buffer = (uint8 *)malloc(320 * 200 * sizeof(uint8)); + uint8 *buffer = new uint8[320 * 200 * sizeof(uint8)]; if (!buffer) { DebugPrintf("ERROR: Cannot allocate buffer for screen region!\n"); return true; @@ -82,7 +82,7 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) { palette.copy(_vm->screen()->getCPagePtr(5), 0, 256); _vm->screen()->copyBlockToPage(5, 0, 0, 320, 200, buffer); - free(buffer); + delete[] buffer; } else if (!_vm->screen()->loadPalette(argv[1], palette)) { DebugPrintf("ERROR: Palette '%s' not found!\n", argv[1]); return true; |