diff demos/rpg/scripts/actors/player.py @ 540:2e739ae9a8bc

Some misc code cleanup. Added the EnterPortalAction action. You can now move between town and level1.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 01 Jun 2010 19:17:30 +0000
parents d0bce896a526
children cb7ec12214a9
line wrap: on
line diff
--- a/demos/rpg/scripts/actors/player.py	Tue Jun 01 18:28:25 2010 +0000
+++ b/demos/rpg/scripts/actors/player.py	Tue Jun 01 19:17:30 2010 +0000
@@ -27,10 +27,10 @@
 import sys, os, re, math, random, shutil
 
 from fife import fife
-from scripts.actors.baseactor import Actor, ActorStates
-from scripts.objects.baseobject import ObjectActionListener, BaseGameObject, GameObjectTypes
+from scripts.actors.baseactor import Actor, ActorStates, ActorActionListener
+from scripts.objects.baseobject import BaseGameObject, GameObjectTypes
 
-class PlayerActionListener(ObjectActionListener):
+class PlayerActionListener(ActorActionListener):
 	def __init__(self, gamecontroller, obj):
 		super(PlayerActionListener, self).__init__(gamecontroller, obj)
 
@@ -38,12 +38,11 @@
 		super(PlayerActionListener, self).onInstanceActionFinished(instance, action)
 		if action.getId() == 'walk':
 			pass
-			#self._object.completeAction()
 
 class Player(Actor):
 	def __init__(self, gamecontroller, playermodelname):
-		self._type = GameObjectTypes["PLAYER"]
-		super(Player, self).__init__(gamecontroller, playermodelname, "player", True)
+		super(Player, self).__init__(gamecontroller, GameObjectTypes["PLAYER"], playermodelname, "player", True)
 		self._playermodelname = playermodelname
 		
-		self._playeractionlistener = PlayerActionListener(self._gamecontroller, self)
+		self._actionlistener = PlayerActionListener(self._gamecontroller, self)
+		self._actionlistener.attachActionListener()