Moved the SotBE black flag away from the core images

(since it's only used by SotBE in mainline) and did little tweaks to
the campaign file.

data/campaigns/Son_Of_The_Black_Eye.cfg

@@ -6,15 +6,13 @@
 [campaign]
 	#textdomain wesnoth-sotbe_update
 	name= _ "Son of the Black Eye"
-
-
 	first_scenario=End_Of_Peace
-	define=CAMPAIGN_SON_OF_THE_BLACK_EYE_UPDATE
+	define=CAMPAIGN_SON_OF_THE_BLACK_EYE
 	difficulties=EASY,NORMAL,HARD
 
 	difficulty_descriptions={MENU_IMG_TXT2 "units/orcs/grunt.png~TC(1,magenta)" _"Grunt" _"(Challenging)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warrior.png~TC(1,magenta)" _"Warrior" _"(Difficult)"} + ";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~TC(1,magenta)" _"Warlord" _"(Experts Only)"}
 
-	description= _ "The humans have broken their agreement with the orcs and are now bent upon taking their lands and banishing them from the face of the Great Continent. Your father was the greatest orcish leader that ever lived and now, as his son, it's up to you to thwart the humans' selfish designs. Unite the warring orcish tribes, bring together the Orcish Council and call up the Great Horde to send the human-worms and their tree-shagger allies to the land of the dead!"  + _ " Complete! Version 1.3.3."
+	description= _ "Your father was the greatest orcish leader that ever lived and now, as his son, it's up to you to thwart the selfish designs of the humans that have broken the old agreements with the orcs and are bent upon taking your lands. Unite the warring orcish tribes, bring together the Orcish Council and call up the Great Horde to send the human-worms and their tree-shagger allies to the land of the dead!"
 	icon=units/orcs/ruler.png~TC(1,magenta)
 	image=items/orcish-flag.png
 
@@ -32,7 +30,7 @@
 path=data/campaigns/Son_Of_The_Black_Eye/external_binary_data
 [/binary_path]
 
-#ifdef CAMPAIGN_SON_OF_THE_BLACK_EYE_UPDATE
+#ifdef CAMPAIGN_SON_OF_THE_BLACK_EYE
 {@campaigns/Son_Of_The_Black_Eye/scenarios/utils/utils.cfg}
 {@campaigns/Son_Of_The_Black_Eye/scenarios}
 

data/campaigns/Son_Of_The_Black_Eye/scenarios/utils/utils.cfg

@@ -262,11 +262,9 @@ y={Y}
 #enddef
 
 #define BLACK_FLAG
-	flag=flag-sotbe-1.png:100,flag-sotbe-2.png:300,flag-sotbe-1.png:100,flag-sotbe-3.png:300
-
+	flag=flags/black-flag-1.png:100,flags/black-flag-2.png:300,flags/black-flag-1.png:100,flags/black-flag-3.png:300
 #enddef
 
-
 #define TROLLARMY X
 [role]
 role=store{X}
@@ -305,10 +303,10 @@ name=store{X}
 variable=store{X}
 kill=yes
 [/store_unit]
-[set_variable] 
-name=store{X}.side 
-value=4 
-[/set_variable] 
+[set_variable]
+name=store{X}.side
+value=4
+[/set_variable]
 [set_variable]
 name=store{X}.x
 value=5
@@ -340,7 +338,7 @@ name=store{X}
 	variable=changeside
 	kill=yes
 [/store_unit]
-[set_variable]	
+[set_variable]
 name=changeside.side
 value=1
 [/set_variable]