From 39ff8d6a01bd0486402aa137bb668dc649860612 Mon Sep 17 00:00:00 2001 From: Jason Hooks Date: Tue, 6 Mar 2012 18:28:41 -0500 Subject: [PATCH] Compile error retry --- apps/openmw/mwrender/animation.cpp | 10 +++++----- apps/openmw/mwrender/animation.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 4972654fc..9df987dc1 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -331,7 +331,7 @@ namespace MWRender{ } } - bool Animation::timeIndex( float time, std::vector & times, int & i, int & j, float & x ){ + bool Animation::timeIndex( float time, const std::vector & times, int & i, int & j, float & x ){ int count; if ( (count = times.size()) > 0 ) { @@ -427,19 +427,19 @@ namespace MWRender{ float x; float x2; - std::vector & quats = iter->getQuat(); + const std::vector & quats = iter->getQuat(); - std::vector & ttime = iter->gettTime(); + const std::vector & ttime = iter->gettTime(); - std::vector & rtime = iter->getrTime(); + const std::vector & rtime = iter->getrTime(); int rindexJ = rindexI[slot]; timeIndex(time, rtime, rindexI[slot], rindexJ, x2); int tindexJ = tindexI[slot]; - std::vector & translist1 = iter->getTranslist1(); + const std::vector & translist1 = iter->getTranslist1(); timeIndex(time, ttime, tindexI[slot], tindexJ, x); diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp index 8e3f54315..e08b86e8d 100644 --- a/apps/openmw/mwrender/animation.hpp +++ b/apps/openmw/mwrender/animation.hpp @@ -56,7 +56,7 @@ class Animation{ Ogre::Entity* base; void handleShapes(std::vector* allshapes, Ogre::Entity* creaturemodel, Ogre::SkeletonInstance *skel); void handleAnimationTransforms(); - bool timeIndex( float time, std::vector & times, int & i, int & j, float & x ); + bool timeIndex( float time, const std::vector & times, int & i, int & j, float & x ); std::string getUniqueID(std::string mesh); public: