diff options
| -rw-r--r-- | sword2/driver/_mouse.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp index 107922ecf9..c214fac44c 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/driver/_mouse.cpp @@ -234,8 +234,11 @@ int32 DecompressMouse(uint8 *decomp, uint8 *comp, int32 size) { int32 DrawMouse(void) { + // FIXME: In the original code, luggage animations were decoded here + // as well. Luggage animations and mouse animations were not mutually + // exclusive. Was that a necessary feature? + if (mouseAnim) { - memset(_mouseData, 0, sizeof(_mouseData)); DecompressMouse(_mouseData, mouseSprite, mouseAnim->mousew * mouseAnim->mouseh); g_sword2->_system->set_mouse_cursor(_mouseData, mouseAnim->mousew, mouseAnim->mouseh, mouseAnim->xHotSpot, mouseAnim->yHotSpot - MENUDEEP); } @@ -330,8 +333,6 @@ int32 SetLuggageAnim(uint8 *ma, int32 size) { // The luggage animation is only one frame. - memset(_mouseData, 0, sizeof(_mouseData)); - DecompressMouse(_mouseData, (uint8 *) luggageAnim + *mouseOffsets, luggageAnim->mousew * luggageAnim->mouseh); DecompressMouse(_mouseData, (uint8 *) luggageAnim + *luggageOffset, luggageAnim->mousew * luggageAnim->mouseh); |