finishes decoupling map from camera

This commit is contained in:
Llywelwyn 2023-07-24 18:53:51 +01:00
parent 2ecfd25d95
commit 7f0465da73
13 changed files with 110 additions and 254 deletions

View file

@ -3,7 +3,7 @@ use super::{
Cursed, DefenceBonus, Destructible, Digger, Door, EntryTrigger, EquipmentSlot, Equippable, Hidden, HungerClock,
HungerState, InflictsDamage, Item, MagicMapper, Map, MeleePowerBonus, Mind, Monster, Name, Player, Position,
ProvidesHealing, ProvidesNutrition, Ranged, Rect, Renderable, SerializeMe, SingleActivation, TileType, Viewshed,
Wand, AOE, MAPWIDTH,
Wand, AOE,
};
use rltk::{console, RandomNumberGenerator, RGB};
use specs::prelude::*;
@ -141,8 +141,11 @@ pub fn spawn_region(
}
pub fn spawn_entity(ecs: &mut World, spawn: &(&usize, &String)) {
let x = (*spawn.0 % MAPWIDTH) as i32;
let y = (*spawn.0 / MAPWIDTH) as i32;
let map = ecs.fetch::<Map>();
let width = map.width as usize;
std::mem::drop(map);
let x = (*spawn.0 % width) as i32;
let y = (*spawn.0 / width) as i32;
match spawn.1.as_ref() {
// Monsters