From 803ae2fc3bb894109826fb763cbc4b0091393038 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 19 Nov 2013 21:15:32 +0100 Subject: [PATCH] [DEV] update stl --- ege/ElementGame.cpp | 2 +- ege/Environement.cpp | 4 ++-- ege/Scene.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ege/ElementGame.cpp b/ege/ElementGame.cpp index 550fbfa..4f231d7 100644 --- a/ege/ElementGame.cpp +++ b/ege/ElementGame.cpp @@ -443,7 +443,7 @@ void ege::ElementGame::drawDebug(ewol::Colored3DObject* _draw, const ege::Camera m_debugText.setPos(vec3(-20,32,0)); m_debugText.print(getType()); m_debugText.setPos(vec3(-20,20,0)); - m_debugText.print(std::string("life=(")+std::string(getLifeRatio())); + m_debugText.print("life=("+std::to_string(getLifeRatio())); //m_debugText.print(std::string("Axe=(")+std::string(m_tmpAxe.x())+std::string(",")+etk::UString(m_tmpAxe.y())+etk::UString(",")+etk::UString(m_tmpAxe.z())+etk::UString(")")); btScalar mmm[16]; btDefaultMotionState* myMotionState = (btDefaultMotionState*)m_body->getMotionState(); diff --git a/ege/Environement.cpp b/ege/Environement.cpp index cfc8f90..b308eb5 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -99,7 +99,7 @@ void ege::Environement::getElementNearestFixed(const vec3& _sourcePosition, int32_t jjj; for (jjj=0; jjj<_resultList.size(); jjj++) { if (_resultList[jjj].dist>result.dist) { - _resultList.insert(jjj, result); + _resultList.insert(_resultList.begin()+jjj, result); break; } } @@ -241,7 +241,7 @@ void ege::Environement::getOrderedElementForDisplay(std::vectorresult.dist) { - _resultList.insert(jjj, result); + _resultList.insert(_resultList.begin()+jjj, result); break; } } diff --git a/ege/Scene.cpp b/ege/Scene.cpp index f182c8e..44eee9d 100644 --- a/ege/Scene.cpp +++ b/ege/Scene.cpp @@ -251,7 +251,7 @@ void ege::Scene::periodicCall(const ewol::EventTime& _event) { int32_t lastGameTime = m_gameTime; m_gameTime += curentDelta; if (lastGameTime != (int32_t)m_gameTime) { - generateEventId(eventPlayTimeChange, m_gameTime); + generateEventId(eventPlayTimeChange, std::to_string(m_gameTime)); } //EWOL_DEBUG("Time: m_lastCallTime=" << m_lastCallTime << " deltaTime=" << deltaTime); @@ -287,7 +287,7 @@ void ege::Scene::periodicCall(const ewol::EventTime& _event) { } if (0 != numberEnnemyKilled) { - generateEventId(eventKillEnemy, numberEnnemyKilled); + generateEventId(eventKillEnemy, std::to_string(numberEnnemyKilled)); } } markToRedraw();