Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- more memory cleanup

This commit is contained in:
Mark Vejvoda 2010-09-07 18:28:09 +00:00
parent 9817e8a860
commit 63cf199322
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/type_instances/unit.cpp
View File

@ -175,6 +175,7 @@ Unit::Unit(int id, UnitPathInterface *unitpath, const Vec2i &pos, const UnitType
this->lastRenderFrame = 0; this->lastRenderFrame = 0;
this->visible = true; this->visible = true;
this->retryCurrCommandCount=0; this->retryCurrCommandCount=0;
this->screenPos = Vec3f(0.0);
level= NULL; level= NULL;
loadType= NULL; loadType= NULL;

30
source/shared_lib/include/graphics/vec.h
View File

@ -146,9 +146,12 @@ public:
} }
std::string getString() const { std::string getString() const {
std::ostringstream streamOut(std::ostringstream::out); std::ostringstream streamOut;
streamOut << "x [" << x << "] y [" << y << "]"; streamOut << "x [" << x;
return streamOut.str(); streamOut << "] y [" << y << "]";
std::string result = streamOut.str();
streamOut.str(std::string());
return result;
} }
}; };
@ -330,9 +333,13 @@ public:
} }
std::string getString() const { std::string getString() const {
std::ostringstream streamOut(std::ostringstream::out); std::ostringstream streamOut;
streamOut << "x [" << x << "] y [" << y << "] z [" << z << "]"; streamOut << "x [" << x;
return streamOut.str(); streamOut << "] y [" << y;
streamOut << "] z [" << z << "]";
std::string result = streamOut.str();
streamOut.str(std::string());
return result;
} }
}; };
@ -473,9 +480,14 @@ public:
} }
std::string getString() const { std::string getString() const {
std::ostringstream streamOut(std::ostringstream::out); std::ostringstream streamOut;
streamOut << "x [" << x << "] y [" << y << "] z [" << z << "] w [" << w << "]"; streamOut << "x [" << x;
return streamOut.str(); streamOut << "] y [" << y;
streamOut << "] z [" << z;
streamOut << "] w [" << w << "]";
std::string result = streamOut.str();
streamOut.str(std::string());
return result;
} }
}; };