diff options
| author | coolestdude1 <arielzamparini@gmail.com> | 2010-02-18 04:22:13 (GMT) |
|---|---|---|
| committer | coolestdude1 <arielzamparini@gmail.com> | 2010-02-18 04:22:13 (GMT) |
| commit | eabcf89c6e117781d6e834a9dbeae7102e1ca953 (patch) | |
| tree | 73b97e7e8f17057a15e4473cf027beb725d737a9 | |
| parent | 28a9ca5769460a9aa374ad768b00e073476236c7 (diff) | |
recloning the repo back to my box
| -rw-r--r-- | blocku.py | 19 | ||||
| -rw-r--r-- | data/Blocku_Icon.gif | bin | 29745 -> 0 bytes | |||
| -rw-r--r-- | data/Thumbs.db | bin | 9728 -> 8704 bytes | |||
| -rw-r--r-- | data/background.bmp | bin | 308276 -> 0 bytes | |||
| -rw-r--r-- | data/background.gif | bin | 4771 -> 0 bytes | |||
| -rw-r--r-- | data/background.png | bin | 0 -> 3835 bytes | |||
| -rw-r--r-- | data/block.bmp | bin | 12344 -> 0 bytes | |||
| -rw-r--r-- | data/block.png | bin | 0 -> 481 bytes | |||
| -rw-r--r-- | data/blocku.png | bin | 0 -> 23629 bytes |
9 files changed, 10 insertions, 9 deletions
@@ -2,7 +2,9 @@ import pygame, random, os.path from pygame.locals import * from pygame import * -#import gtk + +try: import gtk +except ImportError: gtk = None #see if we can load more than standard BMP if not pygame.image.get_extended(): @@ -104,11 +106,10 @@ class Game: # for gifs img = load_image('filename.gif') # for bmps img = pygame.image.load('filename.bmp') but our function handles that for us # a note for graphics blit means copy pixels from screen.blit() - iconImg = load_image('Blocku_Icon.gif') - #background = load_image('background.gif') - background = load_image('background.bmp') + iconImg = load_image('blocku.png') + background = load_image('background.png') # load images to pipe to the sprite classes - blockImg = load_image('block.bmp') + blockImg = load_image('block.png') Block.images = [blockImg] # the test will need rects and positions i sugest make some kind of default # this information can be held by each block as they are created but is made here @@ -148,8 +149,8 @@ class Game: while self.running: # Pump GTK messages. - #while gtk.events_pending(): - # gtk.main_iteration() + while gtk and gtk.events_pending(): + gtk.main_iteration() # Pump PyGame messages. for event in pygame.event.get(): @@ -197,7 +198,7 @@ class Text(pygame.sprite.Sprite): self.text = text def update(self): - msg = 'Drawing call test' + msg = '' # 'Drawing call test' self.image = self.font.render(msg, 0, self.color) class mouseUpdate(pygame.sprite.Sprite): @@ -210,7 +211,7 @@ class mouseUpdate(pygame.sprite.Sprite): self.rect = self.image.get_rect().move(50, 220) def update(self): - msg = 'Mouse Position %s, %s' % mouse.get_pos() + msg = '' # 'Mouse Position %s, %s' % mouse.get_pos() self.image = self.font.render(msg, 0, self.color) # This function is called when the game is run directly from the command line: diff --git a/data/Blocku_Icon.gif b/data/Blocku_Icon.gif Binary files differdeleted file mode 100644 index 78b3d10..0000000 --- a/data/Blocku_Icon.gif +++ /dev/null diff --git a/data/Thumbs.db b/data/Thumbs.db Binary files differindex b970d34..90215a3 100644 --- a/data/Thumbs.db +++ b/data/Thumbs.db diff --git a/data/background.bmp b/data/background.bmp Binary files differdeleted file mode 100644 index bcfd894..0000000 --- a/data/background.bmp +++ /dev/null diff --git a/data/background.gif b/data/background.gif Binary files differdeleted file mode 100644 index e2c51f9..0000000 --- a/data/background.gif +++ /dev/null diff --git a/data/background.png b/data/background.png Binary files differnew file mode 100644 index 0000000..ea0c732 --- /dev/null +++ b/data/background.png diff --git a/data/block.bmp b/data/block.bmp Binary files differdeleted file mode 100644 index 5c49a22..0000000 --- a/data/block.bmp +++ /dev/null diff --git a/data/block.png b/data/block.png Binary files differnew file mode 100644 index 0000000..d0c7b96 --- /dev/null +++ b/data/block.png diff --git a/data/blocku.png b/data/blocku.png Binary files differnew file mode 100644 index 0000000..119d75e --- /dev/null +++ b/data/blocku.png |
