From c55b91fbbbe88218ea88d33987dc8c7f98fb26a1 Mon Sep 17 00:00:00 2001
From: Simon Holmberg <Simon@Simon-PC>
Date: Tue, 25 Sep 2012 21:48:31 +0200
Subject: [PATCH] Cleanup after minor git disaster

---
 .../DepthsBelow/Component/Collision.cs.orig   | 65 -------------------
 DepthsBelow/DepthsBelow/Soldier.cs.orig       | 50 --------------
 2 files changed, 115 deletions(-)
 delete mode 100644 DepthsBelow/DepthsBelow/Component/Collision.cs.orig
 delete mode 100644 DepthsBelow/DepthsBelow/Soldier.cs.orig

diff --git a/DepthsBelow/DepthsBelow/Component/Collision.cs.orig b/DepthsBelow/DepthsBelow/Component/Collision.cs.orig
deleted file mode 100644
index ac6bd86..0000000
--- a/DepthsBelow/DepthsBelow/Component/Collision.cs.orig
+++ /dev/null
@@ -1,65 +0,0 @@
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-
-namespace DepthsBelow.Component
-{
-    public class Collision : Component
-    {
-
-	    public Rectangle Rectangle;
-
-	    public int Width;
-	    public int Height;
-        
-        public Collision(Entity parent, int width, int height)
-            : base(parent)
-        {
-        	this.Width = width;
-        	this.Height = height;
-		this.Rectangle = new Rectangle(0, 0, width, height);
-        }
-        public void Update(GameTime gameTime)
-        {
-            PixelTransform pt = this.Parent.GetComponent<PixelTransform>();
-	        this.Rectangle.X = (int)pt.X;
-	        this.Rectangle.Y = (int)pt.Y;
-        }
-    }
-}
-=======
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-
-namespace DepthsBelow.Component
-{
-    public class Collision : Component
-    {
-
-	    public Rectangle Rectangle;
-
-	    public int Width;
-	    public int Height;
-        
-        public Collision(Entity parent, int width, int height)
-            : base(parent)
-        {
-        	this.Width = width;
-        	this.Height = height;
-		this.Rectangle = new Rectangle(0, 0, width, height);
-        }
-        public void Update(GameTime gameTime)
-        {
-            PixelTransform pt = this.Parent.GetComponent<PixelTransform>();
-	        this.Rectangle.X = (int)pt.X;
-	        this.Rectangle.Y = (int)pt.Y;
-        }
-    }
-}
->>>>>>> Made Soldier Public and Made MouseInput Collision
diff --git a/DepthsBelow/DepthsBelow/Soldier.cs.orig b/DepthsBelow/DepthsBelow/Soldier.cs.orig
deleted file mode 100644
index d1dc31a..0000000
--- a/DepthsBelow/DepthsBelow/Soldier.cs.orig
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Microsoft.Xna.Framework.Media;
-
-namespace DepthsBelow
-{
-	public class Soldier : Entity
-	{
-		Core game;
-        public bool selected = false;
-		static Texture2D Texture;
-
-		private KeyboardState lastKeyboardState;
-
-		static public void LoadContent(Core game)
-		{
-			Texture = game.Content.Load<Texture2D>("images/soldier");
-		}
-
-		public Soldier(Core game)
-		{
-			if (Texture == null)
-				LoadContent(game);
-
-			Component.SpriteRenderer rc = new Component.SpriteRenderer(this);
-			rc.Texture = Texture;
-			rc.Color = Color.HotPink;
-			this.AddComponent(rc);
-		}
-
-		public void Update(GameTime gameTime)
-		{
-			/*KeyboardState ks = Keyboard.GetState();
-			if (ks.IsKeyDown(Keys.Right) && lastKeyboardState.IsKeyUp(Keys.Right))
-				gridTransform.Position.X += 1;
-			lastKeyboardState = ks;*/
-			
-			if (pixelTransform.Position.X < gridTransform.X * 32)
-			{
-				pixelTransform.Position.X += 2;
-			}
-		}
-	}
-}