aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorNicola Mettifogo2009-03-31 06:49:44 +0000
committerNicola Mettifogo2009-03-31 06:49:44 +0000
commitb08b0f64afbc6c697d3334f17284f132cef8cb51 (patch)
treec4b8d49a8ab87f9ec4c661ca2fb093f4fb6d506d /engines/parallaction
parent6b499ebf4b3a04a9ae79669db5bf794a4439c3e1 (diff)
downloadscummvm-rg350-b08b0f64afbc6c697d3334f17284f132cef8cb51.tar.gz
scummvm-rg350-b08b0f64afbc6c697d3334f17284f132cef8cb51.tar.bz2
scummvm-rg350-b08b0f64afbc6c697d3334f17284f132cef8cb51.zip
Character doesn't need a reference to the engine anymore.
svn-id: r39770
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/parallaction.cpp4
-rw-r--r--engines/parallaction/parallaction.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index be33bfdaa9..e144224bd6 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -60,7 +60,7 @@ uint32 _globalFlags = 0;
Parallaction::Parallaction(OSystem *syst, const PARALLACTIONGameDescription *gameDesc) :
- Engine(syst), _gameDescription(gameDesc), _char(this), _location(getGameType()) {
+ Engine(syst), _gameDescription(gameDesc), _location(getGameType()) {
_vm = this;
Common::addDebugChannel(kDebugDialogue, "dialogue", "Dialogues debug level");
@@ -844,7 +844,7 @@ void Location::freeZones(bool removeAll) {
-Character::Character(Parallaction *vm) : _vm(vm), _ani(new Animation) {
+Character::Character() : _ani(new Animation) {
_talk = NULL;
_head = NULL;
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 030db1f774..fd2d05427e 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -210,13 +210,11 @@ public:
struct Character {
- Parallaction *_vm;
-
AnimationPtr _ani;
GfxObj *_head;
GfxObj *_talk;
- Character(Parallaction *vm);
+ Character();
protected:
CharacterName _name;