miyo's changes to units, and added in customizable hotkeys in preferences

data/units/Arch_Mage.cfg

@@ -3,7 +3,7 @@ name=Arch Mage
 image=arch-mage.png
 hitpoints=58
 movement_type=smallfoot
-movement=6
+movement=5
 experience=220
 level=3
 alignment=neutral

data/units/Bone_Shooter.cfg

@@ -3,7 +3,7 @@ name=Bone Shooter
 image=undead-boneshooter.png
 hitpoints=40
 movement_type=undeadfoot
-movement=6
+movement=5
 experience=500
 level=2
 alignment=chaotic

data/units/Duelist.cfg

@@ -3,7 +3,7 @@ name=Duelist
 image=human-duelist.png
 hitpoints=44
 movement_type=elusivefoot
-movement=7
+movement=6
 experience=120
 level=2
 alignment=neutral

data/units/Dwarvish_Lord.cfg

@@ -3,7 +3,7 @@ name=Dwarvish Lord
 image=dwarf-warrior.png
 hitpoints=80
 movement_type=mountainfoot
-movement=8
+movement=7
 experience=500
 level=3
 alignment=neutral

data/units/Elvish_Avenger.cfg

@@ -3,7 +3,7 @@ name=Elvish Avenger
 image=elvish-avenger.png
 hitpoints=60
 movement_type=woodland
-movement=7
+movement=6
 experience=80
 level=3
 alignment=lawful

data/units/Elvish_Champion.cfg

@@ -4,7 +4,7 @@ image=elvish-champion.png
 image_defensive=elvish-champion-defend.png
 hitpoints=70
 movement_type=woodland
-movement=6
+movement=5
 experience=500
 level=3
 alignment=lawful

data/units/Elvish_Druid.cfg

@@ -3,13 +3,13 @@ name=Elvish Druid
 image=elvish-druid.png
 hitpoints=38
 movement_type=woodland
-movement=6
+movement=5
 experience=500
 level=2
 alignment=neutral
 advanceto=null
 cost=54
-usage=archer
+usage=healer
 ability=cures
 unit_description="The Elvish Druid is a powerful master of the forest. Brilliant at ensnaring unwary opponents, she also uses the herbs of the forest to heal her allies. The Druid is an excellent supporting unit to any Elvish army."
 

data/units/Elvish_Hero.cfg

@@ -3,7 +3,7 @@ name=Elvish Hero
 image=elvish-hero.png
 hitpoints=48
 movement_type=woodland
-movement=6
+movement=5
 experience=80
 level=2
 alignment=lawful

data/units/Elvish_Marshal.cfg

@@ -4,7 +4,7 @@ image=elvish-marshal.png
 hitpoints=62
 ability=leadership
 movement_type=woodland
-movement=6
+movement=5
 experience=500
 level=3
 alignment=lawful

data/units/Elvish_Ranger.cfg

@@ -3,7 +3,7 @@ name=Elvish Ranger
 image=elvish-ranger.png
 hitpoints=42
 movement_type=woodland
-movement=7
+movement=6
 experience=80
 level=2
 alignment=lawful

data/units/Elvish_Shaman.cfg

@@ -10,7 +10,7 @@ level=1
 alignment=neutral
 advanceto=Elvish Druid
 cost=27
-usage=archer
+usage=healer
 unit_description="The Elvish Shaman focuses on less violent ways to hinder the enemy. Her entangling attack slows enemies down and reduces the number of times they may attack. She also possesses basic healing abilities."
 
 	[attack]

data/units/Great_Mage.cfg

@@ -3,7 +3,7 @@ name=Great Mage
 image=great-mage.png
 hitpoints=70
 movement_type=smallfoot
-movement=6
+movement=5
 experience=500
 level=4
 alignment=neutral

data/units/Halbardier.cfg

@@ -3,7 +3,7 @@ name=Halbardier
 image=human-halbardier.png
 hitpoints=52
 movement_type=smallfoot
-movement=6
+movement=5
 experience=60
 level=2
 alignment=neutral

data/units/Horseman.cfg

@@ -6,7 +6,7 @@ movement_type=mounted
 movement=8
 experience=38
 level=1
-alignment=lawful
+alignment=neutral
 advanceto=Knight,Elvish Outrider
 cost=28
 usage=fighter

data/units/Mage_of_Light.cfg

@@ -4,7 +4,7 @@ image=white-cleric.png
 ability=lightbringer
 hitpoints=42
 movement_type=smallfoot
-movement=6
+movement=5
 experience=500
 level=3
 alignment=lawful

data/units/Orcish_Slayer.cfg

@@ -3,7 +3,7 @@ name=Orcish Slayer
 image=orc-slayer.png
 hitpoints=36
 movement_type=elusivefoot
-movement=8
+movement=7
 experience=500
 level=2
 alignment=chaotic

data/units/Orcish_Warlord.cfg

@@ -3,7 +3,7 @@ name=Orcish Warlord
 image=orcish-warlord.png
 hitpoints=80
 movement_type=smallfoot
-movement=6
+movement=5
 experience=80
 level=3
 alignment=chaotic

data/units/Paladin.cfg

@@ -14,7 +14,7 @@ ability=heals
 unit_description="A knight of the highest virtue, the Paladin has all the skills of the knight, but can also heal adjacent friendly units."
 	[attack]
 	name=sword
-	type=blade
+	type=holy
 	range=short
 	damage=9
 	number=5

data/units/Red_Mage.cfg

@@ -3,7 +3,7 @@ name=Red Mage
 image=red-mage.png
 hitpoints=42
 movement_type=smallfoot
-movement=6
+movement=5
 experience=100
 level=2
 alignment=neutral

data/units/Royal_Guard.cfg

@@ -3,7 +3,7 @@ name=Royal Guard
 image=human-royalguard.png
 hitpoints=60
 movement_type=smallfoot
-movement=7
+movement=5
 experience=500
 level=3
 alignment=neutral

data/units/White_Mage.cfg

@@ -4,7 +4,7 @@ image=white-mage.png
 ability=cures
 hitpoints=32
 movement_type=smallfoot
-movement=6
+movement=5
 experience=150
 level=2
 alignment=lawful

src/preferences.cpp

@@ -12,6 +12,7 @@
 */
 #include "filesystem.hpp"
 #include "font.hpp"
+#include "hotkeys.hpp"
 #include "language.hpp"
 #include "menu.hpp"
 #include "preferences.hpp"
@@ -50,6 +51,8 @@ display_manager::display_manager(display* d)
 {
 	disp = d;
 
+	add_hotkeys(prefs);
+
 	set_grid(grid());
 	set_turbo(turbo());
 	set_fullscreen(fullscreen());

src/video.hpp

@@ -55,7 +55,6 @@ class CVideo {
      private:
 
 	SDL_Surface* frameBuffer;
-//	SDL_Surface* backBuffer;
 	char text_[256*8];
 };