Added missing Draw functions to Trap, Wall and Water