Merge pull request #256 from yenatch/master

Fix predefs and battle code.
Merge pull request #257 from yenatch/map-headers

Map header macros and misc comments
Merge pull request #258 from yenatch/spawns

Use macros for spawns and flypoints.
Merge remote-tracking branch 'kanzure/master' into cries