Merge branch 'duncanspumpkin-master'
Cleaning up small shared functions

Cleaning up small shared functions and moving them to appropriate files
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
Merge branch 'MaciekBaron-master'