Melee and Ranged now inheret from Player

[chaz/carfire] / CarFire / CarFire / CarFire / IPlayer.cs

diff --git a/CarFire/CarFire/CarFire/IPlayer.cs b/CarFire/CarFire/CarFire/IPlayer.cs
index b60ef1a23aa3d784dd3b7c4a7b45c102e976a353..3e20f837b301aa5a2323cd8c1add51318f6a1d7e 100644 (file)
--- a/CarFire/CarFire/CarFire/IPlayer.cs
+++ b/CarFire/CarFire/CarFire/IPlayer.cs
@@ -9,28 +9,26 @@ using Microsoft.Xna.Framework.Input;
 \r
 namespace CarFire\r
 {\r
-    public interface ICharacter\r
+    public interface ICharacter : IEntity\r
     {\r
-        void LoadContent(ContentManager contentManager);\r
-        void UnloadContent();\r
-        long Update(GameTime gameTime, NetworkManager networkGame);\r
-        long Draw(SpriteBatch spriteBatch);\r
         int Health { get; }\r
         void causeDamageTo(int amount);\r
-        int GridX { get; set; }\r
-        int GridY { get; set; }\r
-        float PixelX { get; }\r
-        float PixelY { get; }\r
-        bool IsMoving { get; }\r
     }\r
 \r
     public interface IPlayer : ICharacter\r
     {\r
-        void MovePlayer(List<Keys> keysPressed);\r
+        void UpdateInput(TimeSpan timeSpan, List<Keys> keysPressed);\r
         int Score { get; }\r
         void powerUp(int amount);\r
         void Spawn(Vector2 spawn);\r
         bool alive { get; }\r
+        void Attack();\r
+        void UpdatePosition(TimeSpan timeSpan, List<Keys> keysPressed);\r
+        /*\r
+        void AddHealth(int healthBoost);\r
+        void IncreaseDamage(int damageBoost);\r
+        void PlayAttackSound();\r
+        void PlayDieSound();*/\r
     }\r
 \r
     public interface IMonster : ICharacter\r