[Adonthell-commits] CVS: wastesedge/scripts Makefile.am,1.4,1.5 init.py,1.87,1.88

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge/scripts
In directory subversions:/tmp/cvs-serv1954/scripts

Modified Files:
        Makefile.am init.py 
Log Message:
UPDATE to 0.3.2pre


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.am 6 Dec 2001 12:16:34 -0000       1.4
--- Makefile.am 6 May 2002 13:47:17 -0000       1.5
***************
*** 1,3 ****
! SUBDIRS = dialogues events modules schedules actions
  
  pkgdatadir = $(gamedatadir)/scripts
--- 1,3 ----
! SUBDIRS = dialogues game_events modules schedules actions
  
  pkgdatadir = $(gamedatadir)/scripts

Index: init.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/init.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** init.py     5 Feb 2002 15:09:21 -0000       1.87
--- init.py     6 May 2002 13:47:17 -0000       1.88
***************
*** 13,19 ****
  #
  
! 
! from adonthell import *
! from main_menu import *
  import time
  
--- 13,18 ----
  #
  
! import adonthell
! import main_menu
  import time
  
***************
*** 21,44 ****
      def __init__ (self):
          # -- load our music
!         audio_load_background (0, "audio/at-demo-1.ogg")
!         audio_load_wave (0, "audio/select.wav")
!         audio_load_wave (1, "audio/switch.wav")
!         audio_load_wave (2, "audio/unselect.wav")
  
          # -- The themes and fonts we'll use
!         win_manager_add_theme ("original")
!         win_manager_add_theme ("silverleaf")
  
!         win_manager_add_font ("yellow")
!         win_manager_add_font ("red")
!         win_manager_add_font ("violet")
!         win_manager_add_font ("blue")
!         win_manager_add_font ("green")
!         win_manager_add_font ("white")
!         win_manager_add_font ("original")
!         win_manager_add_font ("silverleaf")
  
          # -- load our images
!         self.bag_o = win_image ()
          self.bag_o.load_raw ("gfx/cutscene/jewelbag_open.img")
          self.bag_o.set_alpha (0)
--- 20,43 ----
      def __init__ (self):
          # -- load our music
!         adonthell.audio_load_background (0, "audio/at-demo-1.ogg")
!         adonthell.audio_load_wave (0, "audio/select.wav")
!         adonthell.audio_load_wave (1, "audio/switch.wav")
!         adonthell.audio_load_wave (2, "audio/unselect.wav")
  
          # -- The themes and fonts we'll use
!         adonthell.win_manager_add_theme ("original")
!         adonthell.win_manager_add_theme ("silverleaf")
  
!         adonthell.win_manager_add_font ("yellow")
!         adonthell.win_manager_add_font ("red")
!         adonthell.win_manager_add_font ("violet")
!         adonthell.win_manager_add_font ("blue")
!         adonthell.win_manager_add_font ("green")
!         adonthell.win_manager_add_font ("white")
!         adonthell.win_manager_add_font ("original")
!         adonthell.win_manager_add_font ("silverleaf")
  
          # -- load our images
!         self.bag_o = adonthell.win_image ()
          self.bag_o.load_raw ("gfx/cutscene/jewelbag_open.img")
          self.bag_o.set_alpha (0)
***************
*** 47,51 ****
          self.bag_o.set_visible (0)
  
!         self.bag_c = win_image ()
          self.bag_c.load_raw ("gfx/cutscene/jewelbag_closed.img")
          self.bag_c.set_visible (1)
--- 46,50 ----
          self.bag_o.set_visible (0)
  
!         self.bag_c = adonthell.win_image ()
          self.bag_c.load_raw ("gfx/cutscene/jewelbag_closed.img")
          self.bag_c.set_visible (1)
***************
*** 54,58 ****
          self.bag_c.pack ()
  
!         self.bag_t = win_image ()
          self.bag_t.load_raw ("gfx/cutscene/adonthell_03.img")
          self.bag_t.move (33, 86)
--- 53,57 ----
          self.bag_c.pack ()
  
!         self.bag_t = adonthell.win_image ()
          self.bag_t.load_raw ("gfx/cutscene/adonthell_03.img")
          self.bag_t.move (33, 86)
***************
*** 61,65 ****
  
          # -- create the window
!         self.window = win_container ()
          self.window.move (0, 0)
          self.window.resize (320, 240)
--- 60,64 ----
  
          # -- create the window
!         self.window = adonthell.win_container ()
          self.window.move (0, 0)
          self.window.resize (320, 240)
***************
*** 74,79 ****
          self.window.set_visible (1)
  
!         self.window.py_signal_connect (self.on_update, win_event_UPDATE)
!         self.window.py_signal_connect (self.on_draw, win_event_DRAW)
  
          self.draw_func = self.initial_fade_in
--- 73,78 ----
          self.window.set_visible (1)
  
!         self.window.py_signal_connect (self.on_update, 
adonthell.win_event_UPDATE)
!         self.window.py_signal_connect (self.on_draw, adonthell.win_event_DRAW)
  
          self.draw_func = self.initial_fade_in
***************
*** 81,94 ****
          self.alpha = 0
  
!         audio_play_background (0)
  
          # -- launch the engine
!         gametime_start_action ()
!         gamedata_engine ().main (self.window, "title_sequence")
  
  
      def __del__ (self):
          print "Destructor called"
!         gamedata_engine ().main_quit ()
  
      # -- catch ESC key
--- 80,93 ----
          self.alpha = 0
  
!         adonthell.audio_play_background (0)
  
          # -- launch the engine
!         adonthell.gametime_start_action ()
!         adonthell.gamedata_engine ().main (self.window, "title_sequence")
  
  
      def __del__ (self):
          print "Destructor called"
!         adonthell.gamedata_engine ().main_quit ()
  
      # -- catch ESC key
***************
*** 96,101 ****
          if self.draw_func != None:
              # -- Skip intro sequence
!             if input_has_been_pushed (SDLK_ESCAPE):
!                 audio_fade_out_background (500)
                  self.bag_t.set_visible (0)
                  self.bag_c.set_visible (0)
--- 95,100 ----
          if self.draw_func != None:
              # -- Skip intro sequence
!             if adonthell.input_has_been_pushed (adonthell.SDLK_ESCAPE):
!                 adonthell.audio_fade_out_background (500)
                  self.bag_t.set_visible (0)
                  self.bag_c.set_visible (0)
***************
*** 123,127 ****
          else:
              # -- fade in
!             self.alpha = self.alpha + gametime_frames_to_skip() + 1
              if self.alpha > 255: self.alpha = 255
              self.bag_c.set_alpha (self.alpha)
--- 122,126 ----
          else:
              # -- fade in
!             self.alpha = self.alpha + adonthell.gametime_frames_to_skip() + 1
              if self.alpha > 255: self.alpha = 255
              self.bag_c.set_alpha (self.alpha)
***************
*** 153,157 ****
          else:
              # -- fade in
!             self.alpha = self.alpha + gametime_frames_to_skip()
              if self.alpha > 255: self.alpha = 255
              self.bag_o.set_alpha (self.alpha)
--- 152,156 ----
          else:
              # -- fade in
!             self.alpha = self.alpha + adonthell.gametime_frames_to_skip()
              if self.alpha > 255: self.alpha = 255
              self.bag_o.set_alpha (self.alpha)
***************
*** 159,166 ****
      # -- Show the main menu
      def show_menu (self, a, b):
!         menu = main_menu (a, b)
          
          # -- open the menu
!         gamedata_engine ().main (menu, "game_menu")
          
          # -- once the menu is closed, see what we got
--- 158,165 ----
      # -- Show the main menu
      def show_menu (self, a, b):
!         menu = main_menu.main_menu (a, b)
          
          # -- open the menu
!         adonthell.gamedata_engine ().main (menu, "game_menu")
          
          # -- once the menu is closed, see what we got
***************
*** 170,182 ****
          if retval == 1:
              # -- let the player chose a name for his character
!             from character_screen import *
!             cs = character_screen ()
!             gamedata_engine ().main (cs, "character_screen")
!                 
!             gamedata_engine ().fade_out ()
              self.cleanup ()
  
              # -- load the initial game
!             gamedata_load (0)
              adonthell.gamedata_player ().set_name (cs.name)
              
--- 169,181 ----
          if retval == 1:
              # -- let the player chose a name for his character
!             import character_screen
!             cs = character_screen.character_screen ()
!             adonthell.gamedata_engine ().main (cs, "character_screen")
! 
!             adonthell.gamedata_engine ().fade_out ()
              self.cleanup ()
  
              # -- load the initial game
!             adonthell.gamedata_load (0)
              adonthell.gamedata_player ().set_name (cs.name)
              
***************
*** 188,202 ****
              self.window.set_visible (0)
              self.cleanup ()
!             gamedata_engine ().mapview_start ()
!             gamedata_engine ().set_control_active (1)
!             gamedata_engine ().fade_in ()
  
          # -- quit the game
          else:
!             gamedata_engine ().main_quit ()
  
      # -- cleanup
      def cleanup (self):
!         win_manager_get_active ().remove (self.window)
  
          self.window.remove (self.bag_o)
--- 187,201 ----
              self.window.set_visible (0)
              self.cleanup ()
!             adonthell.gamedata_engine ().mapview_start ()
!             adonthell.gamedata_engine ().set_control_active (1)
!             adonthell.gamedata_engine ().fade_in ()
  
          # -- quit the game
          else:
!             adonthell.gamedata_engine ().main_quit ()
  
      # -- cleanup
      def cleanup (self):
!         adonthell.win_manager_get_active ().remove (self.window)
  
          self.window.remove (self.bag_o)
***************
*** 208,223 ****
          del self.bag_t
  
!         audio_fade_out_background (500)
!         audio_unload_background (0)
  
  
      def play_intro (self):
          # -- Launches the intro
          import intro
!         
          # -- start the mapengine
!         gamedata_engine ().mapview_start ()
!         gametime_update ()
!         gamedata_engine ().fade_in ()
  
  # -- Main --
--- 207,223 ----
          del self.bag_t
  
!         adonthell.audio_fade_out_background (500)
!         adonthell.audio_unload_background (0)
  
  
      def play_intro (self):
          # -- Launches the intro
+ 
          import intro
! 
          # -- start the mapengine
!         adonthell.gamedata_engine ().mapview_start ()
!         adonthell.gametime_update ()
!         adonthell.gamedata_engine ().fade_in ()
  
  # -- Main --