fixed some warnings
merged room_gen.lua