Enemies won't spawn when returning to old floors

also cleaned up code
Merge pull request #73 from duiker2/master

Enemies won't spawn when returning to old floors