mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 20:11:36 +00:00
Code Issues Releases Wiki Activity

Rename a couple methods to match their scripting counterparts

Browse source
This commit is contained in:
Chris Robinson 2012-07-20 00:53:12 -07:00
parent 66860825cf
commit 2db80a1504
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwrender/actors.cpp
View file

@ -122,15 +122,13 @@ void Actors::removeCell(MWWorld::Ptr::CellStore* store){
void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number){ void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number){
if(mAllActors.find(ptr) != mAllActors.end()) if(mAllActors.find(ptr) != mAllActors.end())
mAllActors[ptr]->startScript(groupName, mode, number); mAllActors[ptr]->playGroup(groupName, mode, number);
} }
void Actors::skipAnimation (const MWWorld::Ptr& ptr){ void Actors::skipAnimation (const MWWorld::Ptr& ptr){
if(mAllActors.find(ptr) != mAllActors.end()) if(mAllActors.find(ptr) != mAllActors.end())
mAllActors[ptr]->stopScript(); mAllActors[ptr]->skipAnim();
} }
void Actors::update (float duration){ void Actors::update (float duration){
for(std::map<MWWorld::Ptr, Animation*>::iterator iter = mAllActors.begin(); iter != mAllActors.end(); iter++) for(std::map<MWWorld::Ptr, Animation*>::iterator iter = mAllActors.begin(); iter != mAllActors.end(); iter++)
{ iter->second->runAnimation(duration);
(iter->second)->runAnimation(duration);
}
} }

4
apps/openmw/mwrender/animation.cpp
View file

@ -27,7 +27,7 @@ Animation::~Animation()
mEntityList.mEntities.clear(); mEntityList.mEntities.clear();
} }
void Animation::startScript(std::string groupname, int mode, int loops) void Animation::playGroup(std::string groupname, int mode, int loops)
{ {
if(groupname == "all") if(groupname == "all")
{ {
@ -37,7 +37,7 @@ void Animation::startScript(std::string groupname, int mode, int loops)
} }
void Animation::stopScript() void Animation::skipAnim()
{ {
mAnimate = 0; mAnimate = 0;
} }

8
apps/openmw/mwrender/animation.hpp
View file

@ -32,11 +32,11 @@ protected:
public: public:
Animation(OEngine::Render::OgreRenderer& _rend); Animation(OEngine::Render::OgreRenderer& _rend);
virtual void runAnimation(float timepassed) = 0;
void startScript(std::string groupname, int mode, int loops);
void stopScript();
virtual ~Animation(); virtual ~Animation();
void playGroup(std::string groupname, int mode, int loops);
void skipAnim();
virtual void runAnimation(float timepassed) = 0;
}; };
} }