diff --git a/starmap_gen.py b/starmap_gen.py index 1b97e97..cf24b44 100644 --- a/starmap_gen.py +++ b/starmap_gen.py @@ -15,7 +15,7 @@ class PercentArray(object): self.array = {} def __setitem__(self, key, value): - if not self.array.has_key(key): + if not key in self.array: self.order += [key] self.array[key] = value diff --git a/vssg.py b/vssg.py index d7fd1a9..6b46c76 100755 --- a/vssg.py +++ b/vssg.py @@ -9,8 +9,8 @@ import random import starmap import starmap_gen import gametimer -from ocempgui.widgets import * -from ocempgui.widgets.Constants import * +#from ocempgui.widgets import * +#from ocempgui.widgets.Constants import * import video @@ -187,7 +187,8 @@ def screen_options(): return re -guiscreen = screen_mainmenu() +guiscreen = None +map = starmap_gen.starmap_generate() gametimer.start_loop() while True: