diff options
| author | Robert Göffringmann | 2004-11-11 10:14:35 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2004-11-11 10:14:35 +0000 |
| commit | 7dec7b7054db8367f48d27a319c3550ec807ac27 (patch) | |
| tree | 6539c8513a875eaa37c0de06208782e9d337aa4a /sky/mouse.cpp | |
| parent | c50560a48813ba237878af4f47854bd3bc8751b3 (diff) | |
| download | scummvm-rg350-7dec7b7054db8367f48d27a319c3550ec807ac27.tar.gz scummvm-rg350-7dec7b7054db8367f48d27a319c3550ec807ac27.tar.bz2 scummvm-rg350-7dec7b7054db8367f48d27a319c3550ec807ac27.zip | |
misc cleanup
svn-id: r15783
Diffstat (limited to 'sky/mouse.cpp')
| -rw-r--r-- | sky/mouse.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sky/mouse.cpp b/sky/mouse.cpp index bc84bcc5b3..e4a8cc2c4e 100644 --- a/sky/mouse.cpp +++ b/sky/mouse.cpp @@ -94,10 +94,10 @@ Mouse::Mouse(OSystem *system, Disk *skyDisk) { _mouseX = GAME_SCREEN_WIDTH / 2; _mouseY = GAME_SCREEN_HEIGHT / 2; - _miceData = _skyDisk->loadFile(MICE_FILE, NULL); + _miceData = _skyDisk->loadFile(MICE_FILE); //load in the object mouse file - _objectMouseData = _skyDisk->loadFile(MICE_FILE + 1, NULL); + _objectMouseData = _skyDisk->loadFile(MICE_FILE + 1); } Mouse::~Mouse( ){ @@ -106,7 +106,8 @@ Mouse::~Mouse( ){ } void Mouse::replaceMouseCursors(uint16 fileNo) { - _skyDisk->loadFile(fileNo, _objectMouseData); + free(_objectMouseData); + _objectMouseData = _skyDisk->loadFile(fileNo); } bool Mouse::fnAddHuman(void) { @@ -188,8 +189,10 @@ void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) { uint16 mouseHeight = ((struct dataFileHeader *)_miceData)->s_height; _system->setMouseCursor(newCursor, mouseWidth, mouseHeight, mouseX, mouseY, 0); - if (frameNum == MOUSE_BLANK) _system->showMouse(false); - else _system->showMouse(true); + if (frameNum == MOUSE_BLANK) + _system->showMouse(false); + else + _system->showMouse(true); } void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) { |