diff options
author | slm <jtmengel@gmail.com> | 2010-07-29 14:52:40 (GMT) |
---|---|---|
committer | slm <jtmengel@gmail.com> | 2010-07-29 14:52:40 (GMT) |
commit | e5a9bc3091e6e5ac98d4b9748063c34b875144d8 (patch) | |
tree | 3111a8d587966d8adbe4da6dd16b8c87cc8fe7e4 /devtools/CompleteTestKit | |
parent | b3f23daf8d90c9169c3cffaf6175b39c4d90c50d (diff) |
Corrected errors in the code from a faulty git-push.
Diffstat (limited to 'devtools/CompleteTestKit')
-rw-r--r-- | devtools/CompleteTestKit/DrawableObject.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/devtools/CompleteTestKit/DrawableObject.py b/devtools/CompleteTestKit/DrawableObject.py index 796c1c9..0fd430c 100644 --- a/devtools/CompleteTestKit/DrawableObject.py +++ b/devtools/CompleteTestKit/DrawableObject.py @@ -17,8 +17,7 @@ class DrawableObject(pygame.sprite.Sprite): #self._originals = images
#self._images = images - self._images = []
-<<<<<<< HEAD:devtools/CompleteTestKit/DrawableObject.py + self._images = [] self._origImages = [] # @@ -27,14 +26,7 @@ class DrawableObject(pygame.sprite.Sprite): for i in range(len(images)):
self._images.append(images[i].convert())
self._origImages.append(images[i].convert())
- -======= - self._origImages = []
- while cnt < len(images):
- self._images.append(images[cnt].convert_alpha())
- self._origImages.append(images[cnt].convert_alpha())
- cnt += 1
->>>>>>> 8832b7c67d9c73d371538c2ba7aae7e0abddb090:devtools/CompleteTestKit/DrawableObject.py + self._start = pygame.time.get_ticks()
self.image = self._images[0]
# |