teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fixing a few things

Browse source
This commit is contained in:
Jason Hooks 2011-12-27 17:12:47 -05:00
parent 1a90f4241b
commit c399f4f210
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,8 @@ 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){
mAllActors.find(ptr)->second->startScript(groupName, mode, number); if(mAllActors.find(ptr) != mAllActors.end())
mAllActors[ptr]->startScript(groupName, mode, number);
} }
void Actors::skipAnimation (const MWWorld::Ptr& ptr){ void Actors::skipAnimation (const MWWorld::Ptr& ptr){

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

@ -354,8 +354,10 @@ namespace MWRender{
for(iter = transformations->begin(); iter != transformations->end(); iter++){ for(iter = transformations->begin(); iter != transformations->end(); iter++){
if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime()) if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime())
{ {
continue;
slot++; slot++;
iter++;
continue;
} }
if(skel->hasBone(iter->getBonename())){ if(skel->hasBone(iter->getBonename())){