diff options
author | David Corrales | 2007-05-31 23:44:43 +0000 |
---|---|---|
committer | David Corrales | 2007-05-31 23:44:43 +0000 |
commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
tree | 9e6580328542f1db230e019ba77e3db1be8fa50b /engines/cine/rel.cpp | |
parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
Diffstat (limited to 'engines/cine/rel.cpp')
-rw-r--r-- | engines/cine/rel.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp index 2586882ff8..03ab5e44b2 100644 --- a/engines/cine/rel.cpp +++ b/engines/cine/rel.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -58,7 +59,7 @@ void releaseObjectScripts(void) { void loadRel(char *pRelName) { uint16 numEntry; uint16 i; - byte *ptr; + byte *ptr, *dataPtr; checkDataDisk(-1); @@ -70,7 +71,7 @@ void loadRel(char *pRelName) { } } - ptr = readBundleFile(findFileInBundle(pRelName)); + ptr = dataPtr = readBundleFile(findFileInBundle(pRelName)); setMouseCursor(MOUSE_CURSOR_DISK); @@ -95,6 +96,8 @@ void loadRel(char *pRelName) { ptr += relTable[i].size; } } + + free(dataPtr); #ifdef DUMP_SCRIPTS |