Removes 'flat' from config and move to globals.

globals.py

@@ -27,6 +27,8 @@
 GAME_MODE_CHOICES = (SURVIVAL_MODE, CREATIVE_MODE)
 GAME_MODE = CREATIVE_MODE
 
+FLAT_MODE = False
+
 
 #
 # User input

main.py

@@ -78,9 +78,9 @@ def initialize_config():
 
     world = 'World'
 
-    get_or_update_config(world, 'flat', False, conv=bool)  # dont make mountains, make a flat world
     get_or_update_config(world, 'size', 64, conv=int)
-    globals.SHOW_FOG = get_or_update_config(world, 'show_fog', True, conv=bool)
+    globals.SHOW_FOG = get_or_update_config(
+        world, 'show_fog', globals.SHOW_FOG, conv=bool)
 
     # Adds missing keys to configuration file and converts to pyglet keys.
     for control, default_key_name in globals.KEY_BINDINGS.items():
@@ -157,8 +157,7 @@ def main(options):
     globals.TERRAIN_CHOICE = options.terrain
     globals.TERRAIN = globals.TERRAIN_CHOICES[options.terrain]
 
-    if options.flat:
-        get_or_update_config('World', 'flat', 'true')
+    globals.FLAT_MODE = options.flat
 
     if options.fast:
         globals.TIME_RATE /= 20

model.py

@@ -33,7 +33,6 @@ def initialize(self):
         world_size = globals.config.getint('World', 'size')
         world_type = globals.TERRAIN_CHOICE  # FIXME: Unify names!
         hill_height = globals.TERRAIN['hill_height']
-        flat_world = globals.config.getboolean('World', 'flat')
         self.max_trees = globals.TERRAIN['max_trees']
         tree_chance = self.max_trees / float(world_size *
                                              (globals.SECTOR_SIZE ** 3))
@@ -97,7 +96,7 @@ def initialize(self):
                             tree_class = random.choice(tree_class)
                         self.generate_tree((x, y - 2, z), tree_class)
 
-        if flat_world:
+        if globals.FLAT_MODE:
             return
 
         o = n - 10 + hill_height - 6