AVALANCHE: Rename room number constans. Repair Lucerna::enterRoom().
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche

Conflicts:
	engines/avalanche/lucerna.cpp
	engines/avalanche/timer.cpp