From 6a7a74e6878ff04e61e6ef21a922e314b9bab271 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 1 Mar 2020 22:28:02 +0100
Subject: use generics for message components

---
 src/playerstate.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/playerstate.rs')

diff --git a/src/playerstate.rs b/src/playerstate.rs
index 01e85fe..79c7b31 100644
--- a/src/playerstate.rs
+++ b/src/playerstate.rs
@@ -6,8 +6,7 @@ use crate::{
 	componentwrapper::{ComponentWrapper, PreEntity},
 	PlayerId,
 	RoomId,
-	components::{Visible, Player, Inventory, Health, Fighter, Healing, Movable},
-	attack::Attack,
+	components::{Visible, Player, Inventory, Health, Fighter, Healing, Movable, AttackMessage},
 	Result,
 	aerr,
 	Sprite,
@@ -116,7 +115,7 @@ impl PlayerState {
 				capacity: self.inventory_capacity
 			}),
 			ComponentWrapper::Health(Health{health: self.health, maxhealth: self.maximum_health}),
-			ComponentWrapper::Fighter(Fighter{attack: Attack::new(5), cooldown: 8}),
+			ComponentWrapper::Fighter(Fighter{attack: AttackMessage::new(5), cooldown: 8}),
 			ComponentWrapper::Healing(Healing{delay: 50, health: 1, next_heal: None}),
 			ComponentWrapper::Movable(Movable{cooldown: 2})
 		]
-- 
cgit