[Scummvm-cvs-logs] SF.net SVN: scummvm:[39770] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Tue Mar 31 08:49:44 CEST 2009
Revision: 39770
http://scummvm.svn.sourceforge.net/scummvm/?rev=39770&view=rev
Author: peres001
Date: 2009-03-31 06:49:44 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Character doesn't need a reference to the engine anymore.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2009-03-30 21:52:46 UTC (rev 39769)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2009-03-31 06:49:44 UTC (rev 39770)
@@ -60,7 +60,7 @@
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 @@
-Character::Character(Parallaction *vm) : _vm(vm), _ani(new Animation) {
+Character::Character() : _ani(new Animation) {
_talk = NULL;
_head = NULL;
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2009-03-30 21:52:46 UTC (rev 39769)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2009-03-31 06:49:44 UTC (rev 39770)
@@ -210,13 +210,11 @@
struct Character {
- Parallaction *_vm;
-
AnimationPtr _ani;
GfxObj *_head;
GfxObj *_talk;
- Character(Parallaction *vm);
+ Character();
protected:
CharacterName _name;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list