Browse Source

Get rid of try_move_player

Getty Ritter 4 years ago
parent
commit
eb6844e7ca
1 changed files with 0 additions and 41 deletions
  1. 0 41
      chapter-07-damage/src/player.rs

+ 0 - 41
chapter-07-damage/src/player.rs

@@ -6,47 +6,6 @@ use specs::prelude::*;
 use std::cmp::{max, min};
 
 
-pub fn try_move_player(delta_x: i32, delta_y: i32, ecs: &mut World) {
-    let mut positions = ecs.write_storage::<Position>();
-    let players = ecs.read_storage::<Player>();
-    let mut viewsheds = ecs.write_storage::<Viewshed>();
-    let entities = ecs.entities();
-    let combat_stats = ecs.read_storage::<CombatStats>();
-    let map = ecs.fetch::<Map>();
-    let mut wants_to_melee = ecs.write_storage::<WantsToMelee>();
-
-    for (entity, _player, pos, viewshed) in
-        (&entities, &players, &mut positions, &mut viewsheds).join()
-    {
-        let destination_idx = map.xy_idx(pos.x + delta_x, pos.y + delta_y);
-
-        for potential_target in map.tile_content[destination_idx].iter() {
-            let target = combat_stats.get(*potential_target);
-            if let Some(_target) = target {
-                wants_to_melee
-                    .insert(
-                        entity,
-                        WantsToMelee {
-                            target: *potential_target,
-                        },
-                    )
-                    .expect("Add target failed");
-                return;
-            }
-        }
-
-        if !map.blocked[destination_idx] {
-            pos.x = min(79, max(0, pos.x + delta_x));
-            pos.y = min(49, max(0, pos.y + delta_y));
-
-            viewshed.dirty = true;
-            let mut ppos = ecs.write_resource::<Point>();
-            ppos.x = pos.x;
-            ppos.y = pos.y;
-        }
-    }
-}
-
 fn clamp<T: PartialOrd>(low: T, high: T, val: T) -> T {
     if val < low {
         low