Fixed #include conditionals, started drawing dungeon