libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 20:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fix delete/free mismatches

Browse Source 
svn-id: r45196
This commit is contained in:
Willem Jan Palenstijn 2009-10-17 17:59:09 +00:00
parent 42dffcdcb9
commit a74fd21847
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sci/engine/savegame.cpp
View File

@ -483,7 +483,7 @@ static void sync_songlib_t(Common::Serializer &s, SongLibrary &obj) {
if (s.isLoading()) {
obj._lib = 0;
while (songcount--) {
Song *newsong = (Song *)calloc(1, sizeof(Song));
Song *newsong = new Song;
sync_song_t(s, *newsong);
obj.addSong(newsong);
}

2
engines/sci/gui/gui_cursor.cpp
View File

@ -109,7 +109,7 @@ void SciGuiCursor::setShape(GuiResourceId resourceId) {
CursorMan.replaceCursor(rawBitmap, SCI_CURSOR_SCI0_HEIGHTWIDTH, SCI_CURSOR_SCI0_HEIGHTWIDTH, hotspot.x, hotspot.y, SCI_CURSOR_SCI0_TRANSPARENCYCOLOR);
CursorMan.showMouse(true);
delete rawBitmap;
delete[] rawBitmap;
}
void SciGuiCursor::setView(GuiResourceId viewNum, int loopNum, int celNum, Common::Point *hotspot) {

2
engines/sci/sfx/songlib.cpp
View File

@ -32,6 +32,7 @@ namespace Sci {
Song::Song() {
_handle = 0;
_resourceNum = 0;
_priority = 0;
_status = SOUND_STATUS_STOPPED;
@ -51,6 +52,7 @@ Song::Song() {
Song::Song(SongHandle handle, SongIterator *it, int priority) {
_handle = handle;
_resourceNum = 0;
_priority = priority;
_status = SOUND_STATUS_STOPPED;