move subject/actor mapping into Gui class

opencombat/gui/base.py

@@ -28,6 +28,7 @@ from opencombat.gui.animation import ANIMATION_WALK
 from synergine2_cocos2d.animation import Animate
 from synergine2_cocos2d.gl import draw_line
 from synergine2_cocos2d.gui import EditLayer as BaseEditLayer
+from synergine2_cocos2d.gui import SubjectMapper
 from synergine2_cocos2d.gui import Gui
 from synergine2_cocos2d.gui import TMXGui
 from synergine2_cocos2d.layer import LayerManager
@@ -39,6 +40,8 @@ from opencombat.simulation.event import NewVisibleOpponent
 from opencombat.simulation.event import NoLongerVisibleOpponent
 from opencombat.simulation.event import FireEvent
 from opencombat.simulation.event import DieEvent
+from opencombat.simulation.subject import TileSubject as ManSubject
+from opencombat.gui.actor import Man as ManActor
 
 
 class EditLayer(BaseEditLayer):
@@ -239,6 +242,12 @@ class Game(TMXGui):
             'actors/man_d1.png',
         ))
 
+        # subject/actor mapping
+        self.subject_mapper_factory.register_mapper(
+            ManSubject,
+            SubjectMapper(self.config, ManActor),
+        )
+
     def before_run(self) -> None:
         from opencombat.gui.move import MoveActorInteraction
         from opencombat.gui.move import MoveFastActorInteraction

opencombat/terminal/base.py

@@ -8,8 +8,6 @@ from opencombat.simulation.event import FireEvent
 from opencombat.simulation.event import DieEvent
 from opencombat.simulation.event import NoLongerVisibleOpponent
 from opencombat.simulation.physics import TilePhysics
-from opencombat.simulation.subject import TileSubject as ManSubject
-from opencombat.gui.actor import Man as ManActor
 from synergine2_cocos2d.terminal import GameTerminal
 from synergine2_cocos2d.util import get_map_file_path_from_dir
 from synergine2_xyz.move.simulation import FinishMoveEvent
@@ -40,7 +38,6 @@ class CocosTerminal(GameTerminal):
 
     def run(self):
         from opencombat.gui.base import Game
-        from synergine2_cocos2d.gui import SubjectMapper
 
         self.gui = Game(
             self.config,
@@ -58,10 +55,4 @@ class CocosTerminal(GameTerminal):
 
             return pyglet.event.EVENT_HANDLED
 
-        # TODO: Defind on some other place ?
-        self.gui.subject_mapper_factory.register_mapper(
-            ManSubject,
-            SubjectMapper(self.config, ManActor),
-        )
-
         self.gui.run()