Merge lp:~widelands-dev/widelands/one_world into lp:widelands

[SirVer]

This merges all worlds into one, converts its configuration to Lua, adds the compatibility layer to map loading needed for this.

This also regresses some issues:

- Bug 1328635 deals with terrain affinity of trees.
- Bug 1328637 deals with the hard to see road textures.
- Bug 1328640 introduces a sensible refactoring that I did not finish in this change.

There is also the outstanding issue of how to deal with translations. The worlds .pot files are gone of course, but I have no idea how to reduce them into a single one. Gun, any ideas here?

I am very open for comments on the code and design, as well as suggestion to the new bugs and ways to fixing them. I would like to merge this in the next couple of weeks, so it would be great to get some feedback.

[GunChleoc (gunchleoc)]

For the translations, the best thing to keep as much as we can is to use the msgmerge utility - I guess you are already using this when integrating updates from Launchpad? We could do something like the following:

1. reconfigure our script for xgettext to collect all world-related strings into one .pot catalog, e.g. worlds/worlds.pot.

2. Grab the current Launchpad translations

3. Use msgmerge to merge the 4 old worlds into one, creating a new po file in the process. Something like this:

msgmerge -o worlds/de.po world-blackland/de.po worlds/worlds.pot
msgmerge -o worlds/de.po world-desert/de.po worlds/worlds.pot
msgmerge -o worlds/de.po world-greenland/de.po worlds/worlds.pot
msgmerge -o worlds/de.po world-winterland/de.po worlds/worlds.pot

I think it would be a good idea to test this with German, because more than one of us speak the language, and we could open the resulting worlds/de.po and have a look if everything's OK.

[GunChleoc (gunchleoc)]

Commented here: https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708/comments/533683

Set to "Needs fixing", because we still need to work this out and test ;)

review: Needs Fixing (merging world catalogues)

[SirVer (sirver)]

I'd rather not do the juggling with the translations in this branch/merge request. I did the test merge of all de.po of the old worlds into a new one in a new branch and pushed for inspection: https://code.launchpad.net/~widelands-dev/widelands/one_world_translations

It looks good to me. It worked exactly as you said :).

I think it is better to first merge this proposal and then merge the translations - otherwise the diff will be very diluted here. Agreed?

review: Needs Information

[GunChleoc (gunchleoc)]

Yes, merge them one after the other.

I noticed that the merged translation has a good number of fuzzy strings in it. Launchpad will kill these - maybe we should upload a translation archive to the homepage to give translators access.

Alternatively, they could download the old world files first and load into their tools to fill up the translation memories, so the will get suggestions for these strings if they are working offline. for this, we would need to keep the old world files around for a bit.

[GunChleoc (gunchleoc)]

review: Approve (merging world catalogues)

[SirVer (sirver)]

Gun, let me know how you want to do the merge - i.e. announcing the merge or what. There are not that many strings in the world though, so letting the fuzzy strings die is probably alright.

[GunChleoc (gunchleoc)]

We could give translators a heads-up in the forum thread, and I can grab an archive in case they need help.

It's not that much as you say, so this should suffice - no need for a big announcement on the homepage.

How close are we to the merge, do you want me to go ahead and post something?

[SirVer (sirver)]

I really want to merge this ASAP. I hoped to get a code review - but it seems nobody has the time right now :(.

So grab the archive whenever you can and inform the forum.

[Shevonar (shevonar)]

I am currently reviewing your code. I already added some small things for the first 5000 lines as inline comments. I am not yet sure how to add comments for the rest.

[SirVer (sirver)]

Cool! I think it is easiest to just litter the code with NOCOMMIT(#sirver) or something greppable. I can then take a look at those things.

[SirVer (sirver)]

Inline comments are fine too, of course.

[Shevonar (shevonar)]

I changed some formatting issues and small obvious errors. I also changed documentation to doxygen comment style so it gets picked up.

Here are the remaining questions:
- Why did you hard code the compiler in compile.sh
- Why are critter sound_effect split in directory and name and not just a path to the sound file?
- widelands_streamread.h.THIS should be just .h but is not used anyways. Remove?
- '// TODO "stone" is defined as "granit" in the world': Can this be fixed easily? Seems to fit in the context of this commit.
- ResourceDescription::get_editor_pic looks very wired. I am not totally sure what this method does but I am almost sure that there is an easier way with less complexity to achieve the same result. However, you did not write this code.
- TerrainTypeFromString is just a helper method. I don't know how this is usually handled in C++ but I would have maybe used a private class method (I am more of a Java developer).
- Uint32 in src/sound/fxset.h: What is the difference between Uint32 and uint32_t? Should it be changed?

[SirVer (sirver)]

Thanks for the review! It is very much appreciated. You also caught some bugs that I have missed. Code reviews are such an awesome thing! nearly as good as pair programming.

> - Why did you hard code the compiler in compile.sh

good catch. gun did that and probably submitted the change by accident. I didn't see it. Reverted to trunk.

- Why are critter sound_effect split in directory and name and not just a path to the sound file?

That is legacy. The sound_handler randomly picks one file of bird_*.ogg when directory/bird is requested. I am not sure where I should document that better. Changing the sound handler to accept files explicitly (as a list instead of a glob) is probably also a good idea.

- widelands_streamread.h.THIS should be just .h but is not used anyways. Remove?

Removed.

- - '// TODO "stone" is defined as "granit" in the world': Can this be fixed easily? Seems to fit in the context of this commit.

that code around that area seems wrong to me. This translates attribute = { "stone" } as the name of the resource named granit. I think the correct approach would be to make attributes translatable in the world or let the building define the out of resource message in its configuration, but I did not want to touch even more code for now. I expanded the TODO with this information.

- ResourceDescription::get_editor_pic looks very wired. I am not totally sure what this method does but I am almost sure that there is an easier way with less complexity to achieve the same result. However, you did not write this code.

Well, I think I probably did write this code - way back. I agree to its complexity, I do not fully understand how it does it either, but it essentially just picks one of the defined pictures for a given resource amount. I did not want to touch it for now as this change is already too big.

> TerrainTypeFromString.

It is correctly handled like this: it is a stand alone method in a .cc file in an anonymous namespace. That means that it is only visible in this .cc file where it is used.

- Uint32 in src/sound/fxset.h: What is the difference between Uint32 and uint32_t? Should it be changed?

One is the SDL typedef, one the C standard typedef. I agree to change this for consistency, but we should do it more globally. I opened bug 1330599 for that.

Please take another look.

[GunChleoc (gunchleoc)]

I have made an announcement on the forum and am grabbing a translation archive today.

Sorry I'm a bit slow reacting to stuff, I'm travelling at the moment ;)

[Shevonar (shevonar)]

I just took the time to understand and simplify the ResourceDescription::get_editor_pic method. The old behavior to fallback to a resource pic with a negative upper limit was removed since it was not used anyway. If you really don't want it in this commit you are free to revert it.

You answered all the other questions, so I would say ready to merge from my side.

review: Approve

[Shevonar (shevonar)]

One last thing: The diff against target in this merge request says 'Text conflict in src/graphic/animation.cc'. So won't be a clean merge.

[SirVer (sirver)]

Thanks for taking care of this and for the review in general. I'll go ahead and merge then. I also merge the translations as Gun proposed and as we already tested basically works.

[TiborB (tiborb95)]

Hi,

this is programming-related question, I can not figure it out (no wonder
with my experiences):

I need to count fields with fishes (currently no such feature in AI), I
somehow came to this:

if (field.water_nearby_ >0){
map.find_fields(Area<FCoords>(field.coords, 6), &resource_list,
FindNodeResource(tribe->safe_ware_index("fish")));
field.fish_nearby_ = resource_list.size();
}

The problem is that it still calculates 0; so first - is the syntax OK?

Or perhaps the problem is with third argument?

I grepped the code but failed to find piece of code that I would copy/paste
and use for my purposes.

Thanks

[SirVer (sirver)]

On 18.06.2014, at 13:21, Tibor Bamhor <email address hidden> wrote:

> Hi,
>
> this is programming-related question, I can not figure it out (no wonder
> with my experiences):
>
> I need to count fields with fishes (currently no such feature in AI), I
> somehow came to this:
>
> if (field.water_nearby_ >0){
> map.find_fields(Area<FCoords>(field.coords, 6), &resource_list,
> FindNodeResource(tribe->safe_ware_index("fish")));

this is the issue. You want to find a map resource, so you need to look up the index for the resource in the map (World::get_resource(“fish”))

> field.fish_nearby_ = resource_list.size();
> }
>
> The problem is that it still calculates 0; so first - is the syntax OK?
>
> Or perhaps the problem is with third argument?
>
> I grepped the code but failed to find piece of code that I would copy/paste
> and use for my purposes.
>
> Thanks
>
> --
> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
> Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_world.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help : https://help.launchpad.net/ListHelp

[TiborB (tiborb95)]

Thanks - it worked!!! (no surprise)

BTW also animals (game) is not counted by now so hunters are placed blindly
- and dismantle is done so ... could you advice how to count them?

I know there is get_bob function, but there is a lot of types of animals...

2014-06-18 13:36 GMT+02:00 SirVer <email address hidden>:

>
> On 18.06.2014, at 13:21, Tibor Bamhor <email address hidden> wrote:
>
> > Hi,
> >
> > this is programming-related question, I can not figure it out (no wonder
> > with my experiences):
> >
> > I need to count fields with fishes (currently no such feature in AI), I
> > somehow came to this:
> >
> > if (field.water_nearby_ >0){
> > map.find_fields(Area<FCoords>(field.coords, 6), &resource_list,
> > FindNodeResource(tribe->safe_ware_index("fish")));
>
> this is the issue. You want to find a map resource, so you need to look up
> the index for the resource in the map (World::get_resource(“fish”))
>
> > field.fish_nearby_ = resource_list.size();
> > }
> >
> > The problem is that it still calculates 0; so first - is the syntax OK?
> >
> > Or perhaps the problem is with third argument?
> >
> > I grepped the code but failed to find piece of code that I would
> copy/paste
> > and use for my purposes.
> >
> > Thanks
> >
> > --
> >
> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
> > Your team Widelands Developers is subscribed to branch
> lp:~widelands-dev/widelands/one_world.
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~widelands-dev
> > Post to : <email address hidden>
> > Unsubscribe : https://launchpad.net/~widelands-dev
> > More help : https://help.launchpad.net/ListHelp
>
>
> --
> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
> Your team Widelands Developers is subscribed to branch
> lp:~widelands-dev/widelands/one_world.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help : https://help.launchpad.net/ListHelp
>

[SirVer (sirver)]

On 18.06.2014, at 14:00, Tibor Bamhor <email address hidden> wrote:

> Thanks - it worked!!! (no surprise)
>
> BTW also animals (game) is not counted by now so hunters are placed blindly
> - and dismantle is done so ... could you advice how to count them?
>
> I know there is get_bob function, but there is a lot of types of animals…

all of them are editable and huntable. So what?

>
>
>
> 2014-06-18 13:36 GMT+02:00 SirVer <email address hidden>:
>
>>
>> On 18.06.2014, at 13:21, Tibor Bamhor <email address hidden> wrote:
>>
>>> Hi,
>>>
>>> this is programming-related question, I can not figure it out (no wonder
>>> with my experiences):
>>>
>>> I need to count fields with fishes (currently no such feature in AI), I
>>> somehow came to this:
>>>
>>> if (field.water_nearby_ >0){
>>> map.find_fields(Area<FCoords>(field.coords, 6), &resource_list,
>>> FindNodeResource(tribe->safe_ware_index("fish")));
>>
>> this is the issue. You want to find a map resource, so you need to look up
>> the index for the resource in the map (World::get_resource(“fish”))
>>
>>> field.fish_nearby_ = resource_list.size();
>>> }
>>>
>>> The problem is that it still calculates 0; so first - is the syntax OK?
>>>
>>> Or perhaps the problem is with third argument?
>>>
>>> I grepped the code but failed to find piece of code that I would
>> copy/paste
>>> and use for my purposes.
>>>
>>> Thanks
>>>
>>> --
>>>
>> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
>>> Your team Widelands Developers is subscribed to branch
>> lp:~widelands-dev/widelands/one_world.
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~widelands-dev
>>> Post to : <email address hidden>
>>> Unsubscribe : https://launchpad.net/~widelands-dev
>>> More help : https://help.launchpad.net/ListHelp
>>
>>
>> --
>> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
>> Your team Widelands Developers is subscribed to branch
>> lp:~widelands-dev/widelands/one_world.
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~widelands-dev
>> Post to : <email address hidden>
>> Unsubscribe : https://launchpad.net/~widelands-dev
>> More help : https://help.launchpad.net/ListHelp
>>
>
> --
> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
> Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_world.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help : https://help.launchpad.net/ListHelp

[TiborB (tiborb95)]

That is good. I will just have to count bobs in vicinity...

2014-06-18 15:57 GMT+02:00, SirVer <email address hidden>:
>
> On 18.06.2014, at 14:00, Tibor Bamhor <email address hidden> wrote:
>
>> Thanks - it worked!!! (no surprise)
>>
>> BTW also animals (game) is not counted by now so hunters are placed
>> blindly
>> - and dismantle is done so ... could you advice how to count them?
>>
>> I know there is get_bob function, but there is a lot of types of animals…
>
> all of them are editable and huntable. So what?
>
>>
>>
>>
>> 2014-06-18 13:36 GMT+02:00 SirVer <email address hidden>:
>>
>>>
>>> On 18.06.2014, at 13:21, Tibor Bamhor <email address hidden> wrote:
>>>
>>>> Hi,
>>>>
>>>> this is programming-related question, I can not figure it out (no wonder
>>>> with my experiences):
>>>>
>>>> I need to count fields with fishes (currently no such feature in AI), I
>>>> somehow came to this:
>>>>
>>>> if (field.water_nearby_ >0){
>>>> map.find_fields(Area<FCoords>(field.coords, 6), &resource_list,
>>>> FindNodeResource(tribe->safe_ware_index("fish")));
>>>
>>> this is the issue. You want to find a map resource, so you need to look
>>> up
>>> the index for the resource in the map (World::get_resource(“fish”))
>>>
>>>> field.fish_nearby_ = resource_list.size();
>>>> }
>>>>
>>>> The problem is that it still calculates 0; so first - is the syntax OK?
>>>>
>>>> Or perhaps the problem is with third argument?
>>>>
>>>> I grepped the code but failed to find piece of code that I would
>>> copy/paste
>>>> and use for my purposes.
>>>>
>>>> Thanks
>>>>
>>>> --
>>>>
>>> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
>>>> Your team Widelands Developers is subscribed to branch
>>> lp:~widelands-dev/widelands/one_world.
>>>>
>>>> _______________________________________________
>>>> Mailing list: https://launchpad.net/~widelands-dev
>>>> Post to : <email address hidden>
>>>> Unsubscribe : https://launchpad.net/~widelands-dev
>>>> More help : https://help.launchpad.net/ListHelp
>>>
>>>
>>> --
>>> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
>>> Your team Widelands Developers is subscribed to branch
>>> lp:~widelands-dev/widelands/one_world.
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~widelands-dev
>>> Post to : <email address hidden>
>>> Unsubscribe : https://launchpad.net/~widelands-dev
>>> More help : https://help.launchpad.net/ListHelp
>>>
>>
>> --
>> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
>> Your team Widelands Developers is subscribed to branch
>> lp:~widelands-dev/widelands/one_world.
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~widelands-dev
>> Post to : <email address hidden>
>> Unsubscribe : https://launchpad.net/~widelands-dev
>> More help : https://help.launchpad.net/ListHelp
>
>
> --
> https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
> Your team Widelands Developers is subscribed to branch
> lp:~widelands-dev/widelands/one_world.
>
> _______________________________________________
> Mailing li...

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-27 19:10:20 +0000
+++ CMakeLists.txt	2014-06-17 15:48:25 +0000
@@ -453,7 +453,7 @@
     global
     tribes
     txts
-    worlds
+    world
     pics
     scripting
   DESTINATION ${WL_INSTALL_DATADIR}

=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua'
--- campaigns/t02.wmf/scripting/mission_thread.lua	2014-03-25 06:18:48 +0000
+++ campaigns/t02.wmf/scripting/mission_thread.lua	2014-06-17 15:48:25 +0000
@@ -322,20 +322,20 @@
    end
 
    force_map_immovables{
-      { "tree3", 55, 19 },
-      { "tree7_s", 58, 19 },
-      { "tree5_m", 58, 20 },
-      { "tree7", 57, 21 },
-      { "tree4_s", 54, 22 },
-      { "tree5_s", 56, 24 },
-      { "tree1", 58, 24 },
-      { "tree7_s", 56, 25 },
-      { "tree3", 53, 27 },
-      { "tree7_s", 57, 27 },
-      { "tree1_m", 52, 29 },
-      { "tree5", 54, 30 },
-      { "tree6", 55, 30 },
-      { "tree7", 56, 30 },
+      { "spruce_summer_old", 55, 19 },
+      { "larch_summer_pole", 58, 19 },
+      { "birch_summer_mature", 58, 20 },
+      { "larch_summer_old", 57, 21 },
+      { "alder_summer_pole", 54, 22 },
+      { "birch_summer_pole", 56, 24 },
+      { "aspen_summer_old", 58, 24 },
+      { "larch_summer_pole", 56, 25 },
+      { "spruce_summer_old", 53, 27 },
+      { "larch_summer_pole", 57, 27 },
+      { "aspen_summer_mature", 52, 29 },
+      { "birch_summer_pole", 54, 30 },
+      { "beech_summer_old", 55, 30 },
+      { "larch_summer_old", 56, 30 },
       { "field2", 56, 14, "barbarians" },
       { "field0s",57, 14, "barbarians" },
       { "field2", 54, 15, "barbarians" },

=== modified file 'cmake/codecheck/rules/misused_tab'
--- cmake/codecheck/rules/misused_tab	2010-02-05 01:13:20 +0000
+++ cmake/codecheck/rules/misused_tab	2014-06-17 15:48:25 +0000
@@ -3,7 +3,7 @@
 
 """
 This catches a tab that comes after the first non-whitespace character on a
-line. Tabs should only be used for indentation.  
+line. Tabs should only be used for indentation.
 """
 
 error_msg = "Tabs are only allowed before the first non-whitespace character in line."

=== modified file 'cmake/codecheck/rules/space_as_indentation'
--- cmake/codecheck/rules/space_as_indentation	2010-02-05 01:13:20 +0000
+++ cmake/codecheck/rules/space_as_indentation	2014-06-17 15:48:25 +0000
@@ -3,17 +3,32 @@
 #
 
 """
-Cry when space appears as first character on a line. Indentation should be done with tabs.
-There is no reason to have spaces as the first line
+Indentation should be done with tabs, but spaces are allowed for alignment.
 
 This is not obligatory for macros, because of the Alignement of the \\ at the end
 """
 
+import re
+
 error_msg="Use tabs for indentation."
 
 strip_comments_and_strings = True
 strip_macros = True
-regexp = r"^ +"
+
+class EvalMatches( object ):
+    STARTS_WITH_SPACES = re.compile(r"^ +")
+    def __call__(self, lines, fn):
+        errors = []
+        for curline, l in enumerate(lines, 1):
+            if self.STARTS_WITH_SPACES.match(l):
+                last_char = l.rstrip()[-1] if l.rstrip() else ""
+                if last_char in ",{)":
+                    continue
+                errors.append( (fn, curline, error_msg))
+        return errors
+
+
+evaluate_matches = EvalMatches()
 
 forbidden = [
     "   if(a)\n",

=== modified file 'doc/sphinx/extract_rst.py'
--- doc/sphinx/extract_rst.py	2012-06-20 09:07:10 +0000
+++ doc/sphinx/extract_rst.py	2014-06-17 15:48:25 +0000
@@ -25,7 +25,7 @@
     Widelands. Return the base directory and the source/ directory."""
     curdir = p.abspath(p.dirname(__file__))
     source_dir = p.join(curdir, "source")
-    while not (p.exists(p.join(curdir, "tribes")) and p.exists(p.join(curdir, "worlds"))):
+    while not (p.exists(p.join(curdir, "tribes")) and p.exists(p.join(curdir, "world"))):
         curdir = p.abspath(p.join(curdir, p.pardir))
     return source_dir, curdir
 source_dir, base_dir = _find_basedir()

=== removed directory 'global/bobs'
=== removed file 'global/conf'
--- global/conf	2009-01-25 19:40:02 +0000
+++ global/conf	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[immovable types]
-bar-ruin00=_Ruin of a barbarian sentry
-bar-ruin01=_Ruin of a barbarian citadel
-bar-ruin02=_Ruin of a barbarian warehouse
-bar-ruin03=_Ruin of a barbarian farm
-debris00=_Debris
-debris01=_Debris
-debris02=_Debris

=== modified file 'maps/Trident of Fire.wmf/scripting/map_editing.lua'
--- maps/Trident of Fire.wmf/scripting/map_editing.lua	2014-02-22 14:33:44 +0000
+++ maps/Trident of Fire.wmf/scripting/map_editing.lua	2014-06-17 15:48:25 +0000
@@ -2,14 +2,14 @@
 function automatic_forester()
 
 local region_to_forest = map:get_field(0,0):region(23)
-	while true do 
+	while true do
 		for x,field in next,region_to_forest,f do
-			if not _fully_flooded(map:get_field(field.x,field.y)) then 
+			if not _fully_flooded(map:get_field(field.x,field.y)) then
 				if map:get_field(field.x,field.y).immovable == 	nil then
 					if (field.x + field.y) % 2 == 0 then
-						map:place_immovable("tree1_t", map:get_field(field.x,field.y))
+						map:place_immovable("aspen_summer_sapling", map:get_field(field.x,field.y))
 					else
-						map:place_immovable("tree2_t", map:get_field(field.x,field.y))
+						map:place_immovable("oak_summer_sapling", map:get_field(field.x,field.y))
 					end
 					sleep(750)
 				end
@@ -109,7 +109,7 @@
 			end
 		end
 		sleep(10*60*1000)
---		set back all eruptions		
+--		set back all eruptions
 		while fields_to_erupt.size > 0 do
 			local ff = fields_to_erupt:pop_at(1)
 			local tr_to_setback = Set:new{Triangle:new(ff._f,"d")}
@@ -163,7 +163,7 @@
    local rv = {
       _f = f,
       _td = ter_d,
-      _tr = ter_r, 
+      _tr = ter_r,
       __hash = ("%i_%i_%s_%s"):format(f.x, f.y, ter_d, ter_r),
    }
    setmetatable(rv,self)
@@ -178,5 +178,3 @@
 	end
 	return t1
 end
-
-

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2014-06-16 13:33:29 +0000
+++ src/ai/ai_help_structs.h	2014-06-17 15:48:25 +0000
@@ -29,6 +29,8 @@
 #include "logic/game.h"
 #include "logic/map.h"
 #include "logic/player.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 
 namespace Widelands {
 
@@ -102,10 +104,15 @@
 };
 
 struct FindNodeWater {
-	bool accept(const Map& map, const FCoords& coord) const {
-		return (map.world().terrain_descr(coord.field->terrain_d()).get_is() & TERRAIN_WATER) ||
-		       (map.world().terrain_descr(coord.field->terrain_r()).get_is() & TERRAIN_WATER);
+	FindNodeWater(const World& world) : world_(world) {}
+
+	bool accept(const Map& /* map */, const FCoords& coord) const {
+		return (world_.terrain_descr(coord.field->terrain_d()).get_is() & TerrainDescription::WATER) ||
+		       (world_.terrain_descr(coord.field->terrain_r()).get_is() & TerrainDescription::WATER);
 	}
+
+private:
+	const World& world_;
 };
 
 struct FindNodeWithFlagOrRoad {

=== modified file 'src/ai/ai_hints.h'
--- src/ai/ai_hints.h	2014-06-06 20:27:28 +0000
+++ src/ai/ai_hints.h	2014-06-17 15:48:25 +0000
@@ -23,7 +23,7 @@
 #include <SDL_types.h>
 #include <boost/noncopyable.hpp>
 
-struct Section;
+class Section;
 
 /// This struct is used to read out the data given in [aihints] section of a
 /// buildings conf file. It is used to tell the computer player about the

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-06-16 13:24:45 +0000
+++ src/ai/defaultai.cc	2014-06-17 15:48:25 +0000
@@ -42,7 +42,7 @@
 #include "logic/trainingsite.h"
 #include "logic/tribe.h"
 #include "logic/warehouse.h"
-#include "logic/world.h"
+#include "logic/world/world.h"
 #include "profile/profile.h"
 #include "upcast.h"
 
@@ -260,7 +260,7 @@
 
 	// collect information about the different buildings our tribe can construct
 	Building_Index const nr_buildings = tribe->get_nrbuildings();
-	const World& world = game().map().world();
+	const World & world = game().world();
 
 	for (Building_Index i = 0; i < nr_buildings; ++i) {
 		const Building_Descr& bld = *tribe->get_building_descr(i);
@@ -530,7 +530,7 @@
 		std::vector<Coords> water_list;
 
 		if (field.water_nearby_ == -1) {  //-1 means "value has never been calculated"
-			FindNodeWater find_water;
+			FindNodeWater find_water(game().world());
 			map.find_fields(Area<FCoords>(field.coords, 4), &water_list, find_water);
 			field.water_nearby_ = water_list.size();
 		}

=== modified file 'src/description_maintainer.h'
--- src/description_maintainer.h	2014-04-21 09:19:14 +0000
+++ src/description_maintainer.h	2014-06-17 15:48:25 +0000
@@ -20,11 +20,13 @@
 #ifndef DESCR_MAINTAINER_H
 #define DESCR_MAINTAINER_H
 
-#include <cassert>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
+#include "wexception.h"
+
 // Used to have a typesafe maintainer for description classes.
 template <typename T> struct DescriptionMaintainer {
 	// Adds the 'entry', will assert() if it is already registered. Returns the
@@ -62,11 +64,13 @@
 
 template <typename T>
 int32_t DescriptionMaintainer<T>::add(T * const item) {
-	assert(exists(item->name()) == nullptr);
+	if (exists(item->name()) != nullptr) {
+		throw wexception("Tried to add %s twice.", item->name().c_str());
+	}
 	int32_t index = items_.size();
 	items_.emplace_back(item);
 	name_to_index_[item->name()] = index;
-	return index;;
+	return index;
 }
 
 template <typename T> T* DescriptionMaintainer<T>::exists(const std::string& name) const {

=== modified file 'src/economy/flag.h'
--- src/economy/flag.h	2014-04-01 18:15:56 +0000
+++ src/economy/flag.h	2014-06-17 15:48:25 +0000
@@ -53,11 +53,11 @@
 	typedef std::vector<const WareInstance *> Wares;
 
 	friend class Economy;
-	friend struct Router;
 	friend class FlagQueue;
+	friend class Map_Flagdata_Data_Packet; // has to read/write this to a file
 	friend struct Map_Ware_Data_Packet;     // has to look at pending wares
 	friend struct Map_Waredata_Data_Packet; // has to look at pending wares
-	friend struct Map_Flagdata_Data_Packet; // has to read/write this to a file
+	friend struct Router;
 
 	Flag(); /// empty flag for savegame loading
 	Flag(Editor_Game_Base &, Player & owner, Coords); /// create a new flag

=== modified file 'src/economy/road.h'
--- src/economy/road.h	2014-04-01 18:15:56 +0000
+++ src/economy/road.h	2014-06-17 15:48:25 +0000
@@ -46,8 +46,8 @@
  * road.
  */
 struct Road : public PlayerImmovable {
-	friend struct Map_Roaddata_Data_Packet; // For saving
-	friend struct Map_Road_Data_Packet; // For init()
+	friend class Map_Roaddata_Data_Packet; // For saving
+	friend class Map_Road_Data_Packet; // For init()
 
 	static bool IsRoadDescr(Map_Object_Descr const *);
 

=== modified file 'src/economy/test/test_road.cc'
--- src/economy/test/test_road.cc	2014-02-22 18:04:02 +0000
+++ src/economy/test/test_road.cc	2014-06-17 15:48:25 +0000
@@ -27,6 +27,10 @@
 #include "logic/instances.h"
 #include "logic/player.h"
 
+namespace Widelands {
+class World;
+}  // namespace Widelands
+
 using namespace Widelands;
 
 /******************/
@@ -41,7 +45,7 @@
 struct TestingMap : public Map {
 	TestingMap(int const w, int const h) : Map() {set_size(w, h);}
 
-	virtual void recalc_for_field_area(Area<FCoords>) override {}
+	virtual void recalc_for_field_area(const World&, Area<FCoords>) override {}
 
 };
 
@@ -102,4 +106,3 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-

=== modified file 'src/economy/wares_queue.h'
--- src/economy/wares_queue.h	2014-04-21 10:00:16 +0000
+++ src/economy/wares_queue.h	2014-06-17 15:48:25 +0000
@@ -32,7 +32,6 @@
 struct Map_Map_Object_Saver;
 class Player;
 class Request;
-class WaresQueue;
 class Worker;
 
 /**

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2014-06-10 20:38:57 +0000
+++ src/editor/editorinteractive.cc	2014-06-17 15:48:25 +0000
@@ -38,6 +38,8 @@
 #include "logic/map.h"
 #include "logic/player.h"
 #include "logic/tribe.h"
+#include "logic/world/resource_description.h"
+#include "logic/world/world.h"
 #include "map_io/widelands_map_loader.h"
 #include "profile/profile.h"
 #include "scoped_timer.h"
@@ -110,8 +112,10 @@
 	m_toggle_minimap.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_minimap, this));
 	m_toggle_buildhelp.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_buildhelp, this));
 	m_toggle_player_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_playermenu, this));
-	m_undo.sigclicked.connect(boost::bind(&Editor_History::undo_action, &m_history));
-	m_redo.sigclicked.connect(boost::bind(&Editor_History::redo_action, &m_history));
+	m_undo.sigclicked.connect(
+	   boost::bind(&Editor_History::undo_action, &m_history, boost::cref(egbase().world())));
+	m_redo.sigclicked.connect(
+	   boost::bind(&Editor_History::redo_action, &m_history, boost::cref(egbase().world())));
 
 	m_toolbar.set_layout_toplevel(true);
 	m_toolbar.add(&m_toggle_main_menu,       UI::Box::AlignLeft);
@@ -155,17 +159,14 @@
 
 	//  Resources: we do not calculate default resources, therefore we do not
 	//  expect to meet them here.
-	const Widelands::World    &    world           = map.world();
-	OverlayManager        &       overlay_manager = map.overlay_manager();
-	Widelands::Extent        const extent          = map.extent();
+	OverlayManager& overlay_manager = map.overlay_manager();
+	Widelands::Extent const extent = map.extent();
 	iterate_Map_FCoords(map, extent, fc) {
 		if (uint8_t const amount = fc.field->get_resources_amount()) {
-			const std::string & immname =
-			    world.get_resource(fc.field->get_resources())->get_editor_pic
-			    (amount);
+			const std::string& immname =
+			   egbase().world().get_resource(fc.field->get_resources())->get_editor_pic(amount);
 			if (immname.size())
-				overlay_manager.register_overlay
-				(fc, g_gr->images().get(immname), 4);
+				overlay_manager.register_overlay(fc, g_gr->images().get(immname), 4);
 		}
 	}
 
@@ -183,36 +184,30 @@
 	egbase().cleanup_for_load();
 	m_history.reset();
 
-	std::unique_ptr<Widelands::Map_Loader> const ml(map.get_correct_loader(filename));
+	std::unique_ptr<Widelands::Map_Loader> ml(map.get_correct_loader(filename));
 	if (not ml.get())
 		throw warning
 			(_("Unsupported format"),
 			 _("Widelands could not load the file \"%s\". The file format seems to be incompatible."),
 			 filename.c_str());
+	ml->preload_map(true);
 
 	UI::ProgressWindow loader_ui("pics/editor.jpg");
 	std::vector<std::string> tipstext;
 	tipstext.push_back("editor");
+
+	m_history.reset();
+
 	GameTips editortips(loader_ui, tipstext);
 
-	{
-		std::string const old_world_name = map.get_world_name();
-		ml->preload_map(true);
-		if (strcmp(map.get_world_name(), old_world_name.c_str()))
-			change_world();
-	}
 	load_all_tribes(&egbase(), &loader_ui);
 
 	// Create the players. TODO SirVer this must be managed better
 	loader_ui.step(_("Creating players"));
 	iterate_player_numbers(p, map.get_nrplayers()) {
-		egbase().add_player
-		(p, 0, map.get_scenario_player_tribe(p),
-		 map.get_scenario_player_name(p));
+		egbase().add_player(p, 0, map.get_scenario_player_tribe(p), map.get_scenario_player_name(p));
 	}
 
-	loader_ui.step(_("Loading world data"));
-	ml->load_world();
 	ml->load_map_complete(egbase(), true);
 	loader_ui.step(_("Loading graphics..."));
 	egbase().load_graphics(loader_ui);
@@ -279,7 +274,7 @@
 void Editor_Interactive::map_clicked(bool should_draw) {
 	m_history.do_action
 		(tools.current(),
-		 tools.use_tool, egbase().map(),
+		 tools.use_tool, egbase().map(), egbase().world(),
 	     get_sel_pos(), *this, should_draw);
 	need_complete_redraw();
 	set_need_save(true);
@@ -469,14 +464,14 @@
 
 		case SDLK_z:
 			if ((code.mod & (KMOD_LCTRL | KMOD_RCTRL)) && (code.mod & (KMOD_LSHIFT | KMOD_RSHIFT)))
-				m_history.redo_action();
+				m_history.redo_action(egbase().world());
 			else if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				m_history.undo_action();
+				m_history.undo_action(egbase().world());
 			handled = true;
 			break;
 		case SDLK_y:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				m_history.redo_action();
+				m_history.redo_action(egbase().world());
 			handled = true;
 			break;
 		default:
@@ -512,8 +507,7 @@
 		//  A new tool has been selected. Remove all registered overlay callback
 		//  functions.
 		map.overlay_manager().remove_overlay_callback_function();
-		map.recalc_whole_map();
-
+		map.recalc_whole_map(egbase().world());
 	}
 	tools.current_pointer = &primary;
 	tools.use_tool        = which;
@@ -579,17 +573,7 @@
 	return false;
 }
 
-
-void Editor_Interactive::change_world() {
-	m_history.reset();
-	delete m_terrainmenu  .window;
-	delete m_immovablemenu.window;
-	delete m_bobmenu      .window;
-	delete m_resourcesmenu.window;
-}
-
-
-void Editor_Interactive::run_editor(const std::string & filename, const std::string& script_to_run) {
+void Editor_Interactive::run_editor(const std::string& filename, const std::string& script_to_run) {
 	Widelands::Editor_Game_Base editor(nullptr);
 	Editor_Interactive eia(editor);
 	editor.set_ibase(&eia); // TODO get rid of this
@@ -604,10 +588,12 @@
 			editor.set_map(&map);
 			if (filename.empty()) {
 				loader_ui.step("Creating empty map...");
-				map.create_empty_map
-				(64, 64, "greenland", _("No Name"),
-				 g_options.pull_section("global").get_string
-				 ("realname", _("Unknown")));
+				map.create_empty_map(
+				   editor.world(),
+				   64,
+				   64,
+				   _("No Name"),
+				   g_options.pull_section("global").get_string("realname", _("Unknown")));
 
 				load_all_tribes(&editor, &loader_ui);
 

=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h	2014-04-20 20:02:13 +0000
+++ src/editor/editorinteractive.h	2014-06-17 15:48:25 +0000
@@ -81,7 +81,6 @@
 			place_bob(delete_bob),
 			increase_resources(decrease_resources, set_resources),
 			set_port_space(unset_port_space)
-
 		{}
 		Editor_Tool & current() const {return *current_pointer;}
 		typedef std::vector<Editor_Tool *> Tool_Vector;
@@ -121,10 +120,6 @@
 	bool is_player_tribe_referenced(Widelands::Player_Number);
 	void set_need_save(bool const t) {m_need_save = t;}
 
-	/// Must be called when the world is changed. Takes care of closing the tool
-	/// menus that are showing elements from the old world.
-	void change_world();
-
 private:
 	void toggle_buildhelp();
 	void tool_menu_btn();

=== modified file 'src/editor/tools/editor_decrease_height_tool.cc'
--- src/editor/tools/editor_decrease_height_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_decrease_height_tool.cc	2014-06-17 15:48:25 +0000
@@ -27,12 +27,11 @@
 #include "logic/mapregion.h"
 
 /// Decreases the heights by a value. Chages surrounding nodes if necessary.
-int32_t Editor_Decrease_Height_Tool::handle_click_impl
-	(Widelands::Map & map,
-	Widelands::Node_and_Triangle<> center,
-	Editor_Interactive & /* parent */,
-	Editor_Action_Args & args)
-{
+int32_t Editor_Decrease_Height_Tool::handle_click_impl(Widelands::Map& map,
+                                                       const Widelands::World& world,
+                                                       Widelands::Node_and_Triangle<> center,
+                                                       Editor_Interactive& /* parent */,
+                                                       Editor_Action_Args& args) {
 	if (args.origHights.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
@@ -42,15 +41,15 @@
 		while (mr.advance(map));
 	}
 
-	return
-	    map.change_height
-	    (Widelands::Area<Widelands::FCoords>
-	     (map.get_fcoords(center.node), args.sel_radius),
-	     -args.change_by);
+	return map.change_height(
+	   world,
+	   Widelands::Area<Widelands::FCoords>(map.get_fcoords(center.node), args.sel_radius),
+	   -args.change_by);
 }
 
 int32_t Editor_Decrease_Height_Tool::handle_undo_impl
 	(Widelands::Map & map,
+	 const Widelands::World& world,
 	Widelands::Node_and_Triangle<> center,
 	Editor_Interactive & /* parent */,
 	Editor_Action_Args & args)
@@ -65,10 +64,10 @@
 		mr.location().field->set_height(*i); ++i;
 	} while (mr.advance(map));
 
-	map.recalc_for_field_area
-		(Widelands::Area<Widelands::FCoords>
-			(map.get_fcoords(center.node),
-				args.sel_radius + MAX_FIELD_HEIGHT / MAX_FIELD_HEIGHT_DIFF + 2));
+	map.recalc_for_field_area(world,
+	                          Widelands::Area<Widelands::FCoords>(
+	                             map.get_fcoords(center.node),
+	                             args.sel_radius + MAX_FIELD_HEIGHT / MAX_FIELD_HEIGHT_DIFF + 2));
 
 	return mr.radius() + 1;
 }
@@ -79,5 +78,3 @@
 	a.change_by = m_change_by;
 	return a;
 }
-
-

=== modified file 'src/editor/tools/editor_decrease_height_tool.h'
--- src/editor/tools/editor_decrease_height_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_decrease_height_tool.h	2014-06-17 15:48:25 +0000
@@ -27,11 +27,15 @@
 	Editor_Decrease_Height_Tool() : Editor_Tool(*this, *this), m_change_by(1) {}
 
 	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
+		(Widelands::Map & map,
+		 const Widelands::World& world,
+		 Widelands::Node_and_Triangle<> center,
 		 Editor_Interactive & parent, Editor_Action_Args & args) override;
 
 	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
+		(Widelands::Map & map,
+		 const Widelands::World& world,
+		 Widelands::Node_and_Triangle<> center,
 		 Editor_Interactive & parent, Editor_Action_Args & args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;

=== modified file 'src/editor/tools/editor_decrease_resources_tool.cc'
--- src/editor/tools/editor_decrease_resources_tool.cc	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_decrease_resources_tool.cc	2014-06-17 15:48:25 +0000
@@ -26,7 +26,8 @@
 #include "logic/field.h"
 #include "logic/mapregion.h"
 #include "logic/widelands_geometry.h"
-#include "logic/world.h"
+#include "logic/world/resource_description.h"
+#include "logic/world/world.h"
 #include "wui/overlay_manager.h"
 
 
@@ -34,12 +35,12 @@
  * Decrease the resources of the current field by one if
  * there is not already another resource there.
 */
-int32_t Editor_Decrease_Resources_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         /* parent */,
-	Editor_Action_Args         &         args)
-{
+int32_t
+Editor_Decrease_Resources_Tool::handle_click_impl(Widelands::Map& map,
+                                                  const Widelands::World& world,
+                                                  Widelands::Node_and_Triangle<> const center,
+                                                  Editor_Interactive& /* parent */,
+                                                  Editor_Action_Args& args) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
 	Widelands::Area<Widelands::FCoords>
@@ -55,14 +56,11 @@
 		args.orgResT.push_back(res);
 		args.orgRes.push_back(mr.location().field->get_resources_amount());
 
-		if
-		(res == args.cur_res
-		        and
-		        Editor_Change_Resource_Tool_Callback(mr.location(), map, args.cur_res))
-		{
+		if (res == args.cur_res &&
+		    Editor_Change_Resource_Tool_Callback(mr.location(), map, world, args.cur_res)) {
 			//  Ok, we're doing something. First remove the current overlays.
 			std::string str =
-			    map.world().get_resource(res)->get_editor_pic
+			    world.get_resource(res)->get_editor_pic
 			    (mr.location().field->get_resources_amount());
 			const Image* pic = g_gr->images().get(str);
 			map.overlay_manager().remove_overlay(mr.location(), pic);
@@ -73,24 +71,24 @@
 				mr.location().field->set_resources(args.cur_res, amount);
 				mr.location().field->set_starting_res_amount(amount);
 				//  set new overlay
-				str = map.world().get_resource(args.cur_res)->get_editor_pic(amount);
+				str = world.get_resource(args.cur_res)->get_editor_pic(amount);
 				pic = g_gr->images().get(str);
 				map.overlay_manager().register_overlay(mr.location(), pic, 4);
-				map.recalc_for_field_area
-				(Widelands::Area<Widelands::FCoords>(mr.location(), 0));
+				map.recalc_for_field_area(
+				   world, Widelands::Area<Widelands::FCoords>(mr.location(), 0));
 			}
 		}
 	} while (mr.advance(map));
 	return mr.radius();
 }
 
-int32_t Editor_Decrease_Resources_Tool::handle_undo_impl
-	(Widelands::Map & map,
-	Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent,
-	Editor_Action_Args & args)
-{
-	return parent.tools.set_resources.handle_undo_impl(map, center, parent, args);
+int32_t Editor_Decrease_Resources_Tool::handle_undo_impl(
+   Widelands::Map& map,
+   const Widelands::World& world,
+   Widelands::Node_and_Triangle<Widelands::Coords> center,
+   Editor_Interactive& parent,
+   Editor_Action_Args& args) {
+	return parent.tools.set_resources.handle_undo_impl(map, world, center, parent, args);
 }
 
 Editor_Action_Args Editor_Decrease_Resources_Tool::format_args_impl(Editor_Interactive & parent)

=== modified file 'src/editor/tools/editor_decrease_resources_tool.h'
--- src/editor/tools/editor_decrease_resources_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_decrease_resources_tool.h	2014-06-17 15:48:25 +0000
@@ -21,7 +21,6 @@
 #define EDITOR_DECREASE_RESOURCES_TOOL_H
 
 #include "editor/tools/editor_tool.h"
-#include "logic/world.h"
 
 ///  Decreases the resources of a node by a value.
 struct Editor_Decrease_Resources_Tool : public Editor_Tool {
@@ -29,13 +28,17 @@
 		: Editor_Tool(*this, *this), m_cur_res(0), m_change_by(1)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 
@@ -52,7 +55,7 @@
 
 private:
 	Widelands::Resource_Index m_cur_res;
-	int32_t                   m_change_by;
+	int32_t m_change_by;
 };
 
 #endif

=== modified file 'src/editor/tools/editor_delete_bob_tool.cc'
--- src/editor/tools/editor_delete_bob_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_delete_bob_tool.cc	2014-06-17 15:48:25 +0000
@@ -27,10 +27,12 @@
 /**
  * Deletes the bob at the given location
 */
-int32_t Editor_Delete_Bob_Tool::handle_click_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
+int32_t
+Editor_Delete_Bob_Tool::handle_click_impl(Widelands::Map& map,
+                                          const Widelands::World&,
+                                          Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                          Editor_Interactive& parent,
+                                          Editor_Action_Args& args) {
 	Widelands::Editor_Game_Base & egbase = parent.egbase();
 	const int32_t radius = args.sel_radius;
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -48,12 +50,14 @@
 	return radius + 2;
 }
 
-int32_t Editor_Delete_Bob_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
+int32_t
+Editor_Delete_Bob_Tool::handle_undo_impl(Widelands::Map& map,
+                                         const Widelands::World& world,
+                                         Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                         Editor_Interactive& parent,
+                                         Editor_Action_Args& args) {
 
-	uint32_t ret = parent.tools.place_bob.handle_undo_impl(map, center, parent, args);
+	uint32_t ret = parent.tools.place_bob.handle_undo_impl(map, world, center, parent, args);
 	args.obob_type.clear();
 	return ret;
 }
@@ -62,5 +66,3 @@
 {
 	return Editor_Tool::format_args_impl(parent);
 }
-
-

=== modified file 'src/editor/tools/editor_delete_bob_tool.h'
--- src/editor/tools/editor_delete_bob_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_delete_bob_tool.h	2014-06-17 15:48:25 +0000
@@ -26,13 +26,17 @@
 struct Editor_Delete_Bob_Tool : public Editor_Tool {
 	Editor_Delete_Bob_Tool() : Editor_Tool(*this, *this) {}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_delete_immovable_tool.cc'
--- src/editor/tools/editor_delete_immovable_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_delete_immovable_tool.cc	2014-06-17 15:48:25 +0000
@@ -28,12 +28,11 @@
 /**
  * Deletes the immovable at the given location
 */
-int32_t Editor_Delete_Immovable_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	 Widelands::Node_and_Triangle<> const center,
-	 Editor_Interactive       &           parent,
-	 Editor_Action_Args       &           args)
-{
+int32_t Editor_Delete_Immovable_Tool::handle_click_impl(Widelands::Map& map,
+                                                        const Widelands::World&,
+                                                        Widelands::Node_and_Triangle<> const center,
+                                                        Editor_Interactive& parent,
+                                                        Editor_Action_Args& args) {
 	Widelands::Editor_Game_Base & egbase = parent.egbase();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
@@ -54,15 +53,16 @@
 	return mr.radius() + 2;
 }
 
-int32_t Editor_Delete_Immovable_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
-	return parent.tools.place_immovable.handle_undo_impl(map, center, parent, args);
+int32_t Editor_Delete_Immovable_Tool::handle_undo_impl(
+   Widelands::Map& map,
+   const Widelands::World& world,
+   Widelands::Node_and_Triangle<Widelands::Coords> center,
+   Editor_Interactive& parent,
+   Editor_Action_Args& args) {
+	return parent.tools.place_immovable.handle_undo_impl(map, world, center, parent, args);
 }
 
 Editor_Action_Args Editor_Delete_Immovable_Tool::format_args_impl(Editor_Interactive & parent)
 {
 	return Editor_Tool::format_args_impl(parent);
 }
-

=== modified file 'src/editor/tools/editor_delete_immovable_tool.h'
--- src/editor/tools/editor_delete_immovable_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_delete_immovable_tool.h	2014-06-17 15:48:25 +0000
@@ -26,13 +26,17 @@
 struct Editor_Delete_Immovable_Tool : public Editor_Tool {
 	Editor_Delete_Immovable_Tool() : Editor_Tool(*this, *this) {}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_draw_tool.cc'
--- src/editor/tools/editor_draw_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_draw_tool.cc	2014-06-17 15:48:25 +0000
@@ -36,10 +36,12 @@
 	args.draw_actions.push_back(new Editor_Tool_Action(ac));
 }
 
-int32_t Editor_Draw_Tool::handle_click_impl
-	(Widelands::Map & /* map */, Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
-	Editor_Interactive & /* parent */, Editor_Action_Args & args)
-{
+int32_t
+Editor_Draw_Tool::handle_click_impl(Widelands::Map& /* map */,
+                                    const Widelands::World& world,
+                                    Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
+                                    Editor_Interactive& /* parent */,
+                                    Editor_Action_Args& args) {
 
 	for
 		(std::list<Editor_Tool_Action *>::iterator i = args.draw_actions.begin();
@@ -48,15 +50,17 @@
 	{
 		(*i)->tool.handle_click
 			(static_cast<Editor_Tool::Tool_Index>((*i)->i),
-				(*i)->map, (*i)->center, (*i)->parent, *((*i)->args));
+				(*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
 	}
 	return args.draw_actions.size();
 }
 
-int32_t Editor_Draw_Tool::handle_undo_impl
-	(Widelands::Map & /* map */, Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
-	Editor_Interactive & /* parent */, Editor_Action_Args & args)
-{
+int32_t
+Editor_Draw_Tool::handle_undo_impl(Widelands::Map& /* map */,
+                                   const Widelands::World& world,
+                                   Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
+                                   Editor_Interactive& /* parent */,
+                                   Editor_Action_Args& args) {
 	for
 		(std::list<Editor_Tool_Action *>::reverse_iterator i = args.draw_actions.rbegin();
 	        i != args.draw_actions.rend();
@@ -64,7 +68,7 @@
 	{
 		(*i)->tool.handle_undo
 		(static_cast<Editor_Tool::Tool_Index>((*i)->i),
-			(*i)->map, (*i)->center, (*i)->parent, *((*i)->args));
+			(*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
 	}
 	return args.draw_actions.size();
 }

=== modified file 'src/editor/tools/editor_draw_tool.h'
--- src/editor/tools/editor_draw_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_draw_tool.h	2014-06-17 15:48:25 +0000
@@ -28,13 +28,17 @@
 struct Editor_Draw_Tool : public Editor_Tool {
 	Editor_Draw_Tool() : Editor_Tool(*this, *this) {}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 
@@ -47,4 +51,3 @@
 };
 
 #endif
-

=== modified file 'src/editor/tools/editor_history.cc'
--- src/editor/tools/editor_history.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_history.cc	2014-06-17 15:48:25 +0000
@@ -55,8 +55,7 @@
 
 // === Editor_History === //
 
-uint32_t Editor_History::undo_action()
-{
+uint32_t Editor_History::undo_action(const Widelands::World& world) {
 	if (undo_stack.empty())
 		return 0;
 
@@ -67,14 +66,15 @@
 	m_undo_button.set_enabled(!undo_stack.empty());
 	m_redo_button.set_enabled(true);
 
-	return
-		uac.tool.handle_undo
-		(static_cast<Editor_Tool::Tool_Index>(uac.i),
-		 uac.map, uac.center, uac.parent, *uac.args);
+	return uac.tool.handle_undo(static_cast<Editor_Tool::Tool_Index>(uac.i),
+	                            uac.map,
+	                            world,
+	                            uac.center,
+	                            uac.parent,
+	                            *uac.args);
 }
 
-uint32_t Editor_History::redo_action()
-{
+uint32_t Editor_History::redo_action(const Widelands::World& world) {
 	if (redo_stack.empty())
 		return 0;
 
@@ -85,20 +85,21 @@
 	m_undo_button.set_enabled(true);
 	m_redo_button.set_enabled(!redo_stack.empty());
 
-	return
-		rac.tool.handle_click
-		(static_cast<Editor_Tool::Tool_Index>(rac.i),
-		 rac.map, rac.center, rac.parent, *rac.args);
+	return rac.tool.handle_click(static_cast<Editor_Tool::Tool_Index>(rac.i),
+	                             rac.map,
+	                             world,
+	                             rac.center,
+	                             rac.parent,
+	                             *rac.args);
 }
 
-uint32_t Editor_History::do_action
-	(Editor_Tool & tool,
-	Editor_Tool::Tool_Index ind,
-	Widelands::Map & map,
-	const Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent,
-	bool draw)
-{
+uint32_t Editor_History::do_action(Editor_Tool& tool,
+                                   Editor_Tool::Tool_Index ind,
+                                   Widelands::Map& map,
+                                   const Widelands::World& world,
+                                   const Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                   Editor_Interactive& parent,
+                                   bool draw) {
 	Editor_Tool_Action ac
 		(tool, static_cast<uint32_t>(ind),
 		 map, center, parent, tool.format_args(ind, parent));
@@ -130,7 +131,7 @@
 		m_undo_button.set_enabled(true);
 		m_redo_button.set_enabled(false);
 	}
-	return tool.handle_click(ind, map, center, parent, *ac.args);
+	return tool.handle_click(ind, map, world, center, parent, *ac.args);
 }
 
 
@@ -141,4 +142,3 @@
 	m_undo_button.set_enabled(false);
 	m_redo_button.set_enabled(false);
 }
-

=== modified file 'src/editor/tools/editor_history.h'
--- src/editor/tools/editor_history.h	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_history.h	2014-06-17 15:48:25 +0000
@@ -39,12 +39,15 @@
 	Editor_History(UI::Button & undo, UI::Button & redo):
 		m_undo_button(undo), m_redo_button(redo) {};
 
-	uint32_t do_action
-		(Editor_Tool & tool, Editor_Tool::Tool_Index ind, Widelands::Map & map,
-		 Widelands::Node_and_Triangle<> const center,
-		 Editor_Interactive & parent, bool draw = false);
-	uint32_t undo_action();
-	uint32_t redo_action();
+	uint32_t do_action(Editor_Tool& tool,
+	                   Editor_Tool::Tool_Index ind,
+	                   Widelands::Map& map,
+	                   const Widelands::World& world,
+	                   Widelands::Node_and_Triangle<> const center,
+	                   Editor_Interactive& parent,
+	                   bool draw = false);
+	uint32_t undo_action(const Widelands::World& world);
+	uint32_t redo_action(const Widelands::World& world);
 
 	/// Must be called after every change of map, world, or ... to avoid undo errors
 	void reset();
@@ -64,4 +67,3 @@
 
 
 #endif
-

=== modified file 'src/editor/tools/editor_increase_height_tool.cc'
--- src/editor/tools/editor_increase_height_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_increase_height_tool.cc	2014-06-17 15:48:25 +0000
@@ -25,36 +25,34 @@
 #include "logic/mapregion.h"
 
 /// Increases the heights by a value. Chages surrounding nodes if necessary.
-int32_t Editor_Increase_Height_Tool::handle_click_impl
-	(Widelands::Map & map,
-	Widelands::Node_and_Triangle<> center,
-	Editor_Interactive & /* parent */,
-	Editor_Action_Args & args)
-{
+int32_t Editor_Increase_Height_Tool::handle_click_impl(Widelands::Map& map,
+                                                       const Widelands::World& world,
+                                                       Widelands::Node_and_Triangle<> center,
+                                                       Editor_Interactive& /* parent */,
+                                                       Editor_Action_Args& args) {
 	if (args.origHights.empty()) {
-		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
-		(map,
-		 Widelands::Area<Widelands::FCoords>
-		 (map.get_fcoords(center.node), args.sel_radius + MAX_FIELD_HEIGHT / MAX_FIELD_HEIGHT_DIFF + 1));
+		Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
+		   map,
+		   Widelands::Area<Widelands::FCoords>(
+		      map.get_fcoords(center.node),
+		      args.sel_radius + MAX_FIELD_HEIGHT / MAX_FIELD_HEIGHT_DIFF + 1));
 		do {
 			args.origHights.push_back(mr.location().field->get_height());
 		} while (mr.advance(map));
 	}
 
-	return
-	    map.change_height
-	    (Widelands::Area<Widelands::FCoords>
-	     (map.get_fcoords(center.node), args.sel_radius),
-	     args.change_by);
+	return map.change_height(
+	   world,
+	   Widelands::Area<Widelands::FCoords>(map.get_fcoords(center.node), args.sel_radius),
+	   args.change_by);
 }
 
-int32_t Editor_Increase_Height_Tool::handle_undo_impl
-	(Widelands::Map & map,
-	Widelands::Node_and_Triangle<> center,
-	Editor_Interactive & parent,
-	Editor_Action_Args & args)
-{
-	return m_decrease_tool.handle_undo_impl(map, center, parent, args);
+int32_t Editor_Increase_Height_Tool::handle_undo_impl(Widelands::Map& map,
+                                                      const Widelands::World& world,
+                                                      Widelands::Node_and_Triangle<> center,
+                                                      Editor_Interactive& parent,
+                                                      Editor_Action_Args& args) {
+	return m_decrease_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
 Editor_Action_Args Editor_Increase_Height_Tool::format_args_impl(Editor_Interactive & parent)

=== modified file 'src/editor/tools/editor_increase_height_tool.h'
--- src/editor/tools/editor_increase_height_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_increase_height_tool.h	2014-06-17 15:48:25 +0000
@@ -34,13 +34,17 @@
 		m_change_by(1)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_increase_resources_tool.cc'
--- src/editor/tools/editor_increase_resources_tool.cc	2014-05-27 11:01:15 +0000
+++ src/editor/tools/editor_increase_resources_tool.cc	2014-06-17 15:48:25 +0000
@@ -23,39 +23,55 @@
 #include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/mapregion.h"
-#include "logic/world.h"
-#include "logic/worlddata.h"
+#include "logic/world/resource_description.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "wui/overlay_manager.h"
 
 using Widelands::TCoords;
 
+namespace  {
+
+int32_t resource_value(const Widelands::TerrainDescription& terrain,
+                       const Widelands::Resource_Index resource) {
+	if (!terrain.is_resource_valid(resource)) {
+		return -1;
+	}
+	if (terrain.get_is() & Widelands::TerrainDescription::UNPASSABLE) {
+		return 8;
+	}
+	return 1;
+}
+
+}  // namespace
+
+
 int32_t Editor_Change_Resource_Tool_Callback
-	(const TCoords<Widelands::FCoords>& c, Widelands::Map& map, int32_t const curres)
+	(const TCoords<Widelands::FCoords>& c, Widelands::Map& map,
+	 const Widelands::World& world, int32_t const curres)
 {
-	Widelands::World & world = map.world();
 	Widelands::FCoords f(c, &map[c]);
 
 	Widelands::FCoords f1;
 	int32_t count = 0;
 
 	//  this field
-	count += world.terrain_descr(f.field->terrain_r()).resource_value(curres);
-	count += world.terrain_descr(f.field->terrain_d()).resource_value(curres);
-
+	count += resource_value(world.terrain_descr(f.field->terrain_r()), curres);
+	count += resource_value(world.terrain_descr(f.field->terrain_d()), curres);
 
 	//  If one of the neighbours is unpassable, count its resource stronger.
 	//  top left neigbour
 	map.get_neighbour(f, Widelands::WALK_NW, &f1);
-	count += world.terrain_descr(f1.field->terrain_r()).resource_value(curres);
-	count += world.terrain_descr(f1.field->terrain_d()).resource_value(curres);
+	count += resource_value(world.terrain_descr(f1.field->terrain_r()), curres);
+	count += resource_value(world.terrain_descr(f1.field->terrain_d()), curres);
 
 	//  top right neigbour
 	map.get_neighbour(f, Widelands::WALK_NE, &f1);
-	count += world.terrain_descr(f1.field->terrain_d()).resource_value(curres);
+	count += resource_value(world.terrain_descr(f1.field->terrain_d()), curres);
 
 	//  left neighbour
 	map.get_neighbour(f, Widelands::WALK_W, &f1);
-	count += world.terrain_descr(f1.field->terrain_r()).resource_value(curres);
+	count += resource_value(world.terrain_descr(f1.field->terrain_r()), curres);
 
 	return count <= 3 ? 0 : f.field->nodecaps();
 }
@@ -68,23 +84,21 @@
 there is not already another resource there.
 ===========
 */
-int32_t Editor_Increase_Resources_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         /* parent */,
-	Editor_Action_Args         &         args)
-{
-	const Widelands::World & world = map.world();
+int32_t
+Editor_Increase_Resources_Tool::handle_click_impl(Widelands::Map& map,
+                                                  const Widelands::World& world,
+                                                  Widelands::Node_and_Triangle<> const center,
+                                                  Editor_Interactive& /* parent */,
+                                                  Editor_Action_Args& args) {
 	OverlayManager & overlay_manager = map.overlay_manager();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
 			Widelands::Area<Widelands::FCoords>
 				(map.get_fcoords(center.node), args.sel_radius));
 	do {
-		int32_t res        = mr.location().field->get_resources();
-		int32_t amount     = mr.location().field->get_resources_amount();
-		int32_t max_amount =
-		    map.get_world()->get_resource(args.cur_res)->get_max_amount();
+		int32_t res = mr.location().field->get_resources();
+		int32_t amount = mr.location().field->get_resources_amount();
+		int32_t max_amount = world.get_resource(args.cur_res)->max_amount();
 
 		amount += args.change_by;
 		if (amount > max_amount)
@@ -96,7 +110,7 @@
 		if
 		((res == args.cur_res or not mr.location().field->get_resources_amount())
 		        and
-		        Editor_Change_Resource_Tool_Callback(mr.location(), map, args.cur_res))
+		        Editor_Change_Resource_Tool_Callback(mr.location(), map, world, args.cur_res))
 		{
 			//  Ok, we're doing something. First remove the current overlays.
 			const Image* pic =
@@ -115,20 +129,21 @@
 				pic = g_gr->images().get
 				        (world.get_resource(args.cur_res)->get_editor_pic(amount));
 				overlay_manager.register_overlay(mr.location(), pic, 4);
-				map.recalc_for_field_area
-				(Widelands::Area<Widelands::FCoords>(mr.location(), 0));
+				map.recalc_for_field_area(
+				   world, Widelands::Area<Widelands::FCoords>(mr.location(), 0));
 			}
 		}
 	} while (mr.advance(map));
 	return mr.radius();
 }
 
-int32_t Editor_Increase_Resources_Tool::handle_undo_impl
-	(Widelands::Map & map,
-	Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
-	return m_set_tool.handle_undo_impl(map, center, parent, args);
+int32_t Editor_Increase_Resources_Tool::handle_undo_impl(
+   Widelands::Map& map,
+   const Widelands::World& world,
+   Widelands::Node_and_Triangle<Widelands::Coords> center,
+   Editor_Interactive& parent,
+   Editor_Action_Args& args) {
+	return m_set_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
 Editor_Action_Args Editor_Increase_Resources_Tool::format_args_impl(Editor_Interactive & parent)

=== modified file 'src/editor/tools/editor_increase_resources_tool.h'
--- src/editor/tools/editor_increase_resources_tool.h	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_increase_resources_tool.h	2014-06-17 15:48:25 +0000
@@ -26,22 +26,26 @@
 
 /// Increases the resources of a node by a value.
 struct Editor_Increase_Resources_Tool : public Editor_Tool {
-	Editor_Increase_Resources_Tool
-	(Editor_Decrease_Resources_Tool & the_decrease_tool,
-	 Editor_Set_Resources_Tool    &   the_set_to_tool)
-		:
-		Editor_Tool(the_decrease_tool, the_set_to_tool),
-		m_decrease_tool(the_decrease_tool), m_set_tool(the_set_to_tool),
-		m_change_by(1), m_cur_res(0)
-	{}
-
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
-
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	Editor_Increase_Resources_Tool(Editor_Decrease_Resources_Tool& the_decrease_tool,
+	                               Editor_Set_Resources_Tool& the_set_to_tool)
+	   : Editor_Tool(the_decrease_tool, the_set_to_tool),
+	     m_decrease_tool(the_decrease_tool),
+	     m_set_tool(the_set_to_tool),
+	     m_change_by(1),
+	     m_cur_res(0) {
+	}
+
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
+
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 
@@ -63,12 +67,14 @@
 
 private:
 	Editor_Decrease_Resources_Tool & m_decrease_tool;
-	Editor_Set_Resources_Tool    &   m_set_tool;
-	int32_t                              m_change_by;
+	Editor_Set_Resources_Tool& m_set_tool;
+	int32_t m_change_by;
 	Widelands::Resource_Index m_cur_res;
 };
 
-int32_t Editor_Change_Resource_Tool_Callback
-	(const Widelands::TCoords<Widelands::FCoords>&, Widelands::Map&, int32_t);
+int32_t Editor_Change_Resource_Tool_Callback(const Widelands::TCoords<Widelands::FCoords>& c,
+                                             Widelands::Map& map,
+                                             const Widelands::World& world,
+                                             int32_t const curres);
 
 #endif

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2014-03-09 10:28:39 +0000
+++ src/editor/tools/editor_info_tool.cc	2014-06-17 15:48:25 +0000
@@ -26,18 +26,17 @@
 #include "editor/editorinteractive.h"
 #include "i18n.h"
 #include "logic/map.h"
-#include "logic/world.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/window.h"
 
 /// Show a window with information about the pointed at node and triangle.
-int32_t Editor_Info_Tool::handle_click_impl
-	(Widelands::Map            &         map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         parent,
-	Editor_Action_Args         &         /* args */)
-{
-	const Widelands::World & world = map.world();
+int32_t Editor_Info_Tool::handle_click_impl(Widelands::Map& map,
+					    const Widelands::World& world,
+					    Widelands::Node_and_Triangle<> center,
+					    Editor_Interactive& parent,
+					    Editor_Action_Args& /* args */) {
 	UI::Window * const w =
 	    new UI::Window
 	(&parent, "field_information", 30, 30, 400, 200,
@@ -97,9 +96,8 @@
 	buf += std::string("\n") + _("Terrain:") + "\n";
 
 	const Widelands::Field         & tf  = map[center.triangle];
-	const Widelands::Terrain_Descr & ter = world.terrain_descr
-	                                       (center.triangle.t == Widelands::TCoords<>::D ?
-	                                        tf.terrain_d() : tf.terrain_r());
+	const Widelands::TerrainDescription& ter = world.terrain_descr(
+	   center.triangle.t == Widelands::TCoords<>::D ? tf.terrain_d() : tf.terrain_r());
 
 	buf += std::string("• ") + (boost::format(_("Name: %s")) % ter.descname()).str() + "\n";
 	buf += std::string("• ") + (boost::format(_("Texture Number: %i")) % ter.get_texture()).str() + "\n";
@@ -134,12 +132,6 @@
 	buf += std::string("• ") + (boost::format(_("Author: %s")) % map.get_author()).str() + "\n";
 	buf += std::string("• ") + (boost::format(_("Descr: %s")) % map.get_description()).str() + "\n";
 
-	// *** World info
-	buf += std::string("\n") + _("World:") + "\n";
-	buf += std::string("• ") + (boost::format(_("Name: %s")) % world.get_name()).str() + "\n";
-	buf += std::string("• ") + (boost::format(_("Author: %s")) % world.get_author()).str() + "\n";
-	buf += std::string("• ") + (boost::format(_("Descr: %s")) % world.get_descr()).str() + "\n";
-
 	multiline_textarea->set_text(buf.c_str());
 
 	return 0;

=== modified file 'src/editor/tools/editor_info_tool.h'
--- src/editor/tools/editor_info_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_info_tool.h	2014-06-17 15:48:25 +0000
@@ -24,13 +24,18 @@
 
 /// A simple tool to show information about the clicked node.
 struct Editor_Info_Tool : public Editor_Tool {
-	Editor_Info_Tool() : Editor_Tool(*this, *this, false) {}
-
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
-
-	char const * get_sel_impl() const override {return "pics/fsel_editor_info.png";}
+	Editor_Info_Tool() : Editor_Tool(*this, *this, false) {
+	}
+
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
+
+	char const* get_sel_impl() const override {
+		return "pics/fsel_editor_info.png";
+	}
 };
 
 #endif

=== modified file 'src/editor/tools/editor_make_infrastructure_tool.cc'
--- src/editor/tools/editor_make_infrastructure_tool.cc	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_make_infrastructure_tool.cc	2014-06-17 15:48:25 +0000
@@ -46,12 +46,11 @@
  *
  * Obviously, this function ignores the sel radius
 */
-int32_t Editor_Make_Infrastructure_Tool::handle_click_impl
-	(Widelands::Map &,
-	Widelands::Node_and_Triangle<> const,
-	Editor_Interactive         &         parent,
-	Editor_Action_Args         &         /* args */)
-{
+int32_t Editor_Make_Infrastructure_Tool::handle_click_impl(Widelands::Map&,
+                                                           const Widelands::World&,
+                                                           Widelands::Node_and_Triangle<> const,
+                                                           Editor_Interactive& parent,
+                                                           Editor_Action_Args& /* args */) {
 	show_field_action
 	(&parent, parent.egbase().get_player(m_player), &m_registry);
 

=== modified file 'src/editor/tools/editor_make_infrastructure_tool.h'
--- src/editor/tools/editor_make_infrastructure_tool.h	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_make_infrastructure_tool.h	2014-06-17 15:48:25 +0000
@@ -23,6 +23,10 @@
 #include "editor/tools/editor_tool.h"
 #include "ui_basic/unique_window.h"
 
+namespace Widelands {
+class Editor_Game_Base;
+}  // namespace Widelands
+
 /**
  * This places immovables on the map
  * \TODO Implement undo for this tool
@@ -35,9 +39,11 @@
 	Widelands::Player_Number get_player() const
 		{return m_player;}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
 	const char * get_sel_impl() const override
 		{return "pics/fsel.png";} //  Standard sel icon, most complex tool of all

=== modified file 'src/editor/tools/editor_noise_height_tool.cc'
--- src/editor/tools/editor_noise_height_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_noise_height_tool.cc	2014-06-17 15:48:25 +0000
@@ -27,12 +27,11 @@
 #include "logic/mapregion.h"
 
 /// Sets the heights to random values. Changes surrounding nodes if necessary.
-int32_t Editor_Noise_Height_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         /* parent */,
-	Editor_Action_Args & args)
-{
+int32_t Editor_Noise_Height_Tool::handle_click_impl(Widelands::Map& map,
+                                                    const Widelands::World& world,
+                                                    Widelands::Node_and_Triangle<> const center,
+                                                    Editor_Interactive& /* parent */,
+                                                    Editor_Action_Args& args) {
 	if (args.origHights.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
@@ -50,27 +49,25 @@
 	 Widelands::Area<Widelands::FCoords>
 	 (map.get_fcoords(center.node), args.sel_radius));
 	do {
-		max =
-		    std::max
-		    (max,
-		     map.set_height
-		     (mr.location(),
-		      args.m_interval.min
-		      +
-		      static_cast<int32_t>
-		      (static_cast<double>
-		       (args.m_interval.max - args.m_interval.min + 1) * rand()
-		       /
-		       (RAND_MAX + 1.0))));
+		max = std::max(
+		   max,
+		   map.set_height(world,
+		                  mr.location(),
+		                  args.m_interval.min +
+		                     static_cast<int32_t>(
+		                        static_cast<double>(args.m_interval.max - args.m_interval.min + 1) *
+		                        rand() / (RAND_MAX + 1.0))));
 	} while (mr.advance(map));
 	return mr.radius() + max;
 }
 
-int32_t Editor_Noise_Height_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
-	return m_set_tool.handle_undo_impl(map, center, parent, args);
+int32_t
+Editor_Noise_Height_Tool::handle_undo_impl(Widelands::Map& map,
+                                           const Widelands::World& world,
+                                           Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                           Editor_Interactive& parent,
+                                           Editor_Action_Args& args) {
+	return m_set_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
 Editor_Action_Args Editor_Noise_Height_Tool::format_args_impl(Editor_Interactive & parent)
@@ -79,4 +76,3 @@
 	a.m_interval = m_interval;
 	return a;
 }
-

=== modified file 'src/editor/tools/editor_noise_height_tool.h'
--- src/editor/tools/editor_noise_height_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_noise_height_tool.h	2014-06-17 15:48:25 +0000
@@ -34,13 +34,17 @@
 		m_interval(the_interval)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_place_bob_tool.cc'
--- src/editor/tools/editor_place_bob_tool.cc	2014-03-31 20:21:27 +0000
+++ src/editor/tools/editor_place_bob_tool.cc	2014-06-17 15:48:25 +0000
@@ -24,17 +24,17 @@
 #include "logic/editor_game_base.h"
 #include "logic/field.h"
 #include "logic/mapregion.h"
+#include "logic/world/world.h"
 
 /**
  * Choses an object to place randomly from all enabled
  * and places this on the current field
 */
-int32_t Editor_Place_Bob_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	 Widelands::Node_and_Triangle<> const center,
-	 Editor_Interactive       &           parent,
-	 Editor_Action_Args       &           args)
-{
+int32_t Editor_Place_Bob_Tool::handle_click_impl(Widelands::Map& map,
+                                                 const Widelands::World& world,
+                                                 Widelands::Node_and_Triangle<> const center,
+                                                 Editor_Interactive& parent,
+                                                 Editor_Action_Args& args) {
 
 	if (get_nr_enabled() && args.obob_type.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -44,7 +44,7 @@
 		do {
 			Widelands::Bob * const mbob = mr.location().field->get_first_bob();
 			args.obob_type.push_back((mbob ? &mbob->descr() : nullptr));
-			args.nbob_type.push_back(map.world().get_bob_descr(get_random_enabled()));
+			args.nbob_type.push_back(world.get_bob_descr(get_random_enabled()));
 		} while (mr.advance(map));
 	}
 
@@ -69,10 +69,12 @@
 		return 0;
 }
 
-int32_t Editor_Place_Bob_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
+int32_t
+Editor_Place_Bob_Tool::handle_undo_impl(Widelands::Map& map,
+                                        const Widelands::World&,
+                                        Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                        Editor_Interactive& parent,
+                                        Editor_Action_Args& args) {
 	if (not args.nbob_type.empty()) {
 		Widelands::Editor_Game_Base & egbase = parent.egbase();
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr

=== modified file 'src/editor/tools/editor_place_bob_tool.h'
--- src/editor/tools/editor_place_bob_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_place_bob_tool.h	2014-06-17 15:48:25 +0000
@@ -29,13 +29,17 @@
 		: Editor_Tool(tool, tool)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_place_immovable_tool.cc'
--- src/editor/tools/editor_place_immovable_tool.cc	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_place_immovable_tool.cc	2014-06-17 15:48:25 +0000
@@ -32,12 +32,11 @@
  * Choses an object to place randomly from all enabled
  * and places this on the current field
 */
-int32_t Editor_Place_Immovable_Tool::handle_click_impl
-	(Widelands::Map            &         map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         parent,
-	Editor_Action_Args         &         args)
-{
+int32_t Editor_Place_Immovable_Tool::handle_click_impl(Widelands::Map& map,
+                                                       const Widelands::World&,
+                                                       Widelands::Node_and_Triangle<> const center,
+                                                       Editor_Interactive& parent,
+                                                       Editor_Action_Args& args) {
 	const int32_t radius = args.sel_radius;
 	if (not get_nr_enabled())
 		return radius;
@@ -74,10 +73,12 @@
 	return radius + 2;
 }
 
-int32_t Editor_Place_Immovable_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
+int32_t Editor_Place_Immovable_Tool::handle_undo_impl(
+   Widelands::Map& map,
+   const Widelands::World&,
+   Widelands::Node_and_Triangle<Widelands::Coords> center,
+   Editor_Interactive& parent,
+   Editor_Action_Args& args) {
 	const int32_t radius = args.sel_radius;
 	if (args.oimmov_types.empty())
 		return radius;
@@ -107,6 +108,3 @@
 {
 	return Editor_Tool::format_args_impl(parent);
 }
-
-
-

=== modified file 'src/editor/tools/editor_place_immovable_tool.h'
--- src/editor/tools/editor_place_immovable_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_place_immovable_tool.h	2014-06-17 15:48:25 +0000
@@ -31,13 +31,17 @@
 		: Editor_Tool(tool, tool)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_set_height_tool.cc'
--- src/editor/tools/editor_set_height_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_set_height_tool.cc	2014-06-17 15:48:25 +0000
@@ -26,12 +26,11 @@
 #include "logic/map.h"
 #include "logic/mapregion.h"
 
-
-int32_t Editor_Set_Height_Tool::handle_click_impl
-	(Widelands::Map           &           map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive         &         /* parent */, Editor_Action_Args & args)
-{
+int32_t Editor_Set_Height_Tool::handle_click_impl(Widelands::Map& map,
+                                                  const Widelands::World& world,
+                                                  Widelands::Node_and_Triangle<> const center,
+                                                  Editor_Interactive& /* parent */,
+                                                  Editor_Action_Args& args) {
 	if (args.origHights.empty())
 	{
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -41,17 +40,18 @@
 		do args.origHights.push_back(mr.location().field->get_height());
 		while (mr.advance(map));
 	}
-	return
-	    map.set_height
-	    (Widelands::Area<Widelands::FCoords>
-	     (map.get_fcoords(center.node), args.sel_radius),
-	     args.m_interval);
+	return map.set_height(
+	   world,
+	   Widelands::Area<Widelands::FCoords>(map.get_fcoords(center.node), args.sel_radius),
+	   args.m_interval);
 }
 
-int32_t Editor_Set_Height_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & /* parent */, Editor_Action_Args & args)
-{
+int32_t
+Editor_Set_Height_Tool::handle_undo_impl(Widelands::Map& map,
+                                         const Widelands::World& world,
+                                         Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                         Editor_Interactive& /* parent */,
+                                         Editor_Action_Args& args) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
 	Widelands::Area<Widelands::FCoords>
@@ -65,7 +65,7 @@
 	} while (mr.advance(map));
 
 	map.recalc_for_field_area
-		(Widelands::Area<Widelands::FCoords>
+		(world, Widelands::Area<Widelands::FCoords>
 		(map.get_fcoords(center.node),
 		args.sel_radius + MAX_FIELD_HEIGHT / MAX_FIELD_HEIGHT_DIFF + 2));
 
@@ -78,6 +78,3 @@
 	a.m_interval = m_interval;
 	return a;
 }
-
-
-

=== modified file 'src/editor/tools/editor_set_height_tool.h'
--- src/editor/tools/editor_set_height_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_set_height_tool.h	2014-06-17 15:48:25 +0000
@@ -30,13 +30,17 @@
 		: Editor_Tool(*this, *this), m_interval(10, 10)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_set_origin_tool.cc'
--- src/editor/tools/editor_set_origin_tool.cc	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_set_origin_tool.cc	2014-06-17 15:48:25 +0000
@@ -24,12 +24,11 @@
 #include "wui/mapviewpixelconstants.h"
 #include "wui/overlay_manager.h"
 
-int32_t Editor_Set_Origin_Tool::handle_click_impl
-	(Widelands::Map           &          map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive        &          eia,
-	Editor_Action_Args        &          /* args */)
-{
+int32_t Editor_Set_Origin_Tool::handle_click_impl(Widelands::Map& map,
+                                                  const Widelands::World&,
+                                                  Widelands::Node_and_Triangle<> const center,
+                                                  Editor_Interactive& eia,
+                                                  Editor_Action_Args& /* args */) {
 	map.set_origin(center.node);
 	eia.register_overlays();
 	eia.set_rel_viewpoint
@@ -40,10 +39,12 @@
 	return 0;
 }
 
-int32_t Editor_Set_Origin_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & /* args */)
-{
+int32_t
+Editor_Set_Origin_Tool::handle_undo_impl(Widelands::Map& map,
+                                         const Widelands::World&,
+                                         Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                         Editor_Interactive& parent,
+                                         Editor_Action_Args& /* args */) {
 	Widelands::Coords nc
 		(map.get_width()  - center.node.x,
 		 map.get_height() - center.node.y);

=== modified file 'src/editor/tools/editor_set_origin_tool.h'
--- src/editor/tools/editor_set_origin_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_set_origin_tool.h	2014-06-17 15:48:25 +0000
@@ -27,13 +27,17 @@
 struct Editor_Set_Origin_Tool : public Editor_Tool {
 	Editor_Set_Origin_Tool() : Editor_Tool(*this, *this) {}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & eia, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& eia,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_set_port_space_tool.cc'
--- src/editor/tools/editor_set_port_space_tool.cc	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_set_port_space_tool.cc	2014-06-17 15:48:25 +0000
@@ -55,12 +55,11 @@
 	Editor_Tool(*this, *this)
 {}
 
-
-int32_t Editor_Set_Port_Space_Tool::handle_click_impl
-	(Map & map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive &,  Editor_Action_Args & args)
-{
+int32_t Editor_Set_Port_Space_Tool::handle_click_impl(Map& map,
+                                                      const Widelands::World& world,
+                                                      Widelands::Node_and_Triangle<> const center,
+                                                      Editor_Interactive&,
+                                                      Editor_Action_Args& args) {
 	assert(0 <= center.node.x);
 	assert(center.node.x < map.get_width());
 	assert(0 <= center.node.y);
@@ -75,7 +74,7 @@
 		if (Editor_Tool_Set_Port_Space_Callback(mr.location(), map)) {
 			map.set_port_space(mr.location(), true);
 			Area<FCoords> a(mr.location(), 0);
-			map.recalc_for_field_area(a);
+			map.recalc_for_field_area(world, a);
 			++nr;
 		}
 	} while (mr.advance(map));
@@ -83,19 +82,19 @@
 	return nr;
 }
 
-int32_t Editor_Set_Port_Space_Tool::handle_undo_impl
-	(Map & map, Node_and_Triangle< Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
-	return parent.tools.unset_port_space.handle_click_impl(map, center, parent, args);
+int32_t Editor_Set_Port_Space_Tool::handle_undo_impl(Map& map,
+                                                     const Widelands::World& world,
+                                                     Node_and_Triangle<Coords> center,
+                                                     Editor_Interactive& parent,
+                                                     Editor_Action_Args& args) {
+	return parent.tools.unset_port_space.handle_click_impl(map, world, center, parent, args);
 }
 
-
-int32_t Editor_Unset_Port_Space_Tool::handle_click_impl
-	(Map & map,
-	Node_and_Triangle<> const center,
-	Editor_Interactive &, Editor_Action_Args & args)
-{
+int32_t Editor_Unset_Port_Space_Tool::handle_click_impl(Map& map,
+                                                        const Widelands::World& world,
+                                                        Node_and_Triangle<> const center,
+                                                        Editor_Interactive&,
+                                                        Editor_Action_Args& args) {
 	assert(0 <= center.node.x);
 	assert(center.node.x < map.get_width());
 	assert(0 <= center.node.y);
@@ -110,7 +109,7 @@
 		if (Editor_Tool_Set_Port_Space_Callback(mr.location(), map)) {
 			map.set_port_space(mr.location(), false);
 			Area<FCoords> a(mr.location(), 0);
-			map.recalc_for_field_area(a);
+			map.recalc_for_field_area(world, a);
 			++nr;
 		}
 	} while (mr.advance(map));
@@ -118,10 +117,10 @@
 	return nr;
 }
 
-
-int32_t Editor_Unset_Port_Space_Tool::handle_undo_impl
-	(Map & map, Node_and_Triangle< Coords > center,
-	Editor_Interactive & parent, Editor_Action_Args & args)
-{
-	return parent.tools.set_port_space.handle_click_impl(map, center, parent, args);
+int32_t Editor_Unset_Port_Space_Tool::handle_undo_impl(Map& map,
+                                                       const Widelands::World& world,
+                                                       Node_and_Triangle<Coords> center,
+                                                       Editor_Interactive& parent,
+                                                       Editor_Action_Args& args) {
+	return parent.tools.set_port_space.handle_click_impl(map, world, center, parent, args);
 }

=== modified file 'src/editor/tools/editor_set_port_space_tool.h'
--- src/editor/tools/editor_set_port_space_tool.h	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_set_port_space_tool.h	2014-06-17 15:48:25 +0000
@@ -31,13 +31,17 @@
 public:
 	Editor_Unset_Port_Space_Tool();
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	char const * get_sel_impl() const override {return FSEL_EUPS_FILENAME;}
 };
@@ -48,13 +52,17 @@
 public:
 	Editor_Set_Port_Space_Tool(Editor_Unset_Port_Space_Tool &);
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	char const * get_sel_impl() const override {return FSEL_ESPS_FILENAME;}
 };

=== modified file 'src/editor/tools/editor_set_resources_tool.cc'
--- src/editor/tools/editor_set_resources_tool.cc	2014-05-27 11:01:15 +0000
+++ src/editor/tools/editor_set_resources_tool.cc	2014-06-17 15:48:25 +0000
@@ -25,19 +25,18 @@
 #include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/mapregion.h"
-#include "logic/world.h"
+#include "logic/world/resource_description.h"
+#include "logic/world/world.h"
 #include "wui/overlay_manager.h"
 
 /**
  * Sets the resources of the current to a fixed value
 */
-int32_t Editor_Set_Resources_Tool::handle_click_impl
-	(Widelands::Map           &          map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive        &          /* parent */,
-	Editor_Action_Args        &          args)
-{
-	const Widelands::World & world = map.world();
+int32_t Editor_Set_Resources_Tool::handle_click_impl(Widelands::Map& map,
+                                                     const Widelands::World& world,
+                                                     Widelands::Node_and_Triangle<> const center,
+                                                     Editor_Interactive& /* parent */,
+                                                     Editor_Action_Args& args) {
 	OverlayManager & overlay_manager = map.overlay_manager();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
@@ -46,7 +45,7 @@
 	do {
 		int32_t res        = mr.location().field->get_resources();
 		int32_t amount     = args.set_to;
-		int32_t max_amount = world.get_resource(args.cur_res)->get_max_amount();
+		int32_t max_amount = world.get_resource(args.cur_res)->max_amount();
 
 		if (amount < 0)
 			amount = 0;
@@ -56,7 +55,7 @@
 		args.orgResT.push_back(res);
 		args.orgRes.push_back(mr.location().field->get_resources_amount());
 
-		if (Editor_Change_Resource_Tool_Callback(mr.location(), map, args.cur_res)) {
+		if (Editor_Change_Resource_Tool_Callback(mr.location(), map, world, args.cur_res)) {
 			//  Ok, we're doing something. First remove the current overlays.
 			const Image* pic = g_gr->images().get
 				(world.get_resource(res)->get_editor_pic (mr.location().field->get_resources_amount()));
@@ -72,19 +71,19 @@
 				pic =
 				    g_gr->images().get(world.get_resource(args.cur_res)->get_editor_pic(amount));
 				overlay_manager.register_overlay(mr.location(), pic, 4);
-				map.recalc_for_field_area
-				(Widelands::Area<Widelands::FCoords>(mr.location(), 0));
+				map.recalc_for_field_area(world, Widelands::Area<Widelands::FCoords>(mr.location(), 0));
 			}
 		}
 	} while (mr.advance(map));
 	return mr.radius();
 }
 
-int32_t Editor_Set_Resources_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & /* parent */, Editor_Action_Args & args)
-{
-	const Widelands::World & world = map.world();
+int32_t
+Editor_Set_Resources_Tool::handle_undo_impl(Widelands::Map& map,
+                                            const Widelands::World& world,
+                                            Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                            Editor_Interactive& /* parent */,
+                                            Editor_Action_Args& args) {
 	OverlayManager & overlay_manager = map.overlay_manager();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
@@ -94,7 +93,7 @@
 	do {
 		int32_t res        = mr.location().field->get_resources();
 		int32_t amount     = *ir;
-		int32_t max_amount = world.get_resource(args.cur_res)->get_max_amount();
+		int32_t max_amount = world.get_resource(args.cur_res)->max_amount();
 
 		if (amount < 0)
 			amount = 0;
@@ -115,8 +114,7 @@
 			//  set new overlay
 			pic = g_gr->images().get(world.get_resource(*it)->get_editor_pic(amount));
 			overlay_manager.register_overlay(mr.location(), pic, 4);
-			map.recalc_for_field_area
-			(Widelands::Area<Widelands::FCoords>(mr.location(), 0));
+			map.recalc_for_field_area(world, Widelands::Area<Widelands::FCoords>(mr.location(), 0));
 		}
 		++ir;
 		++it;

=== modified file 'src/editor/tools/editor_set_resources_tool.h'
--- src/editor/tools/editor_set_resources_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_set_resources_tool.h	2014-06-17 15:48:25 +0000
@@ -21,7 +21,6 @@
 #define EDITOR_SET_RESOURCES_TOOL_H
 
 #include "editor/tools/editor_tool.h"
-#include "logic/world.h"
 
 ///  Decreases the resources of a node by a value.
 struct Editor_Set_Resources_Tool : public Editor_Tool {
@@ -29,13 +28,17 @@
 		: Editor_Tool(*this, *this), m_cur_res(0), m_set_to(0)
 	{}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 
@@ -51,7 +54,7 @@
 
 private:
 	Widelands::Resource_Index m_cur_res;
-	uint8_t                   m_set_to;
+	uint8_t m_set_to;
 };
 
 #endif

=== modified file 'src/editor/tools/editor_set_starting_pos_tool.cc'
--- src/editor/tools/editor_set_starting_pos_tool.cc	2014-05-27 11:01:15 +0000
+++ src/editor/tools/editor_set_starting_pos_tool.cc	2014-06-17 15:48:25 +0000
@@ -62,12 +62,11 @@
 	strcpy(fsel_picsname, FSEL_PIC_FILENAME);
 }
 
-
-int32_t Editor_Set_Starting_Pos_Tool::handle_click_impl
-	(Widelands::Map           &          map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive &, Editor_Action_Args &)
-{
+int32_t Editor_Set_Starting_Pos_Tool::handle_click_impl(Widelands::Map& map,
+                                                        const Widelands::World&,
+                                                        Widelands::Node_and_Triangle<> const center,
+                                                        Editor_Interactive&,
+                                                        Editor_Action_Args&) {
 	assert(0 <= center.node.x);
 	assert(center.node.x < map.get_width());
 	assert(0 <= center.node.y);

=== modified file 'src/editor/tools/editor_set_starting_pos_tool.h'
--- src/editor/tools/editor_set_starting_pos_tool.h	2014-03-09 18:32:29 +0000
+++ src/editor/tools/editor_set_starting_pos_tool.h	2014-06-17 15:48:25 +0000
@@ -34,9 +34,11 @@
 struct Editor_Set_Starting_Pos_Tool : public Editor_Tool {
 	Editor_Set_Starting_Pos_Tool();
 
-	int32_t handle_click_impl
-		(Widelands::Map &, Widelands::Node_and_Triangle<>,
-		 Editor_Interactive &, Editor_Action_Args &) override;
+	int32_t handle_click_impl(Widelands::Map&,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<>,
+	                          Editor_Interactive&,
+	                          Editor_Action_Args&) override;
 	char const * get_sel_impl() const override
 		{return m_current_sel_pic;}
 

=== modified file 'src/editor/tools/editor_set_terrain_tool.cc'
--- src/editor/tools/editor_set_terrain_tool.cc	2013-07-26 20:19:36 +0000
+++ src/editor/tools/editor_set_terrain_tool.cc	2014-06-17 15:48:25 +0000
@@ -25,11 +25,11 @@
 
 using Widelands::TCoords;
 
-int32_t Editor_Set_Terrain_Tool::handle_click_impl
-	(Widelands::Map           &          map,
-	Widelands::Node_and_Triangle<> const center,
-	Editor_Interactive        &          /* parent */, Editor_Action_Args & args)
-{
+int32_t Editor_Set_Terrain_Tool::handle_click_impl(Widelands::Map& map,
+                                                   const Widelands::World& world,
+                                                   Widelands::Node_and_Triangle<> const center,
+                                                   Editor_Interactive& /* parent */,
+                                                   Editor_Action_Args& args) {
 	assert
 	(center.triangle.t == TCoords<>::D or center.triangle.t == TCoords<>::R);
 	uint16_t const radius = args.sel_radius;
@@ -60,17 +60,19 @@
 		std::list<Widelands::Terrain_Index>::iterator i = args.terrainType.begin();
 		do {
 			max = std::max
-			      (max, map.change_terrain(mr.location(), *i));
+			      (max, map.change_terrain(world, mr.location(), *i));
 			++i;
 		} while (mr.advance(map));
 	}
 	return radius + max;
 }
 
-int32_t Editor_Set_Terrain_Tool::handle_undo_impl
-	(Widelands::Map & map, Widelands::Node_and_Triangle< Widelands::Coords > center,
-	Editor_Interactive & /* parent */, Editor_Action_Args & args)
-{
+int32_t
+Editor_Set_Terrain_Tool::handle_undo_impl(Widelands::Map& map,
+                                          const Widelands::World& world,
+                                          Widelands::Node_and_Triangle<Widelands::Coords> center,
+                                          Editor_Interactive& /* parent */,
+                                          Editor_Action_Args& args) {
 	assert
 	(center.triangle.t == TCoords<>::D or center.triangle.t == TCoords<>::R);
 	uint16_t const radius = args.sel_radius;
@@ -88,7 +90,7 @@
 		std::list<Widelands::Terrain_Index>::iterator i = args.origTerrainType.begin();
 		do {
 			max = std::max
-			      (max, map.change_terrain(mr.location(), *i));
+			      (max, map.change_terrain(world, mr.location(), *i));
 			++i;
 		} while (mr.advance(map));
 		return radius + max;

=== modified file 'src/editor/tools/editor_set_terrain_tool.h'
--- src/editor/tools/editor_set_terrain_tool.h	2014-02-22 18:04:02 +0000
+++ src/editor/tools/editor_set_terrain_tool.h	2014-06-17 15:48:25 +0000
@@ -26,13 +26,17 @@
 struct Editor_Set_Terrain_Tool : public Editor_Tool, public MultiSelect {
 	Editor_Set_Terrain_Tool() : Editor_Tool(*this, *this) {}
 
-	int32_t handle_click_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_click_impl(Widelands::Map& map,
+	                          const Widelands::World& world,
+	                          Widelands::Node_and_Triangle<> center,
+	                          Editor_Interactive& parent,
+	                          Editor_Action_Args& args) override;
 
-	int32_t handle_undo_impl
-		(Widelands::Map & map, Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+	int32_t handle_undo_impl(Widelands::Map& map,
+	                         const Widelands::World& world,
+	                         Widelands::Node_and_Triangle<> center,
+	                         Editor_Interactive& parent,
+	                         Editor_Action_Args& args) override;
 
 	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
 

=== modified file 'src/editor/tools/editor_tool.h'
--- src/editor/tools/editor_tool.h	2013-09-22 18:01:36 +0000
+++ src/editor/tools/editor_tool.h	2014-06-17 15:48:25 +0000
@@ -28,7 +28,10 @@
 #include "logic/widelands_geometry.h"
 
 struct Editor_Interactive;
-namespace Widelands {class Map;}
+namespace Widelands {
+class Map;
+class World;
+}
 
 /**
  * An editor tool is a tool that can be selected in the editor. Examples are:
@@ -46,22 +49,22 @@
 	enum Tool_Index {First, Second, Third};
 	int32_t handle_click
 		(const Tool_Index i,
-		Widelands::Map & map, Widelands::Node_and_Triangle<> const center,
+		Widelands::Map & map, const Widelands::World& world, Widelands::Node_and_Triangle<> const center,
 		Editor_Interactive & parent, Editor_Action_Args & args)
 	{
 		return
 		    (i == First ? *this : i == Second ? m_second : m_third)
-		    .handle_click_impl(map, center, parent, args);
+		    .handle_click_impl(map, world, center, parent, args);
 	}
 
 	int32_t handle_undo
 		(const Tool_Index i,
-		Widelands::Map & map, Widelands::Node_and_Triangle<> const center,
+		Widelands::Map & map, const Widelands::World& world, Widelands::Node_and_Triangle<> const center,
 		Editor_Interactive & parent, Editor_Action_Args & args)
 	{
 		return
 		    (i == First ? *this : i == Second ? m_second : m_third)
-		    .handle_undo_impl(map, center, parent, args);
+		    .handle_undo_impl(map, world, center, parent, args);
 	}
 
 	const char * get_sel(const Tool_Index i) {
@@ -81,12 +84,18 @@
 	virtual Editor_Action_Args format_args_impl(Editor_Interactive & parent) {
 		return Editor_Action_Args(parent);
 	}
-	virtual int32_t handle_click_impl
-	(Widelands::Map &, Widelands::Node_and_Triangle<>, Editor_Interactive &, Editor_Action_Args &)
-	= 0;
-	virtual int32_t handle_undo_impl
-	(Widelands::Map &, Widelands::Node_and_Triangle<>, Editor_Interactive &, Editor_Action_Args &)
-	{return 0;} // non unduable tools don't need to implement this.
+	virtual int32_t handle_click_impl(Widelands::Map&,
+	                                  const Widelands::World& world,
+	                                  Widelands::Node_and_Triangle<>,
+	                                  Editor_Interactive&,
+	                                  Editor_Action_Args&) = 0;
+	virtual int32_t handle_undo_impl(Widelands::Map&,
+	                                 const Widelands::World&,
+	                                 Widelands::Node_and_Triangle<>,
+	                                 Editor_Interactive&,
+	                                 Editor_Action_Args&) {
+		return 0;
+	}  // non unduable tools don't need to implement this.
 	virtual const char * get_sel_impl() const = 0;
 	virtual bool operates_on_triangles() const {return false;};
 

=== added file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h	1970-01-01 00:00:00 +0000
+++ src/editor/ui_menus/categorized_item_selection_menu.h	2014-06-17 15:48:25 +0000
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2006-2014 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef MULTI_SELECT_MENU_H
+#define MULTI_SELECT_MENU_H
+
+#include <string>
+#include <cmath>
+
+#include "description_maintainer.h"
+#include "graphic/image.h"
+#include "graphic/image_transformations.h"
+#include "i18n.h"
+#include "logic/world/editor_category.h"
+#include "ui_basic/box.h"
+#include "ui_basic/checkbox.h"
+#include "ui_basic/panel.h"
+#include "ui_basic/tabpanel.h"
+#include "ui_basic/textarea.h"
+
+template <typename DescriptionType, typename ToolType>
+class CategorizedItemSelectionMenu : public UI::Box {
+public:
+	// Creates a box with a tab panel for each category in 'categories' and
+	// populates them with the 'descriptions' ordered by the category by calling
+	// 'create_checkbox' for each of the descriptions. Calls
+	// 'select_correct_tool' whenever a selection has been made, also keeps a
+	// text label updated and updates the 'tool' with current selections. Does
+	// not take ownership.
+	CategorizedItemSelectionMenu(
+	   UI::Panel* parent,
+	   const DescriptionMaintainer<Widelands::EditorCategory>& categories,
+	   const DescriptionMaintainer<DescriptionType>& descriptions,
+	   std::function<UI::Checkbox*(UI::Panel* parent, const DescriptionType& descr)> create_checkbox,
+	   const std::function<void()> select_correct_tool,
+	   ToolType* const tool);
+
+private:
+	// Called when an item was selected.
+	void selected(int32_t, bool);
+
+	// Update the label with the currently selected object names.
+	void update_label();
+
+	const DescriptionMaintainer<DescriptionType>& descriptions_;
+	std::function<void()> select_correct_tool_;
+	bool protect_against_recursive_select_;
+	UI::Textarea current_selection_names_;
+	std::map<int, UI::Checkbox*> checkboxes_;
+	ToolType* const tool_;  // not owned
+};
+
+template <typename DescriptionType, typename ToolType>
+CategorizedItemSelectionMenu<DescriptionType, ToolType>::CategorizedItemSelectionMenu(
+   UI::Panel* parent,
+   const DescriptionMaintainer<Widelands::EditorCategory>& categories,
+   const DescriptionMaintainer<DescriptionType>& descriptions,
+   const std::function<UI::Checkbox*(UI::Panel* parent, const DescriptionType& descr)>
+      create_checkbox,
+   const std::function<void()> select_correct_tool,
+   ToolType* const tool)
+   : UI::Box(parent, 0, 0, UI::Box::Vertical),
+     descriptions_(descriptions),
+     select_correct_tool_(select_correct_tool),
+     protect_against_recursive_select_(false),
+     current_selection_names_(this, 0, 0, 0, 20, UI::Align_Center),
+     tool_(tool)
+{
+
+	UI::Tab_Panel* tab_panel = new UI::Tab_Panel(this, 0, 0, nullptr);
+	this->add(tab_panel, UI::Align_Center);
+
+	for (uint32_t category_index = 0; category_index < categories.get_nitems(); ++category_index) {
+		const Widelands::EditorCategory& category = *categories.get(category_index);
+
+		std::vector<int> item_indices;
+		for (size_t j = 0; j < descriptions_.get_nitems(); ++j) {
+			if (descriptions_.get(j)->editor_category().name() != category.name()) {
+				continue;
+			}
+			item_indices.push_back(j);
+		}
+
+		UI::Box* vertical = new UI::Box(tab_panel, 0, 0, UI::Box::Vertical);
+		const int kSpacing = 5;
+		vertical->add_space(kSpacing);
+
+		const uint32_t items_in_row =
+		   static_cast<uint32_t>(std::ceil(std::sqrt(static_cast<float>(item_indices.size()))));
+		int nitems_handled = 0;
+		UI::Box* horizontal = nullptr;
+		for (const int i : item_indices) {
+			if (nitems_handled % items_in_row == 0) {
+				horizontal = new UI::Box(vertical, 0, 0, UI::Box::Horizontal);
+				horizontal->add_space(kSpacing);
+
+				vertical->add(horizontal, UI::Align_Left);
+				vertical->add_space(kSpacing);
+			}
+			assert(horizontal != nullptr);
+
+			UI::Checkbox* cb = create_checkbox(horizontal, *descriptions_.get(i));
+			cb->set_state(tool_->is_enabled(i));
+			cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, _1));
+			checkboxes_[i] = cb;
+			horizontal->add(cb, UI::Align_Left);
+			horizontal->add_space(kSpacing);
+			++nitems_handled;
+		}
+
+		const Image* category_picture = category.picture();
+		const int kCategoryImageSize = 24;
+		if (category_picture->width() > kCategoryImageSize ||
+		    category_picture->height() > kCategoryImageSize) {
+			category_picture =
+			   ImageTransformations::resize(category_picture, kCategoryImageSize, kCategoryImageSize);
+		}
+		tab_panel->add(category.name(), category_picture, vertical, category.descname());
+	}
+	this->add(&current_selection_names_, UI::Align_Center, true);
+}
+
+template <typename DescriptionType, typename ToolType>
+void CategorizedItemSelectionMenu<DescriptionType, ToolType>::selected(const int32_t n,
+                                                                       const bool t) {
+	if (protect_against_recursive_select_)
+		return;
+
+	//  FIXME This code is erroneous. It checks the current key state. What it
+	//  FIXME needs is the key state at the time the mouse was clicked. See the
+	//  FIXME usage comment for get_key_state.
+	const bool multiselect = get_key_state(SDLK_LCTRL) | get_key_state(SDLK_RCTRL);
+	if (not t and(not multiselect or tool_->get_nr_enabled() == 1))
+		checkboxes_[n]->set_state(true);
+	else {
+		if (not multiselect) {
+			for (uint32_t i = 0; tool_->get_nr_enabled(); ++i)
+				tool_->enable(i, false);
+			//  disable all checkboxes
+			protect_against_recursive_select_ = true;
+			const int32_t size = checkboxes_.size();
+			for (int32_t i = 0; i < size; ++i) {
+				if (i != n)
+					checkboxes_[i]->set_state(false);
+			}
+			protect_against_recursive_select_ = false;
+		}
+
+		tool_->enable(n, t);
+		select_correct_tool_();
+		update_label();
+	}
+}
+
+template <typename DescriptionType, typename ToolType>
+void CategorizedItemSelectionMenu<DescriptionType, ToolType>::update_label() {
+	std::string buf = _("Current:");
+	int j = tool_->get_nr_enabled();
+	for (int i = 0; j; ++i) {
+		if (tool_->is_enabled(i)) {
+			buf += " ";
+			buf += descriptions_.get(i)->descname();
+			--j;
+		}
+	}
+	current_selection_names_.set_text(buf);
+}
+
+#endif /* end of include guard: MULTI_SELECT_MENU_H */

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2014-04-06 16:58:10 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2014-06-17 15:48:25 +0000
@@ -30,7 +30,6 @@
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/building.h"
 #include "logic/editor_game_base.h"
-#include "logic/world.h"
 #include "map_io/map_loader.h"
 #include "map_io/widelands_map_loader.h"
 #include "profile/profile.h"
@@ -88,13 +87,6 @@
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("World:"), UI::Align_CenterLeft);
-	m_world =
-		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
-	posy += 20 + spacing;
-
-	new UI::Textarea
 		(this, posx, posy, 70, 20, _("Players:"), UI::Align_CenterLeft);
 	m_nrplayers =
 		new UI::Textarea
@@ -169,20 +161,12 @@
 			map_loader->preload_map(true); //  This has worked before, no problem.
 		}
 
-		// get translated worldsname
-		std::string world(map.get_world_name());
-		std::string worldpath("worlds/" + world);
-		Profile prof((worldpath + "/conf").c_str(), nullptr, "world_" + world);
-		Section & global = prof.get_safe_section("world");
-		world = global.get_safe_string("name");
-
 		// Translate the map data
 		i18n::Textdomain td("maps");
 		m_name  ->set_text(_(map.get_name()));
 		m_author->set_text(map.get_author());
 		m_descr ->set_text
 			(_(map.get_description()) + (map.get_hint().empty() ? "" : (std::string("\n") + _(map.get_hint()))));
-		m_world ->set_text(world);
 
 		char buf[200];
 		sprintf(buf, "%i", map.get_nrplayers());
@@ -194,7 +178,6 @@
 		m_name     ->set_text("");
 		m_author   ->set_text("");
 		m_descr    ->set_text("");
-		m_world    ->set_text("");
 		m_nrplayers->set_text("");
 		m_size     ->set_text("");
 	}

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.h'
--- src/editor/ui_menus/editor_main_menu_load_map.h	2013-07-26 19:16:51 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.h	2014-06-17 15:48:25 +0000
@@ -44,7 +44,7 @@
 
 	void fill_list();
 
-	UI::Textarea * m_name, * m_author, * m_size, * m_world, * m_nrplayers;
+	UI::Textarea * m_name, * m_author, * m_size, * m_nrplayers;
 	UI::Multiline_Textarea * m_descr;
 	UI::Listselect<const char *> * m_ls;
 	UI::Button * m_ok_btn;

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.cc'
--- src/editor/ui_menus/editor_main_menu_map_options.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.cc	2014-06-17 15:48:25 +0000
@@ -72,11 +72,6 @@
 	m_nrplayers =
 		new UI::Textarea(this, posx + ta->get_w() + spacing, posy - 2, "1");
 	posy += height + spacing;
-	ta = new UI::Textarea(this, posx, posy - 2, _("World:"));
-	m_world =
-		new UI::Textarea
-			(this, posx + ta->get_w() + spacing, posy - 2, "\"Greenland\"");
-	posy += height + spacing;
 	ta = new UI::Textarea(this, posx, posy - 2, _("Author:"));
 	m_author =
 		new UI::EditBox
@@ -125,7 +120,6 @@
 	m_name  ->setText(map.get_name());
 	sprintf(buf, "%i", map.get_nrplayers());
 	m_nrplayers->set_text(buf);
-	m_world ->set_text(map.world().get_name());
 	m_descr ->set_text(map.get_description());
 }
 

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.h'
--- src/editor/ui_menus/editor_main_menu_map_options.h	2012-02-15 21:25:34 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.h	2014-06-17 15:48:25 +0000
@@ -43,7 +43,7 @@
 	void changed(int32_t);
 	void editbox_changed();
 	UI::Multiline_Editbox * m_descr;
-	UI::Textarea * m_world, * m_nrplayers, * m_size;
+	UI::Textarea * m_nrplayers, * m_size;
 	UI::EditBox * m_name, * m_author;
 	void update();
 };

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2013-08-05 03:26:31 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2014-06-17 15:48:25 +0000
@@ -29,7 +29,7 @@
 #include "i18n.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
-#include "logic/world.h"
+#include "logic/world/world.h"
 #include "profile/profile.h"
 #include "ui_basic/button.h"
 #include "ui_basic/progresswindow.h"
@@ -43,8 +43,7 @@
 	UI::Window
 		(&parent, "new_map_menu",
 		 (parent.get_w() - 140) / 2, (parent.get_h() - 150) / 2, 140, 150,
-		 _("New Map")),
-	m_currentworld(0)
+		 _("New Map"))
 {
 	char buffer[250];
 	int32_t const offsx   =  5;
@@ -101,19 +100,6 @@
 
 	posy += 20 + spacing + spacing;
 
-	Widelands::World::get_all_worlds(m_worlds);
-
-	assert(m_worlds.size());
-	while (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
-		++m_currentworld;
-
-	m_world = new UI::Button
-		(this, "world",
-		 posx, posy, width, height,
-		 g_gr->images().get("pics/but1.png"),
-		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
-	m_world->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 4));
-
 	posy += height + spacing + spacing + spacing;
 
 	UI::Button * createbtn = new UI::Button
@@ -134,14 +120,6 @@
 	case 1: --m_w; break;
 	case 2: ++m_h; break;
 	case 3: --m_h; break;
-	case 4:
-		++m_currentworld;
-		if (m_currentworld == m_worlds.size())
-			m_currentworld = 0;
-		m_world->set_title
-			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name
-			 	());
-		break;
 	default:
 		assert(false);
 	}
@@ -170,18 +148,16 @@
 
 	egbase.cleanup_for_load();
 
-	if (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
-		eia.change_world();
-	map.create_empty_map
-		(Widelands::MAP_DIMENSIONS[m_w], Widelands::MAP_DIMENSIONS[m_h],
-		 m_worlds[m_currentworld],
-		 _("No Name"),
-		 g_options.pull_section("global").get_string("realname", _("Unknown")));
+	map.create_empty_map(egbase.world(),
+	                     Widelands::MAP_DIMENSIONS[m_w],
+	                     Widelands::MAP_DIMENSIONS[m_h],
+	                     _("No Name"),
+	                     g_options.pull_section("global").get_string("realname", _("Unknown")));
 
 	egbase.postload     ();
 	egbase.load_graphics(loader);
 
-	map.recalc_whole_map();
+	map.recalc_whole_map(egbase.world());
 
 	eia.set_need_save(true);
 	eia.need_complete_redraw();

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.h'
--- src/editor/ui_menus/editor_main_menu_new_map.h	2013-07-25 21:05:20 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.h	2014-06-17 15:48:25 +0000
@@ -40,10 +40,7 @@
 
 private:
 	UI::Textarea * m_width, * m_height;
-	UI::Button * m_world;
 	int32_t m_w, m_h;
-	std::vector<std::string>::size_type m_currentworld;
-	std::vector<std::string> m_worlds;
 
 	void button_clicked(int32_t);
 	void clicked_create_map();

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2013-08-05 03:26:31 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2014-06-17 15:48:25 +0000
@@ -29,7 +29,7 @@
 #include "i18n.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
-#include "logic/world.h"
+#include "logic/world/world.h"
 #include "map_generator.h"
 #include "profile/profile.h"
 #include "random.h"
@@ -40,15 +40,23 @@
 
 using namespace Widelands;
 
-Main_Menu_New_Random_Map::Main_Menu_New_Random_Map
-	(Editor_Interactive & parent)
-	:
-	UI::Window
-		(&parent, "random_map_menu",
-		 (parent.get_w() - 260) / 2, (parent.get_h() - 450) / 2, 260, 490,
-		 _("New Random Map")),
-	m_currentworld(0)
-{
+Main_Menu_New_Random_Map::Main_Menu_New_Random_Map(Editor_Interactive& parent) :
+	UI::Window(&parent,
+                "random_map_menu",
+                (parent.get_w() - 260) / 2,
+                (parent.get_h() - 450) / 2,
+                260,
+                490,
+                _("New Random Map")),
+   // TRANSLATORS: The next are world names for the random map generator.
+	m_world_descriptions(
+	{
+		{"greenland", _("Summer")},
+		{"winterland", _("Winter")},
+		{"desert", _("Desert")},
+		{"blackland", _("Black")},
+	}),
+	m_current_world(0) {
 	char buffer[250];
 	int32_t const offsx   =  5;
 	int32_t const offsy   =  5;
@@ -266,28 +274,17 @@
 
 	posy += height + spacing + spacing + spacing;
 
-
-
 	// ---------- Worlds ----------
-
-	Widelands::World::get_all_worlds(m_worlds);
-
-	assert(m_worlds.size());
-	while (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
-		++m_currentworld;
-
 	m_world = new UI::Button
 		(this, "world",
 		 posx, posy, width, height,
 		 g_gr->images().get("pics/but1.png"),
-		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+		 m_world_descriptions[m_current_world].descrname);
 	m_world->sigclicked.connect
 		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_WORLD));
 
 	posy += height + spacing + spacing + spacing;
 
-
-
 	// ---------- Map ID String edit ----------
 
 	new UI::Textarea(this, posx + spacing + 20, posy, _("Map ID:"));
@@ -395,11 +392,9 @@
 			m_landval -= 5;
 		break;
 	case SWITCH_WORLD:
-		++ m_currentworld;
-		if (m_currentworld == m_worlds.size())
-			m_currentworld = 0;
-		m_world->set_title
-			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+		++ m_current_world;
+		m_current_world %= m_world_descriptions.size();
+		m_world->set_title(m_world_descriptions[m_current_world].descrname);
 		break;
 	case SWITCH_ISLAND_MODE:
 		break;
@@ -463,16 +458,12 @@
 
 	egbase.cleanup_for_load();
 
-	if (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
-		eia.change_world();
-
 	UniqueRandomMapInfo mapInfo;
 	set_map_info(mapInfo);
 
 	std::stringstream sstrm;
 	sstrm << "Random generated map\nRandom number = "
 		<< mapInfo.mapNumber << "\n"
-		<< "World = " << m_world->get_title() << "\n"
 		<< "Water = " << m_waterval << " %\n"
 		<< "Land = " << m_landval << " %\n"
 		<< "Wasteland = " << m_wastelandval << " %\n"
@@ -480,18 +471,19 @@
 		<< "ID = " << m_idEditbox->text() << "\n";
 
 	MapGenerator gen(map, mapInfo, egbase);
-	map.create_empty_map
-		(mapInfo.w, mapInfo.h,
-		 m_worlds[m_currentworld].c_str(), _("No Name"),
-		 g_options.pull_section("global").get_string("realname", _("Unknown")),
-		 sstrm.str().c_str());
+	map.create_empty_map(egbase.world(),
+	                     mapInfo.w,
+	                     mapInfo.h,
+	                     _("No Name"),
+	                     g_options.pull_section("global").get_string("realname", _("Unknown")),
+	                     sstrm.str().c_str());
 	loader.step(_("Generating random map..."));
 	gen.create_random_map();
 
 	egbase.postload     ();
 	egbase.load_graphics(loader);
 
-	map.recalc_whole_map();
+	map.recalc_whole_map(egbase.world());
 
 	eia.set_need_save(true);
 	eia.need_complete_redraw();
@@ -506,7 +498,7 @@
 
 	std::string str = m_idEditbox->text();
 
-	if (!UniqueRandomMapInfo::setFromIdString(mapInfo, str, m_worlds))
+	if (!UniqueRandomMapInfo::setFromIdString(mapInfo, str))
 		m_goButton->set_enabled(false);
 	else {
 		std::stringstream sstrm;
@@ -529,15 +521,6 @@
 
 		m_res->set_title(m_res_amounts[m_res_amount].c_str());
 
-		// Get world
-
-		m_currentworld = 0;
-		while
-			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
-			++m_currentworld;
-		m_world->set_title
-			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
-
 		// Update other values in UI as well
 		button_clicked(static_cast<ButtonID>(-1));
 
@@ -587,5 +570,5 @@
 	mapInfo.resource_amount = static_cast
 		<Widelands::UniqueRandomMapInfo::Resource_Amount>
 			(m_res_amount);
-	mapInfo.worldName = m_worlds[m_currentworld];
+	mapInfo.world_name = m_world_descriptions[m_current_world].name;
 }

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.h'
--- src/editor/ui_menus/editor_main_menu_random_map.h	2013-07-25 21:05:20 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.h	2014-06-17 15:48:25 +0000
@@ -63,6 +63,13 @@
 	} ButtonID;
 
 private:
+	struct WorldDescription {
+		std::string name;
+		std::string descrname;
+	};
+
+	const std::vector<WorldDescription> m_world_descriptions;
+	int m_current_world;
 	UI::Textarea * m_width, * m_height, * m_land;
 	UI::Textarea * m_water, * m_mountains, * m_wasteland, * m_players;
 	UI::Button * m_res;
@@ -72,9 +79,7 @@
 	int32_t m_w, m_h, m_landval, m_waterval, m_wastelandval;
 	uint8_t m_pn;
 	uint32_t m_mapNumber;
-	std::vector<std::string>::size_type m_currentworld;
 	uint32_t m_res_amount;
-	std::vector<std::string> m_worlds;
 	std::vector<std::string> m_res_amounts;
 
 	UI::EditBox * m_nrEditbox;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2014-06-10 20:38:57 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2014-06-17 15:48:25 +0000
@@ -100,13 +100,6 @@
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("World:"), UI::Align_CenterLeft);
-	m_world =
-		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
-	posy += 20 + spacing;
-
-	new UI::Textarea
 		(this, posx, posy, 70, 20, _("Players:"), UI::Align_CenterLeft);
 	m_nrplayers =
 		new UI::Textarea
@@ -237,7 +230,6 @@
 		m_name  ->set_text(map.get_name       ());
 		m_author->set_text(map.get_author     ());
 		m_descr ->set_text(map.get_description());
-		m_world ->set_text(map.get_world_name ());
 
 		char buf[200];
 		sprintf(buf, "%i", map.get_nrplayers());
@@ -248,7 +240,6 @@
 	} else {
 		m_name     ->set_text(FileSystem::FS_Filename(name));
 		m_author   ->set_text("");
-		m_world    ->set_text("");
 		m_nrplayers->set_text("");
 		m_size     ->set_text("");
 		if (g_fs->IsDirectory(name)) {

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.h'
--- src/editor/ui_menus/editor_main_menu_save_map.h	2013-07-26 19:16:51 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.h	2014-06-17 15:48:25 +0000
@@ -50,7 +50,7 @@
 	bool save_map(std::string, bool);
 
 	UI::EditBox * m_editbox;
-	UI::Textarea * m_name, * m_author, * m_size, * m_world, * m_nrplayers;
+	UI::Textarea * m_name, * m_author, * m_size, * m_nrplayers;
 	UI::Multiline_Textarea * m_descr;
 	UI::Listselect<const char *> * m_ls;
 	UI::Button * m_ok_btn;

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2014-05-27 11:01:15 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2014-06-17 15:48:25 +0000
@@ -354,9 +354,9 @@
 
 	//  Register callback function to make sure that only valid locations are
 	//  selected.
-	map.overlay_manager().register_overlay_callback_function
-		(boost::bind(&Editor_Tool_Set_Starting_Pos_Callback, _1, boost::ref(map)));
-	map.recalc_whole_map();
+	map.overlay_manager().register_overlay_callback_function(
+	   boost::bind(&Editor_Tool_Set_Starting_Pos_Callback, _1, boost::ref(map)));
+	map.recalc_whole_map(menu.egbase().world());
 	update();
 }
 
@@ -441,5 +441,5 @@
 	parent.tools.make_infrastructure.set_player(n);
 	overlay_manager.register_overlay_callback_function(
 	   boost::bind(&Editor_Make_Infrastructure_Tool_Callback, _1, boost::ref(egbase), n));
-	map.recalc_whole_map();
+	map.recalc_whole_map(egbase.world());
 }

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2014-03-09 18:32:29 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2014-06-17 15:48:25 +0000
@@ -28,7 +28,8 @@
 #include "i18n.h"
 #include "logic/map.h"
 #include "logic/widelands.h"
-#include "logic/world.h"
+#include "logic/world/resource_description.h"
+#include "logic/world/world.h"
 #include "ui_basic/button.h"
 #include "wui/overlay_manager.h"
 
@@ -124,7 +125,7 @@
 	m_change_by_decrease.set_repeating(true);
 	m_set_to_increase   .set_repeating(true);
 	m_set_to_decrease   .set_repeating(true);
-	const Widelands::World & world = parent.egbase().map().world();
+	const Widelands::World & world = parent.egbase().world();
 	Widelands::Resource_Index const nr_resources = world.get_nr_resources();
 
 	//  Find the maximal width and height for the resource pictures.
@@ -211,11 +212,11 @@
 	m_increase_tool.set_cur_res(n);
 	m_increase_tool.decrease_tool().set_cur_res(n);
 
-	Widelands::Map & map = ref_cast<Editor_Interactive, UI::Panel>(*get_parent())
-		.egbase().map();
+	Widelands::Editor_Game_Base& egbase = ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase();
+	Widelands::Map & map = egbase.map();
 	map.overlay_manager().register_overlay_callback_function(
-	   boost::bind(&Editor_Change_Resource_Tool_Callback, _1, boost::ref(map), n));
-	map.recalc_whole_map();
+	   boost::bind(&Editor_Change_Resource_Tool_Callback, _1, boost::ref(map), boost::ref(egbase.world()), n));
+	map.recalc_whole_map(egbase.world());
 	select_correct_tool();
 
 	update();
@@ -232,7 +233,7 @@
 	m_set_to_value.set_text(buf);
 
 	m_cur_selection.set_text
-		(ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase().map()
+		(ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase()
 		 .world().get_resource(m_increase_tool.set_tool().get_cur_res())->descname());
 	m_cur_selection.set_pos
 		(Point

=== modified file 'src/editor/ui_menus/editor_tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc	2014-03-16 20:55:15 +0000
+++ src/editor/ui_menus/editor_tool_menu.cc	2014-06-17 15:48:25 +0000
@@ -143,7 +143,7 @@
 		Widelands::Map & map = parent.egbase().map();
 		map.overlay_manager().register_overlay_callback_function(
 				boost::bind(&Editor_Tool_Set_Port_Space_Callback, _1, boost::ref(map)));
-		map.recalc_whole_map();
+		map.recalc_whole_map(parent.egbase().world());
 		update();
 	}
 

=== modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2014-03-31 20:21:27 +0000
+++ src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2014-06-17 15:48:25 +0000
@@ -27,7 +27,7 @@
 #include "i18n.h"
 #include "logic/critter_bob.h"
 #include "logic/map.h"
-#include "logic/world.h"
+#include "logic/world/world.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 #include "ui_basic/checkbox.h"
@@ -49,7 +49,7 @@
 m_click_recursion_protect(false)
 {
 	int32_t const space  =  5;
-	const Widelands::World & world = parent.egbase().map().world();
+	const Widelands::World & world = parent.egbase().world();
 	int32_t const nr_bobs = world.get_nr_bobs();
 	const uint32_t bobs_in_row =
 		std::max

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2014-04-20 20:02:13 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2014-06-17 15:48:25 +0000
@@ -26,7 +26,7 @@
 #include "graphic/graphic.h"
 #include "i18n.h"
 #include "logic/map.h"
-#include "logic/world.h"
+#include "logic/world/world.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 #include "ui_basic/checkbox.h"
@@ -34,118 +34,41 @@
 #include "wlapplication.h"
 
 
-using Widelands::Immovable_Descr;
-
-Editor_Tool_Place_Immovable_Options_Menu::
-Editor_Tool_Place_Immovable_Options_Menu
-		(Editor_Interactive          & parent,
-		 Editor_Place_Immovable_Tool & pit,
-		 UI::UniqueWindow::Registry  & registry)
-:
-Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Immovable Bobs")),
-m_tabpanel(this, 0, 0, g_gr->images().get("pics/but1.png")),
-m_pit     (pit),
-m_click_recursion_protect(false)
-{
-	int32_t const space  =  5;
-	const Widelands::World & world = parent.egbase().map().world();
-	const int nr_immovables = world.get_nr_immovables();
-	const uint32_t immovables_in_row = std::min
-		(static_cast<uint32_t>
-		 (ceil(sqrt(static_cast<float>(nr_immovables)))), 6U);
-
-	set_center_panel(&m_tabpanel);
-
-	uint32_t width = 0, height = 0;
-	for (int32_t j = 0; j < nr_immovables; ++j) {
-		const Immovable_Descr & descr = *world.get_immovable_descr(j);
-		const Image& pic = g_gr->animations().get_animation(descr.main_animation())
-				.representative_image(RGBColor(0, 0, 0));
-		uint16_t w = pic.width();
-		uint16_t h = pic.height();
-		if (w > width)
-			width  = w;
-		if (h > height)
-			height = h;
-	}
-
-	//box->set_inner_size((immovables_in_row)*(width+1+space)+xstart,
-	//                     (immovables_in_row)*(height+1+space)+ystart+yend);
-	const Image* tab_icon =
-		g_gr->images().get("pics/list_first_entry.png");
-
-	Point pos;
-	uint32_t cur_x = immovables_in_row;
-
-	UI::Box * box;
-	for (int i = 0; i < nr_immovables; ++cur_x, ++i) {
-		if (cur_x == immovables_in_row) {
-			cur_x = 0;
-			pos = Point(5, 15);
-			box =
-				new UI::Box
-					(&m_tabpanel, 0, 0, UI::Box::Horizontal,
-					 parent.get_inner_w() - 50, parent.get_inner_h() - 50);
-			box->set_scrolling(true);
-			m_tabpanel.add("immovables", tab_icon, box);
-		}
-		assert(box);
-
-		UI::Checkbox & cb = *new UI::Checkbox
-			(box, pos,
-			 &g_gr->animations().get_animation(world.get_immovable_descr(i)->main_animation())
-				.representative_image(RGBColor(0, 0, 0)), world.get_immovable_descr(i)->descname());
-		cb.set_desired_size(width, height);
-		cb.set_state(m_pit.is_enabled(i));
-		cb.changedto.connect
-			(boost::bind(&Editor_Tool_Place_Immovable_Options_Menu::clicked, this, i, _1));
-		m_checkboxes.push_back(&cb);
-		box->add(&cb, UI::Align_Left);
-		box->add_space(space);
-		pos.x += width + 1 + space;
-	}
-
-	m_tabpanel.activate(0);
-}
-
-/**
- * Cleanup
- */
-Editor_Tool_Place_Immovable_Options_Menu::
-~Editor_Tool_Place_Immovable_Options_Menu
-	()
-{}
-
-/**
- * Called when one of the state boxes is toggled
-*/
-void Editor_Tool_Place_Immovable_Options_Menu::clicked(int32_t n, bool t)
-{
-	if (m_click_recursion_protect)
-		return;
-
-	//  FIXME This code is erroneous. It checks the current key state. What it
-	//  FIXME needs is the key state at the time the mouse was clicked. See the
-	//  FIXME usage comment for get_key_state.
-	const bool multiselect =
-		get_key_state(SDLK_LCTRL) | get_key_state(SDLK_RCTRL);
-	if (not t and (not multiselect or m_pit.get_nr_enabled() == 1))
-		m_checkboxes[n]->set_state(true);
-	else {
-		if (not multiselect) {
-			for (uint32_t i = 0; m_pit.get_nr_enabled(); ++i)
-				m_pit.enable(i, false);
-			//  Disable all checkboxes
-			const int32_t size = m_checkboxes.size();
-			m_click_recursion_protect = true;
-			for (int32_t i = 0; i < size; ++i) {
-				if (i != n)
-					m_checkboxes[i]->set_state(false);
-			}
-			m_click_recursion_protect = false;
-		}
-
-		m_pit.enable(n, t);
-		select_correct_tool();
-	}
+namespace {
+
+using namespace Widelands;
+
+UI::Checkbox* create_immovable_checkbox(UI::Panel* parent, const Immovable_Descr& immovable_descr) {
+	const Image& pic =
+	   g_gr->animations().get_animation(immovable_descr.main_animation()).representative_image(
+	      RGBColor(0, 0, 0));
+	UI::Checkbox* cb = new UI::Checkbox(parent, Point(0, 0), &pic, immovable_descr.descname());
+	const int kMinClickableArea = 24;
+	cb->set_desired_size(std::max<int>(pic.width(), kMinClickableArea),
+	                     std::max<int>(pic.height(), kMinClickableArea));
+	return cb;
+}
+
+}  // namespace
+
+Editor_Tool_Place_Immovable_Options_Menu::Editor_Tool_Place_Immovable_Options_Menu(
+   Editor_Interactive& parent,
+   Editor_Place_Immovable_Tool& tool,
+   UI::UniqueWindow::Registry& registry)
+   : Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Immovable Select")) {
+	const Widelands::World& world = parent.egbase().world();
+	multi_select_menu_.reset(
+	   new CategorizedItemSelectionMenu<Widelands::Immovable_Descr, Editor_Place_Immovable_Tool>(
+	      this,
+	      world.editor_immovable_categories(),
+	      world.immovables(),
+	      [this](UI::Panel* cb_parent, const Immovable_Descr& immovable_descr) {
+		      return create_immovable_checkbox(cb_parent, immovable_descr);
+		   },
+	      [this] { select_correct_tool(); },
+	      &tool));
+	set_center_panel(multi_select_menu_.get());
+}
+
+Editor_Tool_Place_Immovable_Options_Menu::~Editor_Tool_Place_Immovable_Options_Menu() {
 }

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2014-06-17 15:48:25 +0000
@@ -22,28 +22,21 @@
 
 #include <vector>
 
+#include "editor/ui_menus/categorized_item_selection_menu.h"
 #include "editor/ui_menus/editor_tool_options_menu.h"
-#include "ui_basic/tabpanel.h"
+#include "editor/tools/editor_place_immovable_tool.h"
 
 struct Editor_Interactive;
-struct Editor_Place_Immovable_Tool;
-namespace UI {struct Checkbox;}
 
-struct Editor_Tool_Place_Immovable_Options_Menu :
-	public Editor_Tool_Options_Menu
-{
-	Editor_Tool_Place_Immovable_Options_Menu
-		(Editor_Interactive          &,
-		 Editor_Place_Immovable_Tool &,
-		 UI::UniqueWindow::Registry  &);
+struct Editor_Tool_Place_Immovable_Options_Menu : public Editor_Tool_Options_Menu {
+	Editor_Tool_Place_Immovable_Options_Menu(Editor_Interactive&,
+	                                         Editor_Place_Immovable_Tool&,
+	                                         UI::UniqueWindow::Registry&);
 	virtual ~Editor_Tool_Place_Immovable_Options_Menu();
 
 private:
-	std::vector<UI::Checkbox *> m_checkboxes;
-	UI::Tab_Panel m_tabpanel;
-	Editor_Place_Immovable_Tool & m_pit;
-	void clicked(int32_t, bool);
-	bool m_click_recursion_protect;
+	std::unique_ptr<CategorizedItemSelectionMenu<Widelands::Immovable_Descr, Editor_Place_Immovable_Tool>>
+	multi_select_menu_;
 };
 
 #endif

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2014-04-21 10:47:03 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2014-06-17 15:48:25 +0000
@@ -30,188 +30,103 @@
 #include "graphic/texture.h"
 #include "i18n.h"
 #include "logic/map.h"
-#include "logic/world.h"
-#include "logic/worlddata.h"
-#include "ui_basic/button.h"
+#include "logic/world/editor_category.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "ui_basic/checkbox.h"
 #include "ui_basic/panel.h"
-#include "wlapplication.h"
-
-Editor_Tool_Set_Terrain_Options_Menu:: Editor_Tool_Set_Terrain_Options_Menu
-	(Editor_Interactive         & parent,
-	 Editor_Set_Terrain_Tool    & tool,
-	 UI::UniqueWindow::Registry & registry)
-	:
-	Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Terrain Select")),
-	m_cur_selection         (this, 0, 0, 0, 20, UI::Align_Center),
-	m_tool                  (tool),
-	m_select_recursion_protect(false)
-{
-	Widelands::World & world = parent.egbase().map().world();
-	Widelands::Terrain_Index const nr_terrains = world.get_nr_terrains();
-	const uint32_t terrains_in_row = static_cast<uint32_t>
-		(ceil(sqrt(static_cast<float>(nr_terrains))));
-
-	static const int32_t check[] = {
-		0,                                            //  "green"
-		TERRAIN_DRY,                                  //  "dry"
-		TERRAIN_DRY|TERRAIN_MOUNTAIN,                 //  "mountain"
-		TERRAIN_DRY|TERRAIN_UNPASSABLE,               //  "unpassable"
-		TERRAIN_ACID|TERRAIN_DRY|TERRAIN_UNPASSABLE,  //  "dead" or "acid"
-		TERRAIN_UNPASSABLE|TERRAIN_DRY|TERRAIN_WATER,
-	};
-
-	m_checkboxes.resize(nr_terrains);
-
-	const Image* green =
-		g_gr->images().get("pics/terrain_green.png");
-	const Image* water =
-		g_gr->images().get("pics/terrain_water.png");
-	const Image* mountain =
-		g_gr->images().get("pics/terrain_mountain.png");
-	const Image* dead =
-		g_gr->images().get("pics/terrain_dead.png");
-	const Image* unpassable =
-		g_gr->images().get("pics/terrain_unpassable.png");
-	const Image* dry =
-		g_gr->images().get("pics/terrain_dry.png");
-
-	static const int small_pich = 20;
-	static const int small_picw = 20;
-
-	uint32_t cur_x = 0;
-	Point pos(hmargin(), vmargin());
-	for (size_t checkfor = 0; checkfor < 6; ++checkfor) {
-		for (Widelands::Terrain_Index i  = 0; i < nr_terrains; ++i) {
-			const uint8_t ter_is = world.get_ter(i).get_is();
-			if (ter_is != check[checkfor])
-				continue;
-
-			if (cur_x == terrains_in_row) {
-				cur_x = 0;
-				pos.x  = hmargin();
-				pos.y += TEXTURE_HEIGHT + vspacing();
-			}
-
-			Surface* surf = Surface::create(64, 64);
-			const Image* tex = g_gr->images().get
-				(g_gr->get_maptexture_data(world.terrain_descr(i).get_texture())->get_texture_image());
-			surf->blit(Point(0, 0), tex->surface(), Rect(0, 0, tex->width(), tex->height()), CM_Solid);
-
-			Point pt(1, 64 - small_pich - 1);
-
-			//  check is green
-			if (ter_is == 0) {
-				surf->blit(pt, green->surface(), Rect(0, 0, green->width(), green->height()));
-				pt.x += small_picw + 1;
-			} else {
-				if (ter_is & TERRAIN_WATER) {
-					surf->blit(pt, water->surface(), Rect(0, 0, water->width(), water->height()));
-					pt.x += small_picw + 1;
-				}
-				if (ter_is & TERRAIN_MOUNTAIN) {
-					surf->blit(pt, mountain->surface(), Rect(0, 0, mountain->width(), mountain->height()));
-					pt.x += small_picw + 1;
-				}
-				if (ter_is & TERRAIN_ACID) {
-					surf->blit(pt, dead->surface(), Rect(0, 0, dead->width(), dead->height()));
-					pt.x += small_picw + 1;
-				}
-				if (ter_is & TERRAIN_UNPASSABLE) {
-					surf->blit(pt, unpassable->surface(), Rect(0, 0, unpassable->width(), unpassable->height()));
-					pt.x += small_picw + 1;
-				}
-				if (ter_is & TERRAIN_DRY)
-					surf->blit(pt, dry->surface(), Rect(0, 0, dry->width(), dry->height()));
-			}
-			// Make sure we delete this later on.
-			offscreen_images_.push_back(new_in_memory_image("dummy_hash", surf));
-
-			UI::Checkbox & cb = *new UI::Checkbox(this, pos, offscreen_images_.back());
-			cb.set_size(TEXTURE_WIDTH + 1, TEXTURE_HEIGHT + 1);
-			cb.set_state(m_tool.is_enabled(i));
-			cb.changedto.connect
-				(boost::bind(&Editor_Tool_Set_Terrain_Options_Menu::selected, this, i, _1));
-			m_checkboxes[i] = &cb;
-
-			pos.x += TEXTURE_WIDTH + hspacing();
-			++cur_x;
-		}
-	}
-	pos.y += TEXTURE_HEIGHT + vspacing();
-
-	set_inner_size
-		(terrains_in_row * (TEXTURE_WIDTH + hspacing()) +
-		 2 * hmargin() - hspacing(),
-		 pos.y + m_cur_selection.get_h() + vmargin());
-	pos.x = get_inner_w() / 2;
-	m_cur_selection.set_pos(pos);
-
-	std::string buf = _("Current:");
-	uint32_t j = m_tool.get_nr_enabled();
-	for (Widelands::Terrain_Index i = 0; j; ++i)
-		if (m_tool.is_enabled(i)) {
-			buf += " ";
-			buf += world.get_ter(i).descname();
-			--j;
-		}
-	m_cur_selection.set_text(buf);
-}
-
-
-Editor_Tool_Set_Terrain_Options_Menu::~Editor_Tool_Set_Terrain_Options_Menu()
-{
-	for (const Image* pic : offscreen_images_)
-		delete pic;
-	offscreen_images_.clear();
-}
-
-void Editor_Tool_Set_Terrain_Options_Menu::selected
-	(int32_t const n, bool const t)
-{
-	if (m_select_recursion_protect)
-		return;
-
-	//  FIXME This code is erroneous. It checks the current key state. What it
-	//  FIXME needs is the key state at the time the mouse was clicked. See the
-	//  FIXME usage comment for get_key_state.
-	const bool multiselect =
-		get_key_state(SDLK_LCTRL) | get_key_state(SDLK_RCTRL);
-	if (not t and (not multiselect or m_tool.get_nr_enabled() == 1))
-		m_checkboxes[n]->set_state(true);
-	else {
-		if (not multiselect) {
-			for (uint32_t i = 0; m_tool.get_nr_enabled(); ++i)
-				m_tool.enable(i, false);
-			//  disable all checkboxes
-			m_select_recursion_protect = true;
-			const int32_t size = m_checkboxes.size();
-			for (int32_t i = 0; i < size; ++i) {
-				if (i != n)
-					m_checkboxes[i]->set_state(false);
-			}
-			m_select_recursion_protect = false;
-		}
-
-		m_tool.enable(n, t);
-		select_correct_tool();
-
-		std::string buf = _("Current:");
-		const Widelands::World & world =
-			ref_cast<Editor_Interactive, UI::Panel>(*get_parent())
-			.egbase().map().world();
-		uint32_t j = m_tool.get_nr_enabled();
-		for (Widelands::Terrain_Index i = 0; j; ++i)
-			if (m_tool.is_enabled(i)) {
-				buf += " ";
-				buf += world.get_ter(i).descname();
-				--j;
-			}
-
-		m_cur_selection.set_text(buf.c_str());
-		m_cur_selection.set_pos
-			(Point
-			 	((get_inner_w() - m_cur_selection.get_w()) / 2,
-			 	 m_cur_selection.get_y()));
-	}
+#include "ui_basic/tabpanel.h"
+
+namespace {
+
+using namespace Widelands;
+
+static const int32_t check[] = {
+   TerrainDescription::GREEN,                                 //  "green"
+   TerrainDescription::DRY,                                   //  "dry"
+   TerrainDescription::DRY | TerrainDescription::MOUNTAIN,    //  "mountain"
+   TerrainDescription::DRY | TerrainDescription::UNPASSABLE,  //  "unpassable"
+   TerrainDescription::ACID | TerrainDescription::DRY |
+      TerrainDescription::UNPASSABLE,  //  "dead" or "acid"
+   TerrainDescription::UNPASSABLE | TerrainDescription::DRY | TerrainDescription::WATER,
+   -1,  // end marker
+};
+
+UI::Checkbox* create_terrain_checkbox(UI::Panel* parent,
+                                      const TerrainDescription& terrain_descr,
+                                      std::vector<std::unique_ptr<const Image>>* offscreen_images) {
+	const Image* green = g_gr->images().get("pics/terrain_green.png");
+	const Image* water = g_gr->images().get("pics/terrain_water.png");
+	const Image* mountain = g_gr->images().get("pics/terrain_mountain.png");
+	const Image* dead = g_gr->images().get("pics/terrain_dead.png");
+	const Image* unpassable = g_gr->images().get("pics/terrain_unpassable.png");
+	const Image* dry = g_gr->images().get("pics/terrain_dry.png");
+
+	constexpr int kSmallPicHeight = 20;
+	constexpr int kSmallPicWidth = 20;
+	for (size_t checkfor = 0; check[checkfor] >= 0; ++checkfor) {
+		const TerrainDescription::Type ter_is = terrain_descr.get_is();
+		if (ter_is != check[checkfor])
+			continue;
+
+		Surface* surf = Surface::create(TEXTURE_WIDTH, TEXTURE_HEIGHT);
+		const Image* tex = g_gr->images().get(
+		   g_gr->get_maptexture_data(terrain_descr.get_texture())->get_texture_image());
+		surf->blit(Point(0, 0), tex->surface(), Rect(0, 0, tex->width(), tex->height()), CM_Solid);
+		Point pt(1, TEXTURE_HEIGHT - kSmallPicHeight - 1);
+
+		if (ter_is == TerrainDescription::GREEN) {
+			surf->blit(pt, green->surface(), Rect(0, 0, green->width(), green->height()));
+			pt.x += kSmallPicWidth + 1;
+		} else {
+			if (ter_is & TerrainDescription::WATER) {
+				surf->blit(pt, water->surface(), Rect(0, 0, water->width(), water->height()));
+				pt.x += kSmallPicWidth + 1;
+			}
+			if (ter_is & TerrainDescription::MOUNTAIN) {
+				surf->blit(pt, mountain->surface(), Rect(0, 0, mountain->width(), mountain->height()));
+				pt.x += kSmallPicWidth + 1;
+			}
+			if (ter_is & TerrainDescription::ACID) {
+				surf->blit(pt, dead->surface(), Rect(0, 0, dead->width(), dead->height()));
+				pt.x += kSmallPicWidth + 1;
+			}
+			if (ter_is & TerrainDescription::UNPASSABLE) {
+				surf->blit(
+				   pt, unpassable->surface(), Rect(0, 0, unpassable->width(), unpassable->height()));
+				pt.x += kSmallPicWidth + 1;
+			}
+			if (ter_is & TerrainDescription::DRY)
+				surf->blit(pt, dry->surface(), Rect(0, 0, dry->width(), dry->height()));
+		}
+		// Make sure we delete this later on.
+		offscreen_images->emplace_back(new_in_memory_image("dummy_hash", surf));
+		break;
+	}
+
+	UI::Checkbox* cb = new UI::Checkbox(parent, Point(0, 0), offscreen_images->back().get());
+	cb->set_desired_size(TEXTURE_WIDTH + 1, TEXTURE_HEIGHT + 1);
+	return cb;
+}
+
+}  // namespace
+
+Editor_Tool_Set_Terrain_Options_Menu::Editor_Tool_Set_Terrain_Options_Menu(
+   Editor_Interactive& parent, Editor_Set_Terrain_Tool& tool, UI::UniqueWindow::Registry& registry)
+   : Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Terrain Select")) {
+	const Widelands::World& world = parent.egbase().world();
+	multi_select_menu_.reset(
+	   new CategorizedItemSelectionMenu<Widelands::TerrainDescription, Editor_Set_Terrain_Tool>(
+	      this,
+	      world.editor_terrain_categories(),
+	      world.terrains(),
+	      [this](UI::Panel* cb_parent, const TerrainDescription& terrain_descr) {
+		      return create_terrain_checkbox(cb_parent, terrain_descr, &offscreen_images_);
+		   },
+	      [this] { select_correct_tool(); },
+	      &tool));
+	set_center_panel(multi_select_menu_.get());
+}
+
+Editor_Tool_Set_Terrain_Options_Menu::~Editor_Tool_Set_Terrain_Options_Menu() {
 }

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.h'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2014-06-17 15:48:25 +0000
@@ -20,32 +20,28 @@
 #ifndef EDITOR_TOOL_SET_TERRAIN_TOOL_H
 #define EDITOR_TOOL_SET_TERRAIN_TOOL_H
 
+#include <map>
+#include <memory>
 #include <vector>
 
+#include "editor/ui_menus/categorized_item_selection_menu.h"
 #include "editor/ui_menus/editor_tool_options_menu.h"
+#include "logic/world/terrain_description.h"
 #include "ui_basic/textarea.h"
 
-
 struct Editor_Interactive;
 struct Editor_Set_Terrain_Tool;
-namespace UI {struct Checkbox;}
 
 struct Editor_Tool_Set_Terrain_Options_Menu : public Editor_Tool_Options_Menu {
-	Editor_Tool_Set_Terrain_Options_Menu
-		(Editor_Interactive         &,
-		 Editor_Set_Terrain_Tool    &,
-		 UI::UniqueWindow::Registry &);
+	Editor_Tool_Set_Terrain_Options_Menu(Editor_Interactive&,
+	                                     Editor_Set_Terrain_Tool&,
+	                                     UI::UniqueWindow::Registry&);
 	virtual ~Editor_Tool_Set_Terrain_Options_Menu();
 
 private:
-	// When we are using an offscreen surface, we have to delete it,
-	// when we are closed. So we keep a pointer around.
-	std::vector<const Image*>  offscreen_images_;
-	UI::Textarea                m_cur_selection;
-	Editor_Set_Terrain_Tool   & m_tool;
-	void selected(int32_t, bool);
-	std::vector<UI::Checkbox *> m_checkboxes;
-	bool m_select_recursion_protect;
+	std::unique_ptr<CategorizedItemSelectionMenu<Widelands::TerrainDescription, Editor_Set_Terrain_Tool>>
+	multi_select_menu_;
+	std::vector<std::unique_ptr<const Image>>  offscreen_images_;
 };
 
 

=== modified file 'src/game_io/game_game_class_data_packet.cc'
--- src/game_io/game_game_class_data_packet.cc	2014-05-11 07:38:01 +0000
+++ src/game_io/game_game_class_data_packet.cc	2014-06-17 15:48:25 +0000
@@ -38,7 +38,7 @@
 		uint16_t const packet_version = fr.Unsigned16();
 		if (packet_version <= CURRENT_PACKET_VERSION) {
 			fr.Signed16(); // This used to be game speed
-			game.m_gametime = fr.Unsigned32();
+			game.gametime_ = fr.Unsigned32();
 		} else
 			throw game_data_error
 				("unknown/unhandled version %u", packet_version);
@@ -70,7 +70,7 @@
 
 	// EDITOR GAME CLASS
 	// Write gametime
-	fw.Unsigned32(game.m_gametime);
+	fw.Unsigned32(game.gametime_);
 
 	// We do not care for players, since they were set
 	// on game initialization to match Map::scenario_player_[names|tribes]

=== modified file 'src/game_io/game_map_data_packet.cc'
--- src/game_io/game_map_data_packet.cc	2014-06-10 20:38:57 +0000
+++ src/game_io/game_map_data_packet.cc	2014-06-17 15:48:25 +0000
@@ -46,7 +46,6 @@
 	m_wml = new WL_Map_Loader(fs.MakeSubFileSystem("map"), &game.map());
 
 	m_wml->preload_map(true);
-	m_wml->load_world();
 
 	//  DONE, mapfs gets deleted by WidelandsMapLoader.
 

=== modified file 'src/game_io/game_preload_data_packet.cc'
--- src/game_io/game_preload_data_packet.cc	2014-04-14 06:17:25 +0000
+++ src/game_io/game_preload_data_packet.cc	2014-06-17 15:48:25 +0000
@@ -105,13 +105,8 @@
 	}
 	s.set_int(PLAYERS_AMOUNT_KEY_V4, game.player_manager()->get_number_of_players());
 
-	std::string bg(map.get_background());
-	if (bg.empty())
-		bg = map.get_world_name();
-	s.set_string("background", bg);
-
+	s.set_string("background", map.get_background());
 	s.set_string("win_condition", game.get_win_condition_displayname());
-
 	prof.write("preload", false, fs);
 
 	// Write minimap image

=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc	2014-06-16 13:24:45 +0000
+++ src/graphic/animation.cc	2014-06-17 15:48:25 +0000
@@ -43,8 +43,9 @@
 #include "io/filesystem/layered_filesystem.h"
 #include "log.h"
 #include "logic/bob.h"
-#include "logic/instances.h"  // For Map_Object_Descr.
+#include "logic/instances.h"
 #include "profile/profile.h"
+#include "scripting/lua_table.h"
 #include "sound/sound_handler.h"
 #include "wexception.h"
 
@@ -54,6 +55,16 @@
 
 namespace  {
 
+// Parses an array { 12, 23 } into a point.
+void get_point(const LuaTable& table, Point* p) {
+	std::vector<int> pts = table.array_entries<int>();
+	if (pts.size() != 2) {
+		throw wexception("Expected 2 entries, but got %" PRIuS ".", pts.size());
+	}
+	p->x = pts[0];
+	p->y = pts[1];
+}
+
 /**
  * An Image Implementation that draws a static animation into a surface.
  */
@@ -96,7 +107,8 @@
 class NonPackedAnimation : public Animation {
 public:
 	virtual ~NonPackedAnimation() {}
-	NonPackedAnimation(const string& directory, Section & s);
+	NonPackedAnimation(const string& directory, Section & section);
+	NonPackedAnimation(const LuaTable& table);
 
 	// Implements Animation.
 	virtual uint16_t width() const override;
@@ -121,114 +133,129 @@
 	uint32_t frametime_;
 	Point hotspot_;
 	bool hasplrclrs_;
-	std::string picnametempl_;
+	std::vector<std::string> image_files_;
+	std::vector<std::string> pc_mask_image_files_;
 
 	vector<const Image*> frames_;
 	vector<const Image*> pcmasks_;
 
-	/// mapping of soundeffect name to frame number, indexed by frame number .
-	map<uint32_t, string> sfx_cues;
+	// name of sound effect that will be played at frame 0.
+	// TODO(sirver): this should be done using playFX in a program instead of
+	// binding it to the animation.
+	string sound_effect_;
 };
 
-NonPackedAnimation::NonPackedAnimation(const string& directory, Section& s)
+NonPackedAnimation::NonPackedAnimation(const string& directory, Section& section)
 		: frametime_(FRAME_LENGTH),
 		  hasplrclrs_(false) {
-	// Read mapping from frame numbers to sound effect names and load effects
-	while (Section::Value * const v = s.get_next_val("sfx")) {
-		char * parameters = v->get_string(), * endp;
-		string fx_name;
-		unsigned long long int const value = strtoull(parameters, &endp, 0);
-		const uint32_t frame_number = value;
-		try {
-			if (endp == parameters or frame_number != value)
-				throw wexception("expected %s but found \"%s\"", "frame number", parameters);
-			parameters = endp;
-			force_skip(parameters);
-
-			fx_name = string(directory) + "/" + string(parameters);
-			g_sound_handler.load_fx_if_needed(directory, parameters, fx_name);
-			map<uint32_t, string>::const_iterator const it =
-				sfx_cues.find(frame_number);
-			if (it != sfx_cues.end())
-				throw wexception
-					("redefinition for frame %u to \"%s\" (previously defined to "
-					 "\"%s\")",
-					 frame_number, parameters, it->second.c_str());
-		} catch (const _wexception & e) {
-			throw wexception("sfx: %s", e.what());
-		}
-		sfx_cues[frame_number] = fx_name;
+	// If this animation has a sound effect associated, try to load it now.
+	const std::string sfx = section.get_string("sfx", "");
+	if (!sfx.empty()) {
+			sound_effect_ = string(directory) + "/" + sfx;
+			g_sound_handler.load_fx_if_needed(directory, sfx, sound_effect_);
 	}
 
-	int32_t const fps = s.get_int("fps");
+	int32_t const fps = section.get_int("fps");
 	if (fps < 0)
 		throw wexception("fps is %i, must be non-negative", fps);
 	if (fps > 0)
 		frametime_ = 1000 / fps;
 
-	hotspot_ = s.get_Point("hotspot");
+	hotspot_ = section.get_Point("hotspot");
 
 	//  In the filename template, the last sequence of '?' characters (if any)
 	//  is replaced with a number, for example the template "idle_??" is
 	//  replaced with "idle_00". Then the code looks if there is a PNG with that
 	//  name, increments the number and continues . on until it can not find any
 	//  file. Then it is assumed that there are no more frames in the animation.
-	if (char const * const pics = s.get_string("pics")) {
-		picnametempl_ = directory + pics;
+	string picnametempl;
+	if (char const * const pics = section.get_string("pics")) {
+		picnametempl = directory + pics;
 	} else {
-		picnametempl_ = directory + s.get_name();
+		picnametempl = directory + section.get_name();
 	}
 	// Strip the .png extension if it has one.
-	boost::replace_all(picnametempl_, ".png", "");
-}
+	boost::replace_all(picnametempl, ".png", "");
 
-void NonPackedAnimation::load_graphics() {
-	NumberGlob glob(picnametempl_);
+	NumberGlob glob(picnametempl);
 	string filename_wo_ext;
 	while (glob.next(&filename_wo_ext)) {
 		const string filename = filename_wo_ext + ".png";
 		if (!g_fs->FileExists(filename))
 			break;
-
-		const Image* image = g_gr->images().get(filename);
-		if
-			(frames_.size() &&
-			 (frames_[0]->width() != image->width() or frames_[0]->height() != image->height()))
-					throw wexception
-						("wrong size: (%u, %u), should be (%u, %u) like the first frame",
-						 image->width(), image->height(), frames_[0]->width(), frames_[0]->height());
-		frames_.push_back(image);
-
-		//TODO Do not load playercolor mask as opengl texture or use it as
-		//     opengl texture.
+		image_files_.push_back(filename);
+
 		const string pc_filename = filename_wo_ext + "_pc.png";
 		if (g_fs->FileExists(pc_filename)) {
 			hasplrclrs_ = true;
-			const Image* pc_image = g_gr->images().get(pc_filename);
-			if (frames_[0]->width() != pc_image->width() or frames_[0]->height() != pc_image->height()) {
-				log("ANIMATION ERROR: playercolor mask has wrong size: (%s: %u, %u), should "
-					 "be (%u, %u) like the animation frame\n",
-					 pc_filename.c_str(), pc_image->width(), pc_image->height(), frames_[0]->width(),
-						frames_[0]->height());
-					 hasplrclrs_ = false;
-					 break;
-				}
-				//throw wexception
-					//("playercolor mask has wrong size: (%s: %u, %u), should "
-					 //"be (%u, %u) like the animation frame",
-					 //pc_filename.c_str(),pc_image->width(), pc_image->height(), frames_[0]->width(),
-							//frames_[0]->height());
-			pcmasks_.push_back(pc_image);
-		}
-	}
-
-	if (frames_.empty())
-		throw wexception("animation %s has no frames", picnametempl_.c_str());
-
-	if (pcmasks_.size() and pcmasks_.size() != frames_.size())
+			pc_mask_image_files_.push_back(pc_filename);
+		}
+	}
+}
+
+NonPackedAnimation::NonPackedAnimation(const LuaTable& table)
+		: frametime_(FRAME_LENGTH),
+		  hasplrclrs_(false) {
+	// TODO(sirver): the LuaTable constructor has no support for player_colors right now.
+	get_point(*table.get_table("hotspot"), &hotspot_);
+
+	if (table.has_key("sound_effect")) {
+		std::unique_ptr<LuaTable> sound_effects = table.get_table("sound_effect");
+
+		const std::string name = sound_effects->get_string("name");
+		const std::string directory = sound_effects->get_string("directory");
+		sound_effect_ = directory + "/" + name;
+		g_sound_handler.load_fx_if_needed(directory, name, sound_effect_);
+	}
+
+	image_files_ = table.get_table("pictures")->array_entries<std::string>();
+	if (image_files_.empty()) {
+		throw wexception("Animation without pictures.");
+	} else if (image_files_.size() == 1) {
+		if (table.has_key("fps")) {
+			throw wexception("Animation with one picture must not have 'fps'.");
+		}
+	} else {
+		frametime_ = 1000 / get_positive_int(table, "fps");
+	}
+}
+
+void NonPackedAnimation::load_graphics() {
+	if (image_files_.empty())
+		throw wexception("animation without pictures.");
+
+	if (pc_mask_image_files_.size() and pc_mask_image_files_.size() != image_files_.size())
 		throw wexception
 			("animation has %" PRIuS " frames but playercolor mask has %" PRIuS " frames",
-			 frames_.size(), pcmasks_.size());
+			 image_files_.size(), pc_mask_image_files_.size());
+
+	for (const std::string& filename : image_files_) {
+		const Image* image = g_gr->images().get(filename);
+		if (frames_.size() &&
+		    (frames_[0]->width() != image->width() or frames_[0]->height() != image->height())) {
+			throw wexception("wrong size: (%u, %u), should be (%u, %u) like the first frame",
+			                 image->width(),
+			                 image->height(),
+			                 frames_[0]->width(),
+			                 frames_[0]->height());
+		}
+		frames_.push_back(image);
+	}
+
+	for (const std::string& filename : pc_mask_image_files_) {
+		// TODO Do not load playercolor mask as opengl texture or use it as
+		//     opengl texture.
+		const Image* pc_image = g_gr->images().get(filename);
+		if (frames_[0]->width() != pc_image->width() or frames_[0]->height() != pc_image->height()) {
+			throw wexception("playercolor mask has wrong size: (%u, %u), should "
+			                 "be (%u, %u) like the animation frame",
+			                 pc_image->width(),
+			                 pc_image->height(),
+			                 frames_[0]->width(),
+			                 frames_[0]->height());
+		}
+		pcmasks_.push_back(pc_image);
+	}
 }
 
 uint16_t NonPackedAnimation::width() const {
@@ -268,12 +295,14 @@
 	return get_frame(0, nullptr);
 }
 
-void NonPackedAnimation::trigger_soundfx
-	(uint32_t time, uint32_t stereo_position) const {
+void NonPackedAnimation::trigger_soundfx(uint32_t time, uint32_t stereo_position) const {
+	if (sound_effect_.empty()) {
+		return;
+	}
 	const uint32_t framenumber = time / frametime_ % nr_frames();
-	const map<uint32_t, string>::const_iterator sfx_cue = sfx_cues.find(framenumber);
-	if (sfx_cue != sfx_cues.end())
-		g_sound_handler.play_fx(sfx_cue->second, stereo_position, 1);
+	if (framenumber == 0) {
+		g_sound_handler.play_fx(sound_effect_, stereo_position, 1);
+	}
 }
 
 void NonPackedAnimation::blit
@@ -411,6 +440,11 @@
 	return m_animations.size();
 }
 
+uint32_t AnimationManager::load(const LuaTable& table) {
+	m_animations.push_back(new NonPackedAnimation(table));
+	return m_animations.size();
+}
+
 const Animation& AnimationManager::get_animation(uint32_t id) const
 {
 	if (!id || id > m_animations.size())

=== modified file 'src/graphic/animation.h'
--- src/graphic/animation.h	2014-04-06 15:46:29 +0000
+++ src/graphic/animation.h	2014-06-17 15:48:25 +0000
@@ -31,9 +31,10 @@
 #include "rect.h"
 
 class Image;
+class LuaTable;
+class Section;
 class Surface;
 struct RGBColor;
-struct Section;
 
 /**
  * Representation of an Animation in the game. An animation is a looping set of
@@ -103,6 +104,7 @@
 	 * \param s             conffile section to search for data on this animation
 	*/
 	uint32_t load(const std::string & directory, Section& s);
+	uint32_t load(const LuaTable& table);
 
 	/// Returns the animation with the given ID or throws an exception if it is
 	/// unknown.

=== modified file 'src/graphic/diranimations.h'
--- src/graphic/diranimations.h	2014-03-16 20:55:15 +0000
+++ src/graphic/diranimations.h	2014-06-17 15:48:25 +0000
@@ -28,12 +28,12 @@
 
 namespace Widelands {struct Map_Object_Descr;}
 
-struct Profile;
-struct Section;
+class Profile;
+class Section;
 
 /// Manages a set of 6 animations, one for each possible direction.
 struct DirAnimations {
-	explicit DirAnimations
+	DirAnimations
 		(uint32_t dir1 = 0, uint32_t dir2 = 0, uint32_t dir3 = 0,
 		 uint32_t dir4 = 0, uint32_t dir5 = 0, uint32_t dir6 = 0);
 
@@ -48,6 +48,9 @@
 	uint32_t get_animation(Widelands::Direction const dir) const {
 		return m_animations[dir - 1];
 	}
+	void set_animation(const Widelands::Direction dir, const uint32_t anim) {
+		m_animations[dir - 1] = anim;
+	}
 
 	static DirAnimations Null() {
 		return DirAnimations(0); // Since real animation IDs are positive, this is safe

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2014-06-10 20:38:57 +0000
+++ src/graphic/graphic.cc	2014-06-17 15:48:25 +0000
@@ -314,6 +314,9 @@
 
 	m_sdl_screen = sdlsurface;
 	m_rendertarget.reset(new RenderTarget(screen_.get()));
+
+	pic_road_normal_.reset(image_loader_->load("world/pics/roadt_normal.png"));
+	pic_road_busy_.reset(image_loader_->load("world/pics/roadt_busy.png"));
 }
 
 bool Graphic::check_fallback_settings_in_effect()
@@ -322,7 +325,7 @@
 }
 
 void Graphic::cleanup() {
-	flush_maptextures();
+	m_maptextures.clear();
 	surface_cache_->flush();
 	// TODO: this should really not be needed, but currently is :(
 	if (UI::g_fh)
@@ -526,34 +529,9 @@
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 }
 
-void Graphic::flush_maptextures()
-{
-	for (Texture* texture : m_maptextures)
-		delete texture;
-	m_maptextures.clear();
-}
-
-/**
- * Creates a terrain texture.
- *
- * fnametempl is a filename with possible wildcard characters '?'. The function
- * fills the wildcards with decimal numbers to get the different frames of a
- * texture animation. For example, if fnametempl is "foo_??.png", it tries
- * "foo_00.png", "foo_01.png" etc...
- * frametime is in milliseconds.
- * \return 0 if the texture couldn't be loaded.
- * \note Terrain textures are not reused, even if fnametempl matches.
-*/
-uint32_t Graphic::get_maptexture(const string& fnametempl, uint32_t frametime)
-{
-	try {
-		m_maptextures.push_back
-			(new Texture(fnametempl, frametime, *m_sdl_screen->format));
-	} catch (exception& e) {
-		log("Failed to load maptexture %s: %s\n", fnametempl.c_str(), e.what());
-		return 0;
-	}
-
+uint32_t Graphic::new_maptexture(const std::vector<std::string>& texture_files, const uint32_t frametime)
+{
+	m_maptextures.emplace_back(new Texture(texture_files, frametime, *m_sdl_screen->format));
 	return m_maptextures.size(); // ID 1 is at m_maptextures[0]
 }
 
@@ -568,16 +546,6 @@
 }
 
 /**
- * reset that the map texture have been animated
- */
-void Graphic::reset_texture_animation_reminder()
-{
-	for (uint32_t i = 0; i < m_maptextures.size(); ++i) {
-		m_maptextures[i]->reset_was_animated();
-	}
-}
-
-/**
  * Save a screenshot to the given file.
 */
 void Graphic::screenshot(const string& fname) const
@@ -618,24 +586,9 @@
 Texture * Graphic::get_maptexture_data(uint32_t id)
 {
 	--id; // ID 1 is at m_maptextures[0]
-	if (id < m_maptextures.size())
-		return m_maptextures[id];
-	else
-		return nullptr;
-}
-
-
-/**
- * Sets the name of the current world and loads the fitting road and edge textures
- */
-void Graphic::set_world(string worldname) {
-	char buf[255];
-
-	// Load the road textures
-	snprintf(buf, sizeof(buf), "worlds/%s/pics/roadt_normal.png", worldname.c_str());
-	pic_road_normal_.reset(image_loader_->load(buf));
-	snprintf(buf, sizeof(buf), "worlds/%s/pics/roadt_busy.png", worldname.c_str());
-	pic_road_busy_.reset(image_loader_->load(buf));
+
+	assert(id < m_maptextures.size());
+	return m_maptextures[id].get();
 }
 
 /**

=== modified file 'src/graphic/graphic.h'
--- src/graphic/graphic.h	2014-03-16 20:55:15 +0000
+++ src/graphic/graphic.h	2014-06-17 15:48:25 +0000
@@ -109,15 +109,14 @@
 
 	void save_png(const Image*, StreamWrite*) const;
 
-	void flush_maptextures();
-	uint32_t get_maptexture(const std::string& fnametempl, uint32_t frametime);
+	// Creates a new Texture() with the given 'frametime' and using the given
+	// 'texture_files' as the images for it and returns it id.
+	uint32_t new_maptexture(const std::vector<std::string>& texture_files, uint32_t frametime);
 	void animate_maptextures(uint32_t time);
-	void reset_texture_animation_reminder();
 
 	void screenshot(const std::string& fname) const;
 	Texture * get_maptexture_data(uint32_t id);
 
-	void set_world(std::string);
 	Surface& get_road_texture(int32_t roadtex);
 
 	const GraphicCaps& caps() const {return m_caps;}
@@ -171,7 +170,7 @@
 	std::unique_ptr<Surface> pic_road_normal_;
 	std::unique_ptr<Surface> pic_road_busy_;
 
-	std::vector<Texture *> m_maptextures;
+	std::vector<std::unique_ptr<Texture>> m_maptextures;
 };
 
 extern Graphic * g_gr;

=== modified file 'src/graphic/render/gamerenderer_gl.cc'
--- src/graphic/render/gamerenderer_gl.cc	2014-05-11 07:38:01 +0000
+++ src/graphic/render/gamerenderer_gl.cc	2014-06-17 15:48:25 +0000
@@ -29,6 +29,8 @@
 #include "io/fileread.h"
 #include "logic/editor_game_base.h"
 #include "logic/player.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "wui/mapviewpixelconstants.h"
 #include "wui/mapviewpixelfunctions.h"
 #include "wui/overlay_manager.h"
@@ -49,9 +51,9 @@
 {
 }
 
-const GLSurfaceTexture * GameRendererGL::get_dither_edge_texture(const Widelands::World & world)
+const GLSurfaceTexture * GameRendererGL::get_dither_edge_texture()
 {
-	const std::string fname = world.basedir() + "/pics/edge.png";
+	const std::string fname = "world/pics/edge.png";
 	const std::string cachename = std::string("gltex#") + fname;
 
 	if (Surface* surface = g_gr->surfaces().get(cachename))
@@ -117,6 +119,12 @@
 
 void GameRendererGL::draw()
 {
+	const World & world = m_egbase->world();
+	if (m_terrain_freq.size() < world.terrains().get_nitems()) {
+		m_terrain_freq.resize(world.terrains().get_nitems());
+		m_terrain_edge_freq.resize(world.terrains().get_nitems());
+	}
+
 	m_surface = dynamic_cast<GLSurface *>(m_dst->get_surface());
 	if (!m_surface)
 		return;
@@ -242,8 +250,6 @@
 		m_patch_vertices_size = reqsize;
 	}
 
-	if (m_terrain_freq.size() < 16)
-		m_terrain_freq.resize(16);
 	m_terrain_freq.assign(m_terrain_freq.size(), 0);
 
 	collect_terrain_base(true);
@@ -273,8 +279,7 @@
 
 void GameRendererGL::draw_terrain_base()
 {
-	const Map & map = m_egbase->map();
-	const World & world = map.world();
+	const World & world = m_egbase->world();
 
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
@@ -313,8 +318,7 @@
 	(bool onlyscan, Terrain_Index ter, const Coords & edge1, const Coords & edge2, const Coords & opposite)
 {
 	if (onlyscan) {
-		if (ter >= m_terrain_edge_freq.size())
-			m_terrain_edge_freq.resize(ter + 1);
+		assert(ter < m_terrain_edge_freq.size());
 		m_terrain_edge_freq[ter] += 1;
 	} else {
 		static const float TyZero = 1.0 / TEXTURE_HEIGHT;
@@ -340,7 +344,7 @@
 void GameRendererGL::collect_terrain_dither(bool onlyscan)
 {
 	const Map & map = m_egbase->map();
-	const World & world = map.world();
+	const World & world = m_egbase->world();
 
 	for (int32_t fy = m_minfy; fy <= m_maxfy; ++fy) {
 		for (int32_t fx = m_minfx; fx <= m_maxfx; ++fx) {
@@ -354,12 +358,12 @@
 			Terrain_Index ter_rr = map.r_n(fcoords).field->get_terrains().d;
 			Terrain_Index ter_l = map.l_n(fcoords).field->get_terrains().r;
 			Terrain_Index ter_dd = map.bl_n(fcoords).field->get_terrains().r;
-			int32_t lyr_d = world.get_ter(ter_d).dither_layer();
-			int32_t lyr_r = world.get_ter(ter_r).dither_layer();
-			int32_t lyr_u = world.get_ter(ter_u).dither_layer();
-			int32_t lyr_rr = world.get_ter(ter_rr).dither_layer();
-			int32_t lyr_l = world.get_ter(ter_l).dither_layer();
-			int32_t lyr_dd = world.get_ter(ter_dd).dither_layer();
+			int32_t lyr_d = world.terrain_descr(ter_d).dither_layer();
+			int32_t lyr_r = world.terrain_descr(ter_r).dither_layer();
+			int32_t lyr_u = world.terrain_descr(ter_u).dither_layer();
+			int32_t lyr_rr = world.terrain_descr(ter_rr).dither_layer();
+			int32_t lyr_l = world.terrain_descr(ter_l).dither_layer();
+			int32_t lyr_dd = world.terrain_descr(ter_dd).dither_layer();
 
 			Coords f(fx, fy);
 			Coords rn(fx + 1, fy);
@@ -408,8 +412,6 @@
 {
 	static_assert(sizeof(dithervertex) == 32, "assert(sizeof(dithervertex) == 32) failed.");
 
-	if (m_terrain_edge_freq.size() < 16)
-		m_terrain_edge_freq.resize(16);
 	m_terrain_edge_freq.assign(m_terrain_edge_freq.size(), 0);
 
 	collect_terrain_dither(true);
@@ -439,9 +441,6 @@
 
 void GameRendererGL::draw_terrain_dither()
 {
-	const Map & map = m_egbase->map();
-	const World & world = map.world();
-
 	if (m_edge_vertices_size == 0)
 		return;
 
@@ -456,7 +455,7 @@
 	glClientActiveTextureARB(GL_TEXTURE1_ARB);
 	glTexCoordPointer(2, GL_FLOAT, sizeof(dithervertex), &m_edge_vertices[0].edgex);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-	GLuint edge = get_dither_edge_texture(world)->get_gl_texture();
+	GLuint edge = get_dither_edge_texture()->get_gl_texture();
 	glBindTexture(GL_TEXTURE_2D, edge);
 	glEnable(GL_TEXTURE_2D);
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
@@ -478,7 +477,7 @@
 
 		const Texture & texture =
 				*g_gr->get_maptexture_data
-					(world.terrain_descr(ter).get_texture());
+					(m_egbase->world().terrain_descr(ter).get_texture());
 		glBindTexture(GL_TEXTURE_2D, texture.getTexture());
 		glDrawArrays
 			(GL_TRIANGLES,

=== modified file 'src/graphic/render/gamerenderer_gl.h'
--- src/graphic/render/gamerenderer_gl.h	2014-02-22 18:04:02 +0000
+++ src/graphic/render/gamerenderer_gl.h	2014-06-17 15:48:25 +0000
@@ -30,7 +30,7 @@
 namespace Widelands {
 struct Coords;
 struct FCoords;
-struct World;
+class World;
 }
 
 class GLSurface;
@@ -65,7 +65,7 @@
 		uint32_t pad[1];
 	};
 
-	const GLSurfaceTexture * get_dither_edge_texture(const Widelands::World & world);
+	const GLSurfaceTexture * get_dither_edge_texture();
 
 	void draw() override;
 	void prepare_terrain_base();

=== modified file 'src/graphic/render/gamerenderer_sdl.cc'
--- src/graphic/render/gamerenderer_sdl.cc	2013-07-26 20:19:36 +0000
+++ src/graphic/render/gamerenderer_sdl.cc	2014-06-17 15:48:25 +0000
@@ -24,6 +24,8 @@
 #include "logic/field.h"
 #include "logic/map.h"
 #include "logic/player.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "wui/overlay_manager.h"
 
 
@@ -66,7 +68,7 @@
 		m_dst->get_surface()->fill_rect(m_dst->get_rect(), RGBAColor(0, 0, 0, 255));
 
 	const Map & map = m_egbase->map();
-	const World & world = map.world();
+	const World & world = m_egbase->world();
 	uint32_t const mapwidth = map.get_width();
 
 #define get_terrain_texture(ter) \

=== modified file 'src/graphic/render/minimaprenderer.cc'
--- src/graphic/render/minimaprenderer.cc	2013-10-13 15:03:08 +0000
+++ src/graphic/render/minimaprenderer.cc	2014-06-17 15:48:25 +0000
@@ -31,6 +31,8 @@
 #include "logic/field.h"
 #include "logic/map.h"
 #include "logic/player.h"
+#include "logic/world/terrain_description.h"
+#include "logic/world/world.h"
 #include "upcast.h"
 #include "wui/mapviewpixelconstants.h"
 #include "wui/mapviewpixelfunctions.h"
@@ -66,7 +68,7 @@
 		pixelcolor =
 			g_gr->
 			get_maptexture_data
-				(egbase.map().world()
+				(egbase.world()
 				 .terrain_descr(f.field->terrain_d()).get_texture())
 			->get_minimap_color(f.field->get_brightness()) | format.Amask;
 	}
@@ -91,10 +93,7 @@
 
 		if (upcast(PlayerImmovable const, immovable, f.field->get_immovable())) {
 			if ((flags & MiniMap::Roads) and dynamic_cast<Road const *>(immovable)) {
-				if (!(flags & MiniMap::Owner) && !strcmp(egbase.map().get_world_name(), "winterland"))
-						pixelcolor = blend_color(format, pixelcolor, 255, 127, 0);
-				else //ownership layer displayed or greenland
-						pixelcolor = blend_color(format, pixelcolor, 255, 255, 255);
+				pixelcolor = blend_color(format, pixelcolor, 255, 255, 255);
 			}
 
 			if
@@ -104,14 +103,7 @@
 				  and
 				  dynamic_cast<Widelands::Building const *>(immovable)))
 			{
-				if (!(flags & MiniMap::Owner) && !strcmp(egbase.map().get_world_name(), "winterland"))
-					pixelcolor =
-						SDL_MapRGB
-							(&const_cast<SDL_PixelFormat &>(format), 255, 127, 0);
-				else //ownership layer displayed or greenland
-					pixelcolor =
-						SDL_MapRGB
-							(&const_cast<SDL_PixelFormat &>(format), 255, 255, 255);
+				pixelcolor = SDL_MapRGB(&const_cast<SDL_PixelFormat&>(format), 255, 255, 255);
 			}
 		}
 	}

=== modified file 'src/graphic/texture.cc'
--- src/graphic/texture.cc	2014-05-10 16:56:38 +0000
+++ src/graphic/texture.cc	2014-06-17 15:48:25 +0000
@@ -37,62 +37,39 @@
  * Currently it converts a 16 bit image to a 8 bit texture. This should
  * be changed to load a 8 bit file directly, however.
  */
-Texture::Texture(const string& fnametmpl, uint32_t frametime, const SDL_PixelFormat& format)
-	: m_pixels   (nullptr),
-		m_curframe (nullptr),
-		m_frame_num(0),
-		m_nrframes (0),
-		m_frametime(frametime),
-		m_was_animated(false)
-{
-	// Load the images one by one
-	char fname[256];
-
-	for (;;) {
-		int32_t nr = m_nrframes;
-
-		// create the file name by reverse-scanning for '?' and replacing
-		snprintf(fname, sizeof(fname), "%s", fnametmpl.c_str());
-		char * p = fname + strlen(fname);
-		while (p > fname) {
-			if (*--p != '?')
-				continue;
-
-			*p = '0' + (nr % 10);
-			nr = nr / 10;
+Texture::Texture(const std::vector<std::string>& texture_files,
+                 const uint32_t frametime,
+                 const SDL_PixelFormat& format)
+   : m_colormap(nullptr),
+     m_pixels(nullptr),
+     m_curframe(nullptr),
+     m_frame_num(0),
+     m_nrframes(0),
+     m_frametime(frametime) {
+	if (texture_files.empty()) {
+		throw wexception("No images for texture.");
+	}
+
+	for (const std::string& fname : texture_files) {
+		if (!g_fs->FileExists(fname)) {
+			throw wexception("Could not find %s.", fname.c_str());
 		}
 
-		if (nr) // cycled up to maximum possible frame number
-			break;
-
-		if (!g_fs->FileExists(fname))
-			break;
-
 		SDL_Surface * surf;
-
 		m_texture_image = fname;
-
 		FileRead fr;
-
 		fr.Open(*g_fs, fname);
 
 		surf = IMG_Load_RW(SDL_RWFromMem(fr.Data(0), fr.GetSize()), 1);
-
 		if (!surf) {
-			log
-				("WARNING: Failed to load texture frame %s: %s\n",
-				 fname, IMG_GetError());
-			break;
+			throw wexception("WARNING: Failed to load texture frame %s: %s\n", fname.c_str(), IMG_GetError());
 		}
-
 		if (surf->w != TEXTURE_WIDTH || surf->h != TEXTURE_HEIGHT) {
 			SDL_FreeSurface(surf);
-			log
-				("WARNING: %s: texture must be %ix%i pixels big\n",
-				 fname,
-				 TEXTURE_WIDTH,
-				 TEXTURE_HEIGHT);
-			break;
+			throw wexception("WARNING: %s: texture must be %ix%i pixels big\n",
+			                 fname.c_str(),
+			                 TEXTURE_WIDTH,
+			                 TEXTURE_HEIGHT);
 		}
 
 		if (g_opengl) {
@@ -138,7 +115,7 @@
 			} else {
 				SDL_Color pal[256];
 
-				log("WARNING: %s: using 332 default palette\n", fname);
+				log("WARNING: %s: using 332 default palette\n", fname.c_str());
 
 				for (int32_t r = 0; r < 8; ++r)
 					for (int32_t g = 0; g < 8; ++g)
@@ -192,7 +169,7 @@
 	}
 
 	if (!m_nrframes)
-		throw wexception("%s: texture has no frames", fnametmpl.c_str());
+		throw wexception("Texture has no frames");
 }
 
 
@@ -220,13 +197,7 @@
 void Texture::animate(uint32_t time)
 {
 	m_frame_num = (time / m_frametime) % m_nrframes;
-
 	if (g_opengl)
 		return;
-
-	uint8_t * const lastframe = m_curframe;
-
 	m_curframe = &m_pixels[TEXTURE_WIDTH * TEXTURE_HEIGHT * m_frame_num];
-	if (lastframe != m_curframe)
-		m_was_animated = true;
 }

=== modified file 'src/graphic/texture.h'
--- src/graphic/texture.h	2014-06-10 20:42:45 +0000
+++ src/graphic/texture.h	2014-06-17 15:48:25 +0000
@@ -40,8 +40,9 @@
 * changed to load 8 bit bitmaps directly.
 */
 struct Texture {
-	Texture
-		(const std::string& fnametempl, uint32_t frametime, const SDL_PixelFormat&);
+	Texture(const std::vector<std::string>& texture_files,
+	        uint32_t frametime,
+	        const SDL_PixelFormat&);
 	~Texture();
 
 	const std::string & get_texture_image() const {return m_texture_image;}
@@ -53,8 +54,6 @@
 	uint32_t get_minimap_color(char shade);
 
 	void animate(uint32_t time);
-	void reset_was_animated() {m_was_animated = false;}
-	bool was_animated() const {return m_was_animated;}
 	uint32_t getTexture() const
 		{return m_glFrames.at(m_frame_num)->get_gl_texture();}
 
@@ -67,7 +66,6 @@
 	std::string m_texture_image;
 	uint32_t    m_nrframes;
 	uint32_t    m_frametime;
-	bool        m_was_animated;
 	std::vector<std::unique_ptr<GLSurfaceTexture>> m_glFrames;
 };
 

=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc	2014-06-14 13:53:57 +0000
+++ src/io/filesystem/disk_filesystem.cc	2014-06-17 15:48:25 +0000
@@ -383,8 +383,9 @@
 
 		length = size;
 	} catch (...) {
-		if (file)
+		if (file) {
 			fclose(file);
+		}
 		free(data);
 		throw;
 	}

=== modified file 'src/logic/bob.cc'
--- src/logic/bob.cc	2014-05-11 07:38:01 +0000
+++ src/logic/bob.cc	2014-06-17 15:48:25 +0000
@@ -21,10 +21,11 @@
 
 #include <cstdlib>
 
+#include <stdint.h>
+
 #include "backtrace.h"
 #include "economy/route.h"
 #include "economy/transfer.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -49,6 +50,12 @@
 
 namespace Widelands {
 
+BobDescr::BobDescr(const std::string& init_name,
+                  const std::string& init_descname,
+                  Tribe_Descr const* tribe)
+   : Map_Object_Descr(init_name, init_descname), owner_tribe_(tribe) {
+}
+
 /**
  * Only tribe bobs have a vision range, since it would be irrelevant
  * for world bobs.
@@ -59,42 +66,15 @@
  */
 uint32_t BobDescr::vision_range() const
 {
-	if (m_owner_tribe) {
+	if (owner_tribe_) {
 		if (upcast(const Ship_Descr, ship, this))
 			return ship->vision_range();
-		return m_owner_tribe->get_bob_vision_range();
+		return owner_tribe_->get_bob_vision_range();
 	}
 
 	return 0;
 }
 
-
-BobDescr::BobDescr
-	(char const * const _name, char const * const _descname,
-	 const std::string & directory, Profile & prof, Section & global_s,
-	 Tribe_Descr const * const tribe)
-	:
-	Map_Object_Descr(_name, _descname),
-	m_owner_tribe(tribe)
-{
-	{ //  global options
-		Section & idle_s = prof.get_safe_section("idle");
-
-		add_animation("idle", g_gr->animations().load(directory, idle_s));
-	}
-
-	// Parse attributes
-	while (Section::Value const * val = global_s.get_next_val("attrib")) {
-		uint32_t const attrib = get_attribute_id(val->get_string());
-
-		if (attrib < Map_Object::HIGHEST_FIXED_ATTRIBUTE)
-			throw game_data_error("bad attribute \"%s\"", val->get_string());
-
-		add_attribute(attrib);
-	}
-}
-
-
 /**
  * Create a bob of this type
  */

=== modified file 'src/logic/bob.h'
--- src/logic/bob.h	2014-05-11 07:38:01 +0000
+++ src/logic/bob.h	2014-06-17 15:48:25 +0000
@@ -29,7 +29,7 @@
 #include "point.h"
 #include "port.h"
 
-struct Profile;
+class Profile;
 
 namespace Widelands {
 class Map;
@@ -55,21 +55,15 @@
 public:
 	friend struct Map_Bobdata_Data_Packet;
 
-	BobDescr(char const* name,
-	      char const* descname,
-	      const std::string& directory,
-	      Profile&,
-	      Section& global_s,
-	      Tribe_Descr const*);
+	BobDescr(const std::string& init_name,
+	         const std::string& init_descname,
+	         Tribe_Descr const* tribe);
 
 	virtual ~BobDescr() {};
 	Bob& create(Editor_Game_Base&, Player* owner, const Coords&) const;
-	bool is_world_bob() const {
-		return not m_owner_tribe;
-	}
 
 	Tribe_Descr const* get_owner_tribe() const {
-		return m_owner_tribe;
+		return owner_tribe_;
 	}
 
 	virtual uint32_t movecaps() const {
@@ -80,7 +74,8 @@
 protected:
 	virtual Bob& create_object() const = 0;
 
-	const Tribe_Descr* const m_owner_tribe;  //  0 if world bob
+private:
+	const Tribe_Descr* const owner_tribe_;  //  nullptr if world bob
 };
 
 /**
@@ -248,7 +243,6 @@
 	void set_position(Editor_Game_Base &, const Coords &);
 	const FCoords & get_position() const {return m_position;}
 	Bob * get_next_bob() const {return m_linknext;}
-	bool is_world_bob() const {return descr().is_world_bob();}
 
 	uint32_t vision_range() const {return descr().vision_range();}
 

=== modified file 'src/logic/buildcost.h'
--- src/logic/buildcost.h	2014-05-11 07:38:01 +0000
+++ src/logic/buildcost.h	2014-06-17 15:48:25 +0000
@@ -26,7 +26,7 @@
 
 class FileRead;
 class FileWrite;
-struct Section;
+class Section;
 
 namespace Widelands {
 

=== modified file 'src/logic/building.h'
--- src/logic/building.h	2014-05-11 07:38:01 +0000
+++ src/logic/building.h	2014-06-17 15:48:25 +0000
@@ -38,7 +38,7 @@
 namespace UI {class Window;}
 struct BuildingHints;
 class Interactive_GameBase;
-struct Profile;
+class Profile;
 class Image;
 
 namespace Widelands {
@@ -160,7 +160,7 @@
 
 class Building : public PlayerImmovable {
 	friend struct Building_Descr;
-	friend struct Map_Buildingdata_Data_Packet;
+	friend class Map_Buildingdata_Data_Packet;
 
 	MO_DESCR(Building_Descr)
 

=== modified file 'src/logic/constructionsite.h'
--- src/logic/constructionsite.h	2014-04-06 10:50:39 +0000
+++ src/logic/constructionsite.h	2014-06-17 15:48:25 +0000
@@ -59,7 +59,7 @@
 };
 
 class ConstructionSite : public Partially_Finished_Building {
-	friend struct Map_Buildingdata_Data_Packet;
+	friend class Map_Buildingdata_Data_Packet;
 
 	static const uint32_t CONSTRUCTIONSITE_STEP_TIME = 30000;
 

=== modified file 'src/logic/critter_bob.cc'
--- src/logic/critter_bob.cc	2014-05-11 07:38:01 +0000
+++ src/logic/critter_bob.cc	2014-06-17 15:48:25 +0000
@@ -21,6 +21,9 @@
 
 #include <cstdio>
 
+#include <stdint.h>
+
+#include "graphic/graphic.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -29,57 +32,67 @@
 #include "logic/game.h"
 #include "logic/game_data_error.h"
 #include "logic/tribe.h"
+#include "logic/world/world.h"
+#include "map_io/one_world_legacy_lookup_table.h"
 #include "profile/profile.h"
+#include "scripting/lua_table.h"
 #include "wexception.h"
 
 
 namespace Widelands {
 
-const Critter_BobProgram::ParseMap Critter_BobProgram::s_parsemap[] = {
-	{"remove",            &Critter_BobProgram::parse_remove},
-	{nullptr,                   nullptr}
-};
-
-
-void Critter_BobProgram::parse(Parser * const parser, char const * const name)
-{
-	Section & program_s = parser->prof->get_safe_section(name);
-
+namespace {
+
+// Parses program lines in a section into a vector of strings.
+std::vector<std::string> section_to_strings(Section* section) {
+	std::vector<std::string> return_value;
 	for (uint32_t idx = 0;; ++idx) {
+		char buffer[32];
+		snprintf(buffer, sizeof(buffer), "%i", idx);
+		char const* const string = section->get_string(buffer, nullptr);
+		if (!string)
+			break;
+		return_value.emplace_back(string);
+	}
+	// Check for line numbering problems
+	if (section->get_num_values() != return_value.size())
+		throw wexception("Line numbers appear to be wrong");
+	return return_value;
+}
+
+// Sets the dir animations in 'anims' with the animations
+// '<prefix>_(ne|e|se|sw|w|nw)' which must be defined in 'mo'.
+void assign_diranimation(DirAnimations* anims, Map_Object_Descr& mo, const std::string& prefix) {
+	static char const* const dirstrings[6] = {"ne", "e", "se", "sw", "w", "nw"};
+	for (int32_t dir = 1; dir <= 6; ++dir) {
+		anims->set_animation(dir, mo.get_animation(prefix + std::string("_") + dirstrings[dir - 1]));
+	}
+}
+
+}  // namespace
+
+void Critter_BobProgram::parse(const std::vector<std::string>& lines) {
+	for (const std::string& line : lines) {
 		try {
-			char buffer[32];
-
-			snprintf(buffer, sizeof(buffer), "%i", idx);
-			char const * const string = program_s.get_string(buffer, nullptr);
-			if (!string)
-				break;
-
-			const std::vector<std::string> cmd(split_string(string, " \t\r\n"));
+			const std::vector<std::string> cmd(split_string(line, " \t\r\n"));
 			if (cmd.empty())
 				continue;
 
-			//  find the appropriate parser
 			Critter_BobAction act;
-			uint32_t mapidx;
-
-			for (mapidx = 0; s_parsemap[mapidx].name; ++mapidx)
-				if (cmd[0] == s_parsemap[mapidx].name)
-					break;
-
-			if (!s_parsemap[mapidx].name)
+			if (cmd[0] == "remove") {
+				if (cmd.size() != 1)
+					throw wexception("Usage: remove");
+				act.function = &Critter_Bob::run_remove;
+			} else {
 				throw wexception("unknown command type \"%s\"", cmd[0].c_str());
-
-			(this->*s_parsemap[mapidx].function)(&act, parser, cmd);
+			}
 
 			m_actions.push_back(act);
-		} catch (const std::exception & e) {
-			throw wexception("Line %i: %s", idx, e.what());
+		}
+		catch (const std::exception& e) {
+			throw wexception("Line '%s': %s", line.c_str(), e.what());
 		}
 	}
-
-	// Check for line numbering problems
-	if (program_s.get_num_values() != m_actions.size())
-		throw wexception("Line numbers appear to be wrong");
 }
 
 /*
@@ -99,15 +112,6 @@
 
 ==============================
 */
-void Critter_BobProgram::parse_remove
-	(Critter_BobAction * act, Parser *, const std::vector<std::string> & cmd)
-{
-	if (cmd.size() != 1)
-		throw wexception("Usage: remove");
-
-	act->function = &Critter_Bob::run_remove;
-}
-
 bool Critter_Bob::run_remove
 	(Game & game, State & state, const Critter_BobAction &)
 {
@@ -126,14 +130,27 @@
 ===========================================================================
 */
 
-Critter_Bob_Descr::Critter_Bob_Descr
-	(char const * const _name, char const * const _descname,
-	 const std::string & directory, Profile & prof, Section & global_s,
-	 Tribe_Descr const * const _tribe)
-	:
-	BobDescr(_name, _descname, directory, prof, global_s, _tribe),
-	m_swimming(global_s.get_bool("swimming", false))
-{
+Critter_Bob_Descr::Critter_Bob_Descr(char const* const _name,
+                                     char const* const _descname,
+                                     const std::string& directory,
+                                     Profile& prof,
+                                     Section& global_s,
+                                     Tribe_Descr const* const _tribe)
+   : BobDescr(_name, _descname, _tribe) {
+	{ //  global options
+		Section & idle_s = prof.get_safe_section("idle");
+		add_animation("idle", g_gr->animations().load(directory, idle_s));
+	}
+
+	// Parse attributes
+	{
+		std::vector<std::string> attributes;
+		while (Section::Value const* val = global_s.get_next_val("attrib")) {
+			attributes.emplace_back(val->get_string());
+		}
+		add_attributes(attributes, std::set<uint32_t>());
+	}
+
 	char defaultpics[256];
 	snprintf(defaultpics, sizeof(defaultpics), "%s_walk_!!_??.png", _name);
 	m_walk_anims.parse(*this, directory, prof, "walk", false, defaultpics);
@@ -147,14 +164,10 @@
 		try {
 			if (m_programs.count(program_name))
 				throw wexception("this program has already been declared");
-			Critter_BobProgram::Parser parser;
-
-			parser.descr = this;
-			parser.directory = directory;
-			parser.prof = &prof;