Fix issue #318 combat text wrong location
Avoid div by 0 on random currency loot
Merge pull request #320 from hean01/bugfixes

Fixes compiler warnings about shadowing global declaration of screen.
Merge remote-tracking branch 'upstream/master' into bugfixes

Conflicts:
	src/CombatText.cpp