--- solarwolf-1.5.old/code/gamenews.py +++ solarwolf-1.5/code/gamenews.py @@ -109,9 +109,6 @@ #self.download_start() def quit(self): - if self.tempwindowed: - game.display = 1 - gfx.switchfullscreen() game.handler = self.prevhandler self.done = 1 @@ -380,9 +377,5 @@ self.download_start() def do_visit(self): #Visit Website - if game.display: #fullscreen - self.tempwindowed = 1 - game.display = 0 - gfx.switchfullscreen() self.launchthebrowser = 2 #funny windows workaround --- solarwolf-1.5.old/code/gamepref.py +++ solarwolf-1.5/code/gamepref.py @@ -12,7 +12,6 @@ Prefs = { "music": ("Off", "Low", "Normal"), "volume": ("Off", "Low", "Normal"), -"display": ("Window", "Fullscreen"), "comments": ("None", "Some", "Chatty"), "help": ("Full Screens", "Quick Comments"), "thruster": ("Normal", "Inverted"), @@ -253,4 +252,4 @@ snd.tweakmusicvolume() def do_display(self): - gfx.switchfullscreen() + return --- solarwolf-1.5.old/code/gfx.py +++ solarwolf-1.5/code/gfx.py @@ -17,12 +17,10 @@ wantscreentoggle = 0 -def initialize(size, fullscreen): +def initialize(size): global surface, rect, starobj try: flags = 0 - if fullscreen: - flags |= FULLSCREEN #depth = pygame.display.mode_ok(size, flags, 16) surface = pygame.display.set_mode(size, flags)#, depth) rect = surface.get_rect() @@ -36,21 +34,9 @@ raise pygame.error, 'Cannot Initialize Graphics' starobj = stars.Stars() - -def switchfullscreen(): - oldfull = surface.get_flags() & FULLSCREEN == FULLSCREEN - newfull = game.display == 1 - if newfull == oldfull: - return - global wantscreentoggle - wantscreentoggle = 1 - - - def dirty(rect): dirtyrects.append(rect) - def dirty2(rect1, rect2): if not rect2: dirtyrects.append(rect1) --- solarwolf-1.5.old/code/main.py +++ solarwolf-1.5/code/main.py @@ -31,10 +31,7 @@ gamepref.load_prefs() size = 800, 600 - full = game.display - if '-window' in args: - full = 0 - gfx.initialize(size, full) + gfx.initialize (size) pygame.display.set_caption('SolarWolf') if not '-nosound' in args: @@ -87,8 +84,6 @@ continue if event.type == pygame.KEYDOWN and event.key == pygame.K_RETURN: if event.mod&pygame.KMOD_ALT: - game.display = not game.display - gfx.switchfullscreen() continue inputevent = input.translate(event) if inputevent.normalized != None: