diff options
-rw-r--r-- | MAFH2/BattleEngine.py | 9 | ||||
-rw-r--r-- | devtools/CompleteTestKit/DynamicDrawableObject.py | 2 | ||||
-rw-r--r-- | devtools/CompleteTestKit/FinalDirtyTest.py | 2 | ||||
-rw-r--r-- | devtools/CompleteTestKit/Scene.py | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 98e9b0a..709a1f5 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -2,10 +2,11 @@ from fortuneengine.GameEngineElement import GameEngineElement from Enemy import get_enemy from BattleMenu import BattleMenuHolder from MagicMenu import MagicMenuHolder -from drawableobject.Spritesheet import Spritesheet +from Spritesheet import Spritesheet from Items import get_item -from drawableobject.DrawableObject import DrawableObject -from drawableobject.DynamicDrawableObject import DynamicDrawableObject +from DrawableObject import DrawableObject +from DynamicDrawableObject import DynamicDrawableObject +from Scene import Scene import pygame from constants import CHAR_PATH, HUD_PATH @@ -374,7 +375,7 @@ class BattleEngine(GameEngineElement): # \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ # def draw(self,screen,time_delta): - _dirtyList=[] + #_dirtyList=[] x=250 y=150 i = 1 diff --git a/devtools/CompleteTestKit/DynamicDrawableObject.py b/devtools/CompleteTestKit/DynamicDrawableObject.py index e46ef04..e793d38 100644 --- a/devtools/CompleteTestKit/DynamicDrawableObject.py +++ b/devtools/CompleteTestKit/DynamicDrawableObject.py @@ -49,8 +49,6 @@ class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite): def update(self, t): # just updates the frame / object
- #if self.animations[cnt] == self._current_anim:
-
print "last update ", self._last_update
timePassed = t + self._last_update#getting the time since the last time I updated my frame and adding it to the time that I last updated my frame
print "time passed ", timePassed
diff --git a/devtools/CompleteTestKit/FinalDirtyTest.py b/devtools/CompleteTestKit/FinalDirtyTest.py index b2c86fc..3921356 100644 --- a/devtools/CompleteTestKit/FinalDirtyTest.py +++ b/devtools/CompleteTestKit/FinalDirtyTest.py @@ -54,7 +54,7 @@ frameList2 = [ for aTrial in range(maxTrial):
start = time()
- d = DynamicDrawableObject(frameList2,"text.txt",400,0,0,1,1)
+ d = DrawableObject(frameList2,"text.txt",400,0,0,1,1)
d.goToAnim("anim1")
d2 = DynamicDrawableObject(frameList2,"text.txt",400,40,40,1,1)
d2.goToAnim("anim1")
diff --git a/devtools/CompleteTestKit/Scene.py b/devtools/CompleteTestKit/Scene.py index 80b4ec9..9727177 100644 --- a/devtools/CompleteTestKit/Scene.py +++ b/devtools/CompleteTestKit/Scene.py @@ -7,7 +7,7 @@ class Scene(pygame.sprite.RenderUpdates): self._spritelist = []
self._spritelist.append([sprites, sprites.getXPos(), sprites.getYPos()])
- #RenderUpdates.__init__(self, sprites)
+ RenderUpdates.__init__(self, sprites)
self.xPos = 0
self.yPos = 0
|