Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran Rogers <fran@dumetella.net>2010-02-11 23:27:12 (GMT)
committer Fran Rogers <fran@dumetella.net>2010-02-11 23:27:12 (GMT)
commit6800d2cda6c657dfa910fd48b522bcb7c0dfcd5b (patch)
treef13cce789bd6bab26a96140fb4272a77ba40b38b
parent8e127bb952032be1a891b61eb0d5d3f65e30cc61 (diff)
Convert from GIF to unencumbered PNG; remove Thumbs.db
-rw-r--r--blocku.py12
-rw-r--r--data/Blocku_Icon.gifbin29745 -> 0 bytes
-rw-r--r--data/Thumbs.dbbin9728 -> 0 bytes
-rw-r--r--data/background.bmpbin308276 -> 0 bytes
-rw-r--r--data/background.gifbin4771 -> 0 bytes
-rw-r--r--data/background.pngbin0 -> 3835 bytes
-rw-r--r--data/block.bmpbin12344 -> 0 bytes
-rw-r--r--data/block.pngbin0 -> 481 bytes
-rw-r--r--data/blocku.pngbin0 -> 23629 bytes
9 files changed, 5 insertions, 7 deletions
diff --git a/blocku.py b/blocku.py
index 40f4830..67bb2f2 100644
--- a/blocku.py
+++ b/blocku.py
@@ -3,7 +3,6 @@ import pygame, random, os.path
from pygame.locals import *
from pygame import *
-
try: import gtk
except ImportError: gtk = None
@@ -107,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
@@ -200,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):
@@ -213,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
deleted file mode 100644
index 78b3d10..0000000
--- a/data/Blocku_Icon.gif
+++ /dev/null
Binary files differ
diff --git a/data/Thumbs.db b/data/Thumbs.db
deleted file mode 100644
index b970d34..0000000
--- a/data/Thumbs.db
+++ /dev/null
Binary files differ
diff --git a/data/background.bmp b/data/background.bmp
deleted file mode 100644
index bcfd894..0000000
--- a/data/background.bmp
+++ /dev/null
Binary files differ
diff --git a/data/background.gif b/data/background.gif
deleted file mode 100644
index e2c51f9..0000000
--- a/data/background.gif
+++ /dev/null
Binary files differ
diff --git a/data/background.png b/data/background.png
new file mode 100644
index 0000000..ea0c732
--- /dev/null
+++ b/data/background.png
Binary files differ
diff --git a/data/block.bmp b/data/block.bmp
deleted file mode 100644
index 5c49a22..0000000
--- a/data/block.bmp
+++ /dev/null
Binary files differ
diff --git a/data/block.png b/data/block.png
new file mode 100644
index 0000000..d0c7b96
--- /dev/null
+++ b/data/block.png
Binary files differ
diff --git a/data/blocku.png b/data/blocku.png
new file mode 100644
index 0000000..119d75e
--- /dev/null
+++ b/data/blocku.png
Binary files differ