fixed random flags bug
Merge branch 'dd_cb_triggertiles' into dd_fb_teleporter

Conflicts:
	src/game/collision.cpp