namespace map script imports, revert renaming

piqueserver · Dec 21, 2017 · 7d9750f · 7d9750f
1 parent 9abb9f4
commit 7d9750f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/piqueserver/config/config.json b/piqueserver/config/config.json
@@ -33,7 +33,7 @@
     "cap_limit" : 10,
     "default_time_limit" : 120,
     "advance_on_win" : true,
-    "maps" : ["classicgen", "landscapegen"],
+    "maps" : ["classicgen", "random"],
     "random_rotation" : false,
 
     "respawn_time" : 16,

diff --git a/piqueserver/config/maps/landscapegen.txt → piqueserver/config/maps/random.txt b/piqueserver/config/maps/landscapegen.txt → piqueserver/config/maps/random.txt
diff --git a/piqueserver/map.py b/piqueserver/map.py
@@ -72,7 +72,7 @@ def load_information(self, rot_info, load_dir):
         self.load_dir = load_dir
         try:
             info = imp.load_source(
-                rot_info.name, rot_info.get_meta_filename(load_dir))
+                'piqueserver_internal_map_' + rot_info.name, rot_info.get_meta_filename(load_dir))
         except IOError:
             info = None
         self.info = info