Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Go to idle state when picking items up

Browse Source
This commit is contained in:
timokoesters
2020-03-20 17:15:09 +01:00
parent df858cb370
commit 44ec09a8e7
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/sys/controller.rs
View File

@ -1,5 +1,5 @@
use crate::{
comp::{ControlEvent, Controller},
comp::{CharacterState, ControlEvent, Controller},
event::{EventBus, LocalEvent, ServerEvent},
state::DeltaTime,
sync::{Uid, UidAllocator},
@ -22,15 +22,27 @@ impl<'a> System<'a> for Sys {
Read<'a, EventBus<LocalEvent>>,
Read<'a, DeltaTime>,
WriteStorage<'a, Controller>,
WriteStorage<'a, CharacterState>,
ReadStorage<'a, Uid>,
);
fn run(
&mut self,
(entities, uid_allocator, server_bus, _local_bus, _dt, mut controllers, uids): Self::SystemData,
(
entities,
uid_allocator,
server_bus,
_local_bus,
_dt,
mut controllers,
mut character_states,
uids,
): Self::SystemData,
) {
let mut server_emitter = server_bus.emitter();
for (entity, _uid, controller) in (&entities, &uids, &mut controllers).join() {
for (entity, _uid, controller, character_state) in
(&entities, &uids, &mut controllers, &mut character_states).join()
{
let inputs = &mut controller.inputs;
// Update `inputs.move_dir`.
@ -59,6 +71,7 @@ impl<'a> System<'a> for Sys {
},
ControlEvent::Unmount => server_emitter.emit(ServerEvent::Unmount(entity)),
ControlEvent::InventoryManip(manip) => {
*character_state = CharacterState::Idle;
server_emitter.emit(ServerEvent::InventoryManip(entity, manip))
}, /*ControlEvent::Respawn =>
* server_emitter.emit(ServerEvent::Unmount(entity)), */