1
This commit is contained in:
parent
78c57835ab
commit
db3eb75ac3
@ -3452,13 +3452,13 @@ void Human::SyncVolume(int slot_id)
|
|||||||
[this, i] (int event, const a8::Args* args)
|
[this, i] (int event, const a8::Args* args)
|
||||||
{
|
{
|
||||||
if (a8::TIMER_EXEC_EVENT == event) {
|
if (a8::TIMER_EXEC_EVENT == event) {
|
||||||
room->frame_event.AddPropChg(GetWeakPtrRef(), kPropVolume, i, volume_[i], true);
|
room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, i, GetInventory(i), 0, volume_[i], true);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
&xtimer_attacher);
|
&xtimer_attacher);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (slot_id < IS_END){
|
} else if (slot_id < IS_END){
|
||||||
room->frame_event.AddPropChg(GetWeakPtrRef(), kPropVolume, slot_id, volume_[slot_id], true);
|
room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, slot_id, GetInventory(slot_id), volume_[slot_id], 0, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1671,6 +1671,8 @@ void Player::UpdateThrowBomb()
|
|||||||
0,
|
0,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
DecInventory(slot_id, 1);
|
||||||
|
SyncVolume(slot_id);
|
||||||
glm::vec3 bomb_pos = glm::vec3(
|
glm::vec3 bomb_pos = glm::vec3(
|
||||||
throw_bomb->pos().x(),
|
throw_bomb->pos().x(),
|
||||||
throw_bomb->pos().y(),
|
throw_bomb->pos().y(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user