mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 08:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Store an MWWorld::Ptr in the character controller

Browse Source
This commit is contained in:
Chris Robinson 2013-01-12 08:49:08 -08:00
parent 35d17fdaf6
commit 4890d901a2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/actors.cpp
View File

@ -166,7 +166,7 @@ namespace MWMechanics
void Actors::addActor (const MWWorld::Ptr& ptr) void Actors::addActor (const MWWorld::Ptr& ptr)
{ {
if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead()) if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead())
mActors[ptr] = CharacterController(); mActors.insert(std::make_pair(ptr, CharacterController(ptr)));
else else
MWBase::Environment::get().getWorld()->playAnimationGroup (ptr, "death1", 2); MWBase::Environment::get().getWorld()->playAnimationGroup (ptr, "death1", 2);
} }

7
apps/openmw/mwmechanics/character.hpp
View File

@ -1,12 +1,19 @@
#ifndef GAME_MWMECHANICS_CHARACTER_HPP #ifndef GAME_MWMECHANICS_CHARACTER_HPP
#define GAME_MWMECHANICS_CHARACTER_HPP #define GAME_MWMECHANICS_CHARACTER_HPP
#include "../mwworld/ptr.hpp"
namespace MWMechanics namespace MWMechanics
{ {
class CharacterController class CharacterController
{ {
MWWorld::Ptr mPtr;
public:
CharacterController(const MWWorld::Ptr &ptr)
: mPtr(ptr)
{ }
}; };
} }