Merged into trunk:

2006-09-07T16:01:06Z!lari.nieminen@iki.fi 2006-09-07T16:24:16Z!lari.nieminen@iki.fi 2006-09-07T16:26:22Z!lari.nieminen@iki.fi 2006-09-08T18:04:47Z!lari.nieminen@iki.fi
2006-09-10 14:18:09 +00:00 · 2006-09-10 14:18:09 +00:00 · f54405bf5a
commit f54405bf5a
parent 2e8adae384 bffd874ba3
20 changed files with 1 additions and 3 deletions
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/3_Long_Night.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/3_Long_Night.cfg
@ -1659,7 +1659,7 @@ description=Ystara
 		[/variable]

 		[then]
-			{UNIT_ (Spectre) (Azkotep) 2 (21) (24) ( _ "24")}
+			{UNIT_ (Spectre) (Azkotep) (_ "Azkotep") 2 21 24}
 			{BOTH_LEADERS_KILLED_DIALOGUE}
 		[/then]

--- a/images/terrain/grassland-to-water-n-ne-se-s.png
+++ b/images/terrain/grassland-to-water-n-ne-se-s.png
--- a/images/terrain/grassland-to-water-ne-se-s-sw.png
+++ b/images/terrain/grassland-to-water-ne-se-s-sw.png
--- a/images/terrain/grassland-to-water-nw-n-ne-se.png
+++ b/images/terrain/grassland-to-water-nw-n-ne-se.png
--- a/images/terrain/grassland-to-water-s-sw-nw-n.png
+++ b/images/terrain/grassland-to-water-s-sw-nw-n.png
--- a/images/terrain/grassland-to-water-se-s-sw-nw.png
+++ b/images/terrain/grassland-to-water-se-s-sw-nw.png
--- a/images/terrain/grassland-to-water-sw-nw-n-ne.png
+++ b/images/terrain/grassland-to-water-sw-nw-n-ne.png
--- a/images/terrain/sand-n-ne-se.png
+++ b/images/terrain/sand-n-ne-se.png
--- a/images/terrain/sand-n-ne.png
+++ b/images/terrain/sand-n-ne.png
--- a/images/terrain/sand-ne-se-s.png
+++ b/images/terrain/sand-ne-se-s.png
--- a/images/terrain/sand-ne-se.png
+++ b/images/terrain/sand-ne-se.png
--- a/images/terrain/sand-nw-n-ne.png
+++ b/images/terrain/sand-nw-n-ne.png
--- a/images/terrain/sand-nw-n.png
+++ b/images/terrain/sand-nw-n.png
--- a/images/terrain/sand-s-sw-nw.png
+++ b/images/terrain/sand-s-sw-nw.png
--- a/images/terrain/sand-s-sw.png
+++ b/images/terrain/sand-s-sw.png
--- a/images/terrain/sand-se-s-sw.png
+++ b/images/terrain/sand-se-s-sw.png
--- a/images/terrain/sand-se-s.png
+++ b/images/terrain/sand-se-s.png
--- a/images/terrain/sand-sw-nw-n.png
+++ b/images/terrain/sand-sw-nw-n.png
--- a/images/terrain/sand-sw-nw.png
+++ b/images/terrain/sand-sw-nw.png
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@ -13,8 +13,6 @@

 #include "global.hpp"

-#include "loadscreen.hpp"
-
 //include files for opendir(3), readdir(3), etc. These files may vary
 //from platform to platform, since these functions are NOT ANSI-conforming
 //functions. They may have to be altered to port to new platforms