diff --git a/src/damage_system.rs b/src/damage_system.rs index 0df8a6f..59f7116 100644 --- a/src/damage_system.rs +++ b/src/damage_system.rs @@ -1,4 +1,4 @@ -use crate::{gamelog::GameLog, CombatStats, Name, Player, SufferDamage}; +use crate::{game_log::GameLog, CombatStats, Name, Player, SufferDamage}; use rltk::console; use specs::prelude::*; diff --git a/src/gamelog.rs b/src/game_log.rs similarity index 100% rename from src/gamelog.rs rename to src/game_log.rs diff --git a/src/gui.rs b/src/gui.rs index 0be221e..9f5ed43 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -1,4 +1,4 @@ -use crate::{gamelog::GameLog, CombatStats, InBackpack, Map, Name, Player, Position, State}; +use crate::{game_log::GameLog, CombatStats, InBackpack, Map, Name, Player, Position, State}; use rltk::{Point, Rltk, VirtualKeyCode, RGB}; use specs::prelude::*; diff --git a/src/inventory_system.rs b/src/inventory_system.rs index fd14c70..ca76327 100644 --- a/src/inventory_system.rs +++ b/src/inventory_system.rs @@ -1,5 +1,5 @@ use crate::{ - gamelog::GameLog, CombatStats, InBackpack, Name, Position, Potion, WantsToDrinkPotion, + game_log::GameLog, CombatStats, InBackpack, Name, Position, Potion, WantsToDrinkPotion, WantsToDropItem, WantsToPickupItem, }; use specs::prelude::*; diff --git a/src/main.rs b/src/main.rs index 25b8879..0c05fd3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ use specs::prelude::*; mod components; mod damage_system; -mod gamelog; +mod game_log; mod gui; mod inventory_system; mod map; @@ -17,7 +17,7 @@ mod visibility_system; pub use components::*; use damage_system::DamageSystem; -pub use gamelog::GameLog; +pub use game_log::GameLog; use inventory_system::{ItemCollectionSystem, ItemDropSystem, PotionUseSystem}; pub use map::*; use map_indexing_system::MapIndexingSystem; @@ -214,7 +214,7 @@ fn main() -> rltk::BError { gs.ecs.insert(Point::new(player_x, player_y)); gs.ecs.insert(player_entity); gs.ecs.insert(RunState::PreRun); - gs.ecs.insert(gamelog::GameLog { + gs.ecs.insert(game_log::GameLog { entries: vec!["Welcome to Rusty Roguelike".to_string()], }); diff --git a/src/melee_combat_system.rs b/src/melee_combat_system.rs index dc696d0..68ad684 100644 --- a/src/melee_combat_system.rs +++ b/src/melee_combat_system.rs @@ -1,4 +1,4 @@ -use crate::{gamelog::GameLog, CombatStats, Name, SufferDamage, WantsToMelee}; +use crate::{game_log::GameLog, CombatStats, Name, SufferDamage, WantsToMelee}; use specs::prelude::*; pub struct MeleeCombatSystem {} diff --git a/src/player.rs b/src/player.rs index 5098d83..535fc73 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,5 +1,5 @@ use crate::{ - gamelog::GameLog, CombatStats, Item, Map, Player, Position, RunState, State, Viewshed, + game_log::GameLog, CombatStats, Item, Map, Player, Position, RunState, State, Viewshed, WantsToMelee, WantsToPickupItem, }; use rltk::{Point, Rltk, VirtualKeyCode};