fixed minor bug

Conflicts:
	res/map.txt