aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/debugger.cpp
diff options
context:
space:
mode:
authorJulien2011-06-06 01:14:48 +0800
committerJulien2011-06-23 15:11:38 +0800
commit69c7673e53e1afd197f1e119059fc351a6daa5e0 (patch)
tree7eb105120accab2e8f5df3704283974007a5e9c9 /engines/kyra/debugger.cpp
parente610a17fc3c8956aaca4b1f68a73dbfaebb5beb0 (diff)
downloadscummvm-rg350-69c7673e53e1afd197f1e119059fc351a6daa5e0.tar.gz
scummvm-rg350-69c7673e53e1afd197f1e119059fc351a6daa5e0.tar.bz2
scummvm-rg350-69c7673e53e1afd197f1e119059fc351a6daa5e0.zip
KYRA: Allocate screen region buffer on the heap
Diffstat (limited to 'engines/kyra/debugger.cpp')
-rw-r--r--engines/kyra/debugger.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index d0baf8a133..e8dd9e9a15 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -71,11 +71,18 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) {
}
if (_vm->game() != GI_KYRA1 && _vm->resource()->getFileSize(argv[1]) != 768) {
- uint8 buffer[320*200];
+ uint8 *buffer = (uint8 *)malloc(320 * 200 * sizeof(uint8));
+ if (!buffer) {
+ DebugPrintf("ERROR: Cannot allocate buffer for screen region!\n");
+ return true;
+ }
+
_vm->screen()->copyRegionToBuffer(5, 0, 0, 320, 200, buffer);
_vm->screen()->loadBitmap(argv[1], 5, 5, 0);
palette.copy(_vm->screen()->getCPagePtr(5), 0, 256);
_vm->screen()->copyBlockToPage(5, 0, 0, 320, 200, buffer);
+
+ free(buffer);
} else if (!_vm->screen()->loadPalette(argv[1], palette)) {
DebugPrintf("ERROR: Palette '%s' not found!\n", argv[1]);
return true;