changeset 1:4c7bb645fd75

Data separated into image and sound files committer: Jeff Sipek <jeffpc@jeff.(none)> 1120698247 -0400
author Jeff Sipek <jeffpc@jeff.(none)>
date Thu, 07 Jul 2005 01:04:07 -0400
parents 919a9eff76a3
children 3e6d2f57b5bf
files atc.py atc_message.py atc_plane.py atc_utils.py data/image/background.png data/image/background.xcf data/image/menu_multi.png data/image/menu_quit.png data/image/menu_single.png data/image/plane.png data/image/splash.png data/sound/lbeep.wav data/sound/nosnd.wav data/sound/sbeep.wav
diffstat 14 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/atc.py	Thu Jul 07 01:00:05 2005 +0000
+++ b/atc.py	Thu Jul 07 01:04:07 2005 -0400
@@ -23,7 +23,7 @@
 	
 	# background music
 	pygame.mixer.init()
-	#pygame.mixer.music.load('data/music.mp3')
+	#pygame.mixer.music.load('data/sound/music.mp3')
 	#pygame.mixer.music.set_volume(0.1)
 	#pygame.mixer.music.play()
 
@@ -31,7 +31,7 @@
 	background = pygame.Surface(screen.get_size()).convert()
 	background.fill(atc_colors.black)
 	
-	(back_image, back_rect) = atc_utils.load_png('background.png')
+	(back_image, back_rect) = atc_utils.load_png('data/image/background.png')
 	background.blit(back_image, (0, 0))
 
 	# Some text
--- a/atc_message.py	Thu Jul 07 01:00:05 2005 +0000
+++ b/atc_message.py	Thu Jul 07 01:04:07 2005 -0400
@@ -6,11 +6,11 @@
 	def __init__(self):
 		""" Set up everything """
 		self.snd = {}
-		self.snd["."] = pygame.mixer.Sound('data/sbeep.wav')
+		self.snd["."] = pygame.mixer.Sound('data/sound/sbeep.wav')
 		self.snd["."].set_volume(0.4)
-		self.snd["-"] = pygame.mixer.Sound('data/lbeep.wav')
+		self.snd["-"] = pygame.mixer.Sound('data/sound/lbeep.wav')
 		self.snd["-"].set_volume(0.4)
-		self.snd[" "] = pygame.mixer.Sound('data/nosnd.wav')
+		self.snd[" "] = pygame.mixer.Sound('data/sound/nosnd.wav')
 		self.snd[" "].set_volume(0.4)
 		
 		self.delay = {}
@@ -98,4 +98,4 @@
 				pass
 			
 			pygame.time.delay(100)
-		
\ No newline at end of file
+		
--- a/atc_plane.py	Thu Jul 07 01:00:05 2005 +0000
+++ b/atc_plane.py	Thu Jul 07 01:04:07 2005 -0400
@@ -38,7 +38,7 @@
 		self.area = screen.get_rect()
 		
 		# plane image
-		(self.image, self.rect) = atc_utils.load_png('plane.png')
+		(self.image, self.rect) = atc_utils.load_png('data/image/plane.png')
 		
 		# call sign
 		self.callsign	= callsign
--- a/atc_utils.py	Thu Jul 07 01:00:05 2005 +0000
+++ b/atc_utils.py	Thu Jul 07 01:04:07 2005 -0400
@@ -4,7 +4,7 @@
 
 def load_png(name):
 	""" Load image and return image object"""
-	fullname = os.path.join('data', name)
+	fullname = os.path.join('', name)
 	try:
 		image = pygame.image.load(fullname)
 		if image.get_alpha() is None:
Binary file data/image/background.png has changed
Binary file data/image/background.xcf has changed
Binary file data/image/menu_multi.png has changed
Binary file data/image/menu_quit.png has changed
Binary file data/image/menu_single.png has changed
Binary file data/image/plane.png has changed
Binary file data/image/splash.png has changed
Binary file data/sound/lbeep.wav has changed
Binary file data/sound/nosnd.wav has changed
Binary file data/sound/sbeep.wav has changed