Merge branch 'dev' into feature/phase-skill

This commit is contained in:
Linus Probert 2018-10-02 12:50:44 +02:00
commit 0dcb658076
1 changed files with 4 additions and 1 deletions

View File

@ -158,14 +158,17 @@ handle_mouse_motion(Menu *m, Input *input)
Position p = { input->mouseX, input->mouseY }; Position p = { input->mouseX, input->mouseY };
LinkedList *items = m->items; int lastSelect = m->selected;
int index = 0; int index = 0;
LinkedList *items = m->items;
while (items) { while (items) {
MenuItem *item = items->data; MenuItem *item = items->data;
items = items->next; items = items->next;
if (position_in_rect(&p, &item->button->area)) { if (position_in_rect(&p, &item->button->area)) {
m->selected = index; m->selected = index;
if (index != lastSelect)
mixer_play_effect(CLICK);
break; break;
} }
index++; index++;