From 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Sun, 7 Aug 2011 21:33:32 +1000 Subject: BADA: Initial BADA port implementation --- engines/engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/engine.cpp b/engines/engine.cpp index ee1d53fa9c..5bbff81981 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -21,7 +21,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_getcwd -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(BADA) #define WIN32_LEAN_AND_MEAN #include #include -- cgit v1.2.3 From d6f7e5933657e2e6fcbd1accf9f8a4b77454daec Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Mon, 8 Aug 2011 20:57:28 +1000 Subject: BADA: Avoid calling malloc with new_size=0 --- engines/scumm/smush/channel.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'engines') diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp index 7f71d0549b..f5e0747ba8 100644 --- a/engines/scumm/smush/channel.cpp +++ b/engines/scumm/smush/channel.cpp @@ -94,14 +94,16 @@ void SmushChannel::processBuffer() { _tbufferSize = 0; } else { if (offset) { - byte *old = _tbuffer; int32 new_size = _tbufferSize - offset; - _tbuffer = (byte *)malloc(new_size); - if (!_tbuffer) - error("smush channel failed to allocate memory"); - memcpy(_tbuffer, old + offset, new_size); - _tbufferSize = new_size; - free(old); + if (new_size) { + byte *old = _tbuffer; + _tbuffer = (byte *)malloc(new_size); + if (!_tbuffer) + error("smush channel failed to allocate memory"); + memcpy(_tbuffer, old + offset, new_size); + _tbufferSize = new_size; + free(old); + } } } } -- cgit v1.2.3 From 8a2243ff36fc7938018cc17ce1da5e20ae2d4409 Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Wed, 17 Aug 2011 08:50:26 +1000 Subject: BADA: Remove BADA defined check. Was a temp fix for simulator build --- engines/engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/engine.cpp b/engines/engine.cpp index 5bbff81981..ee1d53fa9c 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -21,7 +21,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_getcwd -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(BADA) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) #define WIN32_LEAN_AND_MEAN #include #include -- cgit v1.2.3