Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- guest@macbook_mint1 /mnt/sda4/trabalhos/programacao/python/pygame/pyweek_1103/multifac $ hg diff
- diff -r e602a2bdf044 practice/data/font/Vera.ttf
- Binary file practice/data/font/Vera.ttf has changed
- diff -r e602a2bdf044 practice/data/font/VeraBd.ttf
- Binary file practice/data/font/VeraBd.ttf has changed
- diff -r e602a2bdf044 practice/gamelib/credits.py
- --- a/practice/gamelib/credits.py Fri Mar 25 06:58:05 2011 +0100
- +++ b/practice/gamelib/credits.py Fri Mar 25 19:41:13 2011 +0000
- @@ -6,7 +6,16 @@
- def __init__(self):
- self.screen = pygame.display.get_surface()
- - font = pygame.font.Font(None, 30)
- +
- + font_file = data.filepath(os.path.join('font','VeraBd.ttf'))
- + font = pygame.font.Font(font_file, 24)
- +
- +
- +# font = pygame.font.Font(None, 30)
- +
- +
- +
- +
- members = ["Christopher Night (Cosmologicon) <cosmologicon@gmail.com>",
- "DR0ID <dr0iddr0id@googlemail.com>",
- "Gummbum <stabbingfinger@gmail.com>",
- diff -r e602a2bdf044 practice/gamelib/game.py
- --- a/practice/gamelib/game.py Fri Mar 25 06:58:05 2011 +0100
- +++ b/practice/gamelib/game.py Fri Mar 25 19:41:13 2011 +0000
- @@ -232,7 +232,10 @@
- y += dy
- # update player position
- - dummy = gummworld2.model.QuadTreeObject(self.player.rect.copy())
- + # dummy = gummworld2.model.QuadTreeObject(self.player.rect.copy())
- +
- + dummy = gummworld2.model.QuadTreeObject( pygame.Rect(self.player.rect) )
- +
- dummy.position = x,y
- self.world.add(dummy)
- diff -r e602a2bdf044 practice/gamelib/gummworld2/toolkit.py
- --- a/practice/gamelib/gummworld2/toolkit.py Fri Mar 25 06:58:05 2011 +0100
- +++ b/practice/gamelib/gummworld2/toolkit.py Fri Mar 25 19:41:13 2011 +0000
- @@ -755,7 +755,9 @@
- camera = State.camera
- cx,cy = camera.rect.topleft
- sx,sy = s.rect.topleft
- - camera.surface.blit(s.image, (sx-cx, sy-cy), special_flags=blit_flags)
- + #camera.surface.blit(s.image, (sx-cx, sy-cy), special_flags=blit_flags)
- +
- + camera.surface.blit(s.image, (sx-cx, sy-cy))
- # draw_sprite
- diff -r e602a2bdf044 practice/gamelib/sprite.py
- --- a/practice/gamelib/sprite.py Fri Mar 25 06:58:05 2011 +0100
- +++ b/practice/gamelib/sprite.py Fri Mar 25 19:41:13 2011 +0000
- @@ -37,7 +37,9 @@
- raise pygame.error, 'source must be type str or pygame.surface.Surface'
- self.rect = self.image.get_rect()
- - self.source_rect = kw.get('source_rect', self.rect.copy())
- + #self.source_rect = kw.get('source_rect', self.rect.copy())
- + self.source_rect = kw.get('source_rect', pygame.Rect(self.rect))
- +
- self.flags = kw.get('flags', 0)
- self.position = kw.get('position', (0,0))
- guest@macbook_mint1 /mnt/sda4/trabalhos/programacao/python/pygame/pyweek_1103/multifac $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement