Skip to content

Commit

Permalink
chore: updated formatting for rust 1.54.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pbellchambers committed Aug 1, 2021
1 parent 0dce577 commit f57122e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions rustyhack_client/src/game.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ pub(crate) fn run(

//get basic data from server needed to start game
let all_maps =
map_handler::request_all_maps_data(&local_sender, &server_addr, &player_update_receiver);
map_handler::request_all_maps_data(&local_sender, server_addr, &player_update_receiver);

//create player
let mut player = new_player::send_new_player_request(
&local_sender,
player_name,
&server_addr,
&client_addr,
server_addr,
client_addr,
&player_update_receiver,
);

Expand All @@ -67,7 +67,7 @@ pub(crate) fn run(
console.clear_screen();

debug!("About to send player velocity update.");
updates_handler::send_player_updates(&local_sender, &console, &player, &server_addr);
updates_handler::send_player_updates(&local_sender, &console, &player, server_addr);

debug!("About to wait for entity updates from server.");
player =
Expand Down
4 changes: 2 additions & 2 deletions rustyhack_client/src/screens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ pub(crate) fn draw_screens(
) {
//update the player viewport contents
let viewport = viewport::draw_viewport_contents(
&player,
player,
all_maps.get(&player.position.map).unwrap_or_else(|| {
error!(
"There is no map for current player position: {}",
&player.position.map
);
process::exit(1);
}),
&other_entities,
other_entities,
);

let top_status_bar = top_status_bar::draw(player);
Expand Down
8 changes: 4 additions & 4 deletions rustyhack_client/src/screens/viewport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ pub(crate) fn draw_viewport_contents(
) -> Screen {
let mut viewport = Viewport::default();
let mut screen = Screen::new(viewport.width, viewport.height);
calculate_viewable_map_coords(&mut viewport, &player);
draw_viewable_map(&mut screen, &background_map, &viewport);
calculate_viewable_map_coords(&mut viewport, player);
draw_viewable_map(&mut screen, background_map, &viewport);
draw_viewport_frame(&mut screen, &viewport);
draw_player(&mut screen, &viewport, &player);
draw_other_entities(&mut screen, &player, &entity_updates, &viewport);
draw_player(&mut screen, &viewport, player);
draw_other_entities(&mut screen, player, entity_updates, &viewport);
screen
}

Expand Down
4 changes: 2 additions & 2 deletions rustyhack_server/src/game/monsters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ pub(crate) fn update_velocities(world: &mut World) {

if let Some(target) = monster.current_target.clone() {
if let Some(current_target_position) = players_positions.get(&target) {
if is_specific_player_nearby(&current_target_position, &position) {
if is_specific_player_nearby(current_target_position, position) {
*velocity = move_towards_target(position, current_target_position);
moving_towards_existing_target = true;
}
}
}

if !moving_towards_existing_target {
let nearby_player = is_any_player_nearby(&players_positions, &position);
let nearby_player = is_any_player_nearby(&players_positions, position);
match nearby_player {
Some((player_name, player_position)) => {
monster.is_active = true;
Expand Down
10 changes: 5 additions & 5 deletions rustyhack_server/src/game/player_updates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub(crate) fn process_player_messages(
"Player joined request received for {} from: {}",
&message.player_name, &message.client_addr
);
join_player(world, message.player_name, message.client_addr, &sender);
join_player(world, message.player_name, message.client_addr, sender);
}
PlayerMessage::UpdateVelocity(message) => {
debug!("Velocity update received for {}", &message.player_name);
Expand Down Expand Up @@ -100,7 +100,7 @@ fn join_player(world: &mut World, name: String, client_addr: String, sender: &Se
});
message_handler::send_packet(
Packet::reliable_ordered(client_addr.parse().unwrap(), response, Some(11)),
&sender,
sender,
);
should_create_new_player = false;
break;
Expand Down Expand Up @@ -149,7 +149,7 @@ fn send_player_joined_response(player: Player, sender: &Sender<Packet>) {
response,
Some(11),
),
&sender,
sender,
);
}

Expand Down Expand Up @@ -181,7 +181,7 @@ pub(crate) fn send_player_updates(
response,
Some(20),
),
&sender,
sender,
);
}
}
Expand Down Expand Up @@ -231,7 +231,7 @@ pub(crate) fn send_other_entities_updates(world: &World, sender: &Sender<Packet>
response,
Some(21),
),
&sender,
sender,
);
}
}
Expand Down

0 comments on commit f57122e

Please sign in to comment.