From 10621fded8eee2da03a2a9f93bfa1546bcb7c748 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 9 Jun 2012 17:51:58 +1000 Subject: TONY: Fix some calls from globalFree to globalDestroy --- engines/tony/custom.cpp | 2 +- engines/tony/mpal/mpal.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 7482ac0db8..858479ca7f 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -1949,7 +1949,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg delete _ctx->text; } - globalFree(_ctx->string); + globalDestroy(_ctx->string); CORO_END_CODE; } diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 4aac53bb8e..9f9a4c203b 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -911,7 +911,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { unlockItems(); /* We don't need the item list anymore */ - globalFree(_ctx->il); + globalDestroy(_ctx->il); /* Here's the main loop */ @@ -2108,7 +2108,7 @@ int mpalLoadState(byte *buf) { GLOBALS.nVars = READ_LE_UINT32(buf); - GLOBALS.hVars = globalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE, GLOBALS.nVars * sizeof(MPALVAR)); + GLOBALS.hVars = globalAllocate(GMEM_ZEROINIT | GMEM_MOVEABLE, GLOBALS.nVars * sizeof(MPALVAR)); lockVar(); copyMemory((byte *)GLOBALS.lpmvVars, buf + 4, GLOBALS.nVars * sizeof(MPALVAR)); unlockVar(); -- cgit v1.2.3