[Childsplay-cvs] CP-main README,1.6,1.7 childsplay.py,1.72,1.73 splash.py,1.9,1.10 version.py,1.34,1.35

[Stas Z. <sta...@us...>]

Update of /cvsroot/childsplay/CP-main
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10144

Modified Files:
	README childsplay.py splash.py version.py 
Log Message:
changed splasscreen



Index: README
===================================================================
RCS file: /cvsroot/childsplay/CP-main/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README	13 Nov 2005 18:42:49 -0000	1.6
--- README	15 May 2006 09:26:38 -0000	1.7
***************
*** 35,42 ****
      support.
  
- WARNING,
- 
- It's still beta, but the games are working.
- 
  Download and installing Childsplay:
  
--- 35,38 ----

Index: version.py
===================================================================
RCS file: /cvsroot/childsplay/CP-main/version.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** version.py	23 Apr 2006 17:37:02 -0000	1.34
--- version.py	15 May 2006 09:26:39 -0000	1.35
***************
*** 4,6 ****
  # This one is used by the make tarball script
  # and is also returned by 'childsplay --version'
! version='0.81.8'
--- 4,6 ----
  # This one is used by the make tarball script
  # and is also returned by 'childsplay --version'
! version='0.82'

Index: childsplay.py
===================================================================
RCS file: /cvsroot/childsplay/CP-main/childsplay.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** childsplay.py	9 Apr 2006 08:54:20 -0000	1.72
--- childsplay.py	15 May 2006 09:26:39 -0000	1.73
***************
*** 547,551 ****
                         
          ## Set icon for the window manager ##    
!         file = os.path.join(DATADIR,'chpl-icon-48.xpm')
          try:
              surface = pygame.image.load(file)
--- 547,551 ----
                         
          ## Set icon for the window manager ##    
!         file = os.path.join(DATADIR,'logo_cp_32x32.xpm')
          try:
              surface = pygame.image.load(file)
***************
*** 923,927 ****
      Snd.galaga = load_sound(os.path.join(DATADIR,'Galaga1.ogg'))
      Snd.dub = load_sound(os.path.join(DATADIR,'dub.ogg'))
!     music_collection = [Snd.music1,Snd.galaga,Snd.dub]
      #modul = 'Menu'
      screendim = Dimmer(keepalive=1) # dimmer is used for screen copying
--- 923,928 ----
      Snd.galaga = load_sound(os.path.join(DATADIR,'Galaga1.ogg'))
      Snd.dub = load_sound(os.path.join(DATADIR,'dub.ogg'))
!     Snd.thanks = load_sound(os.path.join(DATADIR,'thanks.ogg'))
!     music_collection = [Snd.music1,Snd.galaga,Snd.dub,Snd.thanks]
      #modul = 'Menu'
      screendim = Dimmer(keepalive=1) # dimmer is used for screen copying

Index: splash.py
===================================================================
RCS file: /cvsroot/childsplay/CP-main/splash.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** splash.py	26 Feb 2006 10:13:26 -0000	1.9
--- splash.py	15 May 2006 09:26:39 -0000	1.10
***************
*** 34,40 ****
        This runs in a seperate thread at the timeout"""
      
!     T = 4000
      try:
!         snd = load_music(os.path.join(DATADIR,'cows.ogg'))
          snd.play(-1)
      except pygame.error,info:
--- 34,40 ----
        This runs in a seperate thread at the timeout"""
      
!     T = 5000
      try:
!         snd = load_music(os.path.join(DATADIR,'electric.ogg'))
          snd.play(-1)
      except pygame.error,info:
***************
*** 44,48 ****
  ##        load = load_image(os.path.join(DATADIR,'cowsplash-load.png'))
  ##        pygame.display.update((scr.blit(cow,(300,100)),scr.blit(load,(40,20))))
!         cow = load_image(os.path.join(DATADIR,'cow_loading_splash.jpg'))
          pygame.display.update(scr.blit(cow,(0,0)))
      except (Exception,pygame.error),info:
--- 44,48 ----
  ##        load = load_image(os.path.join(DATADIR,'cowsplash-load.png'))
  ##        pygame.display.update((scr.blit(cow,(300,100)),scr.blit(load,(40,20))))
!         cow = load_image(os.path.join(DATADIR,'loading_splash.jpg'))
          pygame.display.update(scr.blit(cow,(0,0)))
      except (Exception,pygame.error),info: