Minor
Merge pull request #967 from WibbenZ/patch-15

Minor
Fix bugs with combat distanceEffect
Game.loadMap no longer loads houses

Fixes #968
Change loadMainMap to return bool
Remove inaccurate comment
Fix #964
Add name to the error message

A really annoying thing, this will help with the "error message ... nil, nil." message.
Merge pull request #970 from WibbenZ/patch-16

Add name to the error message