Advertisement
Guest User

Untitled

a guest
Aug 6th, 2017
80
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.83 KB | None | 0 0
  1. guest@macbook_mint1 /mnt/sda4/trabalhos/programacao/python/pygame/pyweek_1103/multifac $ hg diff
  2. diff -r e602a2bdf044 practice/data/font/Vera.ttf
  3. Binary file practice/data/font/Vera.ttf has changed
  4. diff -r e602a2bdf044 practice/data/font/VeraBd.ttf
  5. Binary file practice/data/font/VeraBd.ttf has changed
  6. diff -r e602a2bdf044 practice/gamelib/credits.py
  7. --- a/practice/gamelib/credits.py Fri Mar 25 06:58:05 2011 +0100
  8. +++ b/practice/gamelib/credits.py Fri Mar 25 19:41:13 2011 +0000
  9. @@ -6,7 +6,16 @@
  10. def __init__(self):
  11. self.screen = pygame.display.get_surface()
  12.  
  13. - font = pygame.font.Font(None, 30)
  14. +
  15. + font_file = data.filepath(os.path.join('font','VeraBd.ttf'))
  16. + font = pygame.font.Font(font_file, 24)
  17. +
  18. +
  19. +# font = pygame.font.Font(None, 30)
  20. +
  21. +
  22. +
  23. +
  24. members = ["Christopher Night (Cosmologicon) <cosmologicon@gmail.com>",
  25. "DR0ID <dr0iddr0id@googlemail.com>",
  26. "Gummbum <stabbingfinger@gmail.com>",
  27. diff -r e602a2bdf044 practice/gamelib/game.py
  28. --- a/practice/gamelib/game.py Fri Mar 25 06:58:05 2011 +0100
  29. +++ b/practice/gamelib/game.py Fri Mar 25 19:41:13 2011 +0000
  30. @@ -232,7 +232,10 @@
  31. y += dy
  32.  
  33. # update player position
  34. - dummy = gummworld2.model.QuadTreeObject(self.player.rect.copy())
  35. + # dummy = gummworld2.model.QuadTreeObject(self.player.rect.copy())
  36. +
  37. + dummy = gummworld2.model.QuadTreeObject( pygame.Rect(self.player.rect) )
  38. +
  39. dummy.position = x,y
  40. self.world.add(dummy)
  41.  
  42. diff -r e602a2bdf044 practice/gamelib/gummworld2/toolkit.py
  43. --- a/practice/gamelib/gummworld2/toolkit.py Fri Mar 25 06:58:05 2011 +0100
  44. +++ b/practice/gamelib/gummworld2/toolkit.py Fri Mar 25 19:41:13 2011 +0000
  45. @@ -755,7 +755,9 @@
  46. camera = State.camera
  47. cx,cy = camera.rect.topleft
  48. sx,sy = s.rect.topleft
  49. - camera.surface.blit(s.image, (sx-cx, sy-cy), special_flags=blit_flags)
  50. + #camera.surface.blit(s.image, (sx-cx, sy-cy), special_flags=blit_flags)
  51. +
  52. + camera.surface.blit(s.image, (sx-cx, sy-cy))
  53.  
  54. # draw_sprite
  55.  
  56. diff -r e602a2bdf044 practice/gamelib/sprite.py
  57. --- a/practice/gamelib/sprite.py Fri Mar 25 06:58:05 2011 +0100
  58. +++ b/practice/gamelib/sprite.py Fri Mar 25 19:41:13 2011 +0000
  59. @@ -37,7 +37,9 @@
  60. raise pygame.error, 'source must be type str or pygame.surface.Surface'
  61.  
  62. self.rect = self.image.get_rect()
  63. - self.source_rect = kw.get('source_rect', self.rect.copy())
  64. + #self.source_rect = kw.get('source_rect', self.rect.copy())
  65. + self.source_rect = kw.get('source_rect', pygame.Rect(self.rect))
  66. +
  67. self.flags = kw.get('flags', 0)
  68.  
  69. self.position = kw.get('position', (0,0))
  70. guest@macbook_mint1 /mnt/sda4/trabalhos/programacao/python/pygame/pyweek_1103/multifac $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement