window_research_development_paint() crash fix

When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
Merge pull request #345 from zsilencer/master

window_research_development_paint() crash fix
window_research_development_paint() ride names fix

stringId from typeId was not working right, this fixes it and gives
correct research ride names
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master

Conflicts:
	src/window_research.c
Merge branch 'zsilencer-master'
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2