diff options
| -rw-r--r-- | MAFH2/BattleEngine.py | 2 | ||||
| -rw-r--r-- | MAFH2/BattleMenu.py | 4 | ||||
| -rw-r--r-- | MAFH2/Comic.py | 2 | ||||
| -rw-r--r-- | MAFH2/Dungeon.py | 2 | ||||
| -rw-r--r-- | MAFH2/MafhGameMenu.py | 4 | ||||
| -rw-r--r-- | MAFH2/MagicMenu.py | 4 | ||||
| -rw-r--r-- | MAFH2/Map.py | 2 | ||||
| -rw-r--r-- | MAFH2/Profile.py | 2 | ||||
| -rw-r--r-- | MAFH2/TermBox.py | 2 | ||||
| -rw-r--r-- | MAFH2/fortuneengine/GameEngine.py | 4 |
10 files changed, 14 insertions, 14 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 8ae89aa..00c657c 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -310,7 +310,7 @@ class BattleEngine(GameEngineElement): # We don't want to allow other things to run during battle return True - def draw(self, screen): + def draw(self,screen,time_delta): x=250 y=150 i = 1 diff --git a/MAFH2/BattleMenu.py b/MAFH2/BattleMenu.py index 003a026..0379196 100644 --- a/MAFH2/BattleMenu.py +++ b/MAFH2/BattleMenu.py @@ -27,7 +27,7 @@ class BattleMenuHolder( GameEngineElement ): super( GameMenuHolder, self ).remove_from_engine() self.clear_menu() - def draw(self, screen): + def draw(self,screen,time_delta): screen.blit(self.background,(0,286,452,414)) ren = self.font.render(self.disp, 1, (0,0,0)) screen.blit(ren, (250, 340)) @@ -115,7 +115,7 @@ class BattleMenu(GameEngineElement): def event_handler(self, event): return self.menu.update(event) - def draw(self, screen): + def draw(self,screen,time_delta): self.menu.draw( screen ) class Menu(object): diff --git a/MAFH2/Comic.py b/MAFH2/Comic.py index 485d365..91d4c5e 100644 --- a/MAFH2/Comic.py +++ b/MAFH2/Comic.py @@ -46,7 +46,7 @@ class Comic(GameEngineElement): else: return False - def draw(self,screen): + def draw(self,screen,time_delta): screen.blit(self.images[self.currentIndex].image,(0,0,1200,900)) def event_handler(self,event): diff --git a/MAFH2/Dungeon.py b/MAFH2/Dungeon.py index cee910f..77747d2 100644 --- a/MAFH2/Dungeon.py +++ b/MAFH2/Dungeon.py @@ -267,7 +267,7 @@ class Dungeon(GameEngineElement): elif dir == WEST: return 'S', 'W', 'N' - def draw(self, screen): + def draw(self,screen,time_delta): profile = self.game_engine.get_object('profile') dir = profile.playerFacing current_room = self.rooms[profile.position] diff --git a/MAFH2/MafhGameMenu.py b/MAFH2/MafhGameMenu.py index 3ed27dd..7a8b41f 100644 --- a/MAFH2/MafhGameMenu.py +++ b/MAFH2/MafhGameMenu.py @@ -14,7 +14,7 @@ class GameMenuHolder( GameEngineElement ): super( GameMenuHolder, self ).remove_from_engine() self.clear_menu() - def draw(self, screen): + def draw(self,screen,time_delta): if self.background: screen.blit(self.background,(0,0,self.width,self.height)) else: @@ -113,5 +113,5 @@ class GameMenu(GameEngineElement): def event_handler(self, event): return self.menu.update(event) - def draw(self, screen): + def draw(self,screen,time_delta): self.menu.draw( screen ) diff --git a/MAFH2/MagicMenu.py b/MAFH2/MagicMenu.py index 606f928..7ff7323 100644 --- a/MAFH2/MagicMenu.py +++ b/MAFH2/MagicMenu.py @@ -19,7 +19,7 @@ class MagicMenuHolder( GameEngineElement ): super( MagicMenuHolder, self ).remove_from_engine() self.clear_menu() - def draw(self, screen): + def draw(self,screen,time_delta): screen.blit(self.background,(0,286,452,414)) #draw the boxes with the specific magic icons randomly @@ -105,7 +105,7 @@ class MagicMenu(GameEngineElement): def event_handler(self, event): return self.menu.update(event) - def draw(self, screen): + def draw(self,screen,time_delta): self.menu.draw( screen ) class Menu(object): diff --git a/MAFH2/Map.py b/MAFH2/Map.py index 878cbfe..36f4b28 100644 --- a/MAFH2/Map.py +++ b/MAFH2/Map.py @@ -56,7 +56,7 @@ class Map(GameEngineElement): if self.draw_macro_set: return True - def draw(self, screen): + def draw(self,screen,time_delta): profile = self.game_engine.get_object('profile') x, y = profile.position playerFacing = profile.playerFacing diff --git a/MAFH2/Profile.py b/MAFH2/Profile.py index fdac92b..6d0509f 100644 --- a/MAFH2/Profile.py +++ b/MAFH2/Profile.py @@ -90,7 +90,7 @@ class Profile(GameEngineElement): self.name+=event.unicode return True - def draw(self, screen): + def draw(self,screen,time_delta): """ Draws user input for name to the screen """ diff --git a/MAFH2/TermBox.py b/MAFH2/TermBox.py index 620b29c..516590a 100644 --- a/MAFH2/TermBox.py +++ b/MAFH2/TermBox.py @@ -19,7 +19,7 @@ class TermBox(GameEngineElement): if len( self.__lines ) > self.max_lines: self.__lines.pop(0) - def draw(self, screen): + def draw(self,screen,time_delta): pygame.draw.rect(screen, [0, 0, 0], (self.x, self.y, self.width, self.height)) i=0 for line in self.__lines: diff --git a/MAFH2/fortuneengine/GameEngine.py b/MAFH2/fortuneengine/GameEngine.py index 2b0b077..77dbef5 100644 --- a/MAFH2/fortuneengine/GameEngine.py +++ b/MAFH2/fortuneengine/GameEngine.py @@ -134,7 +134,7 @@ class GameEngine(object): def _draw_loop(self): while self.__run_draw: - self.clock.tick(15) + tick_time = self.clock.tick(15) # If console is active, we want to draw console, pausing # game drawing (events are still being fired, just no @@ -147,7 +147,7 @@ class GameEngine(object): self.event_lock.acquire() try: for fnc in self.__draw_lst: - fnc(self.screen) + fnc(self.screen, tick_time) except Exception as Detail: import traceback traceback.print_exc() |