adding 'ellipse=blah' tag to units. removing unused ellipse graphics

changelog

@@ -42,6 +42,10 @@ SVN trunk (1.1.1+svn):
      * 3rd mission: 6 extra turns after killing the leader, this should allow
        to free Bjarn even if Arne was not involved in the main battle
  * graphics
+   * added 'ellipse=blah' tag to units which will select the four images from 
+	the misc directory for use as an ellipse: misc/blah-bottom.png, 
+	misc/blah-top.png, misc/selected-blah-bottom.png, 
+	and misc/selected-blah-top.png 
    * new encampment graphics
    * moved hero icon from the South Guard into main directories
    * new attack icons: animal fangs, axe, baneblade, battle axe, beak, 

data/units/Goblin_Spearman.cfg

@@ -3,6 +3,7 @@
 	name= _ "Goblin Spearman"
 	race=goblin
 	image="units/goblins/spearman.png"
+	ellipse="ellipse-nozoc"
 	[defend]
 		[frame]
 			begin=-150

src/display.cpp

@@ -1407,9 +1407,13 @@ void display::draw_unit_on_tile(int x, int y, surface unit_image_override,
 			}
 			//selected ellipse not pure red at all!
 			char buf[50];
-			snprintf(buf,sizeof(buf),"misc/%sellipse-1-top.png",selected);
+			std::string ellipse=it->second.type().image_ellipse();
+			if(ellipse.empty()){
+				ellipse="ellipse-1";
+		     }	
+			snprintf(buf,sizeof(buf),"misc/%s%s-top.png",selected,ellipse.c_str());
 			ellipse_back.assign(image::get_image(image::locator(buf,it->second.team_rgb_range(),temp_rgb)));
-			snprintf(buf,sizeof(buf),"misc/%sellipse-1-bottom.png",selected);
+			snprintf(buf,sizeof(buf),"misc/%s%s-bottom.png",selected,ellipse.c_str());
 			ellipse_front.assign(image::get_image(image::locator(buf,it->second.team_rgb_range(),temp_rgb)));
 		}
 

src/unit_types.cpp

@@ -1089,12 +1089,16 @@ const std::string& unit_type::image() const
 	return cfg_["image"];
 }
 
+const std::string& unit_type::image_ellipse() const
+{
+	return cfg_["ellipse"];
+}
+
 const std::string& unit_type::image_halo() const
 {
 	return cfg_["halo"];
 }
 
-
 const std::string& unit_type::image_fighting(attack_type::RANGE range) const
 {
 	static const std::string short_range("image_short");

src/unit_types.hpp

@@ -172,6 +172,7 @@ public:
 	//language_name should eventually be renamed name()
 	// const std::string& name() const;
 	const std::string& image() const;
+	const std::string& image_ellipse() const;
 	const std::string& image_halo() const;
 	const std::string& image_profile() const;
 	const std::string& image_fighting(attack_type::RANGE range) const;