From 73fa952f77ad5ffb841d19e9161f6a0eef65c2b3 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Thu, 16 Jan 2014 13:01:28 -0700 Subject: [PATCH] Fixed issue with mismatched iterator/container types --- .../serverScript/src/shared/ScriptMethodsMentalStates.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp index 87d142d0..c4dd20c1 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp @@ -876,7 +876,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::setMentalStateTowardArray(J if (!ScriptConversion::convert(target, targetIds)) return JNI_FALSE; - std::vector::iterator i; + std::vector::iterator i; for (i=targetIds.begin(); i!=targetIds.end(); ++i) { creature->setMentalStateToward(*i, static_cast(mentalState), @@ -911,7 +911,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::addToMentalStateTowardArray if (!ScriptConversion::convert(target, targetIds)) return JNI_FALSE; - std::vector::iterator i; + std::vector::iterator i; for (i=targetIds.begin(); i!=targetIds.end(); ++i) { MentalStates::Value current = creature->getMentalStateToward(*i, static_cast(mentalState));