- more code cleanup from things found in valgrind

This commit is contained in:
Mark Vejvoda 2011-03-23 05:49:38 +00:00
parent ffe957c9a6
commit ab7dc1d007
5 changed files with 22 additions and 11 deletions

View File

@ -45,6 +45,12 @@ GraphicComponent::GraphicComponent(std::string containerName, std::string objNam
enabled = true; enabled = true;
editable = true; editable = true;
visible = true; visible = true;
x = 0;
y = 0;
w = 0;
h = 0;
text = "";
font = NULL;
} }
void GraphicComponent::clearRegisteredComponents(std::string containerName) { void GraphicComponent::clearRegisteredComponents(std::string containerName) {

View File

@ -44,6 +44,9 @@ CoreData::~CoreData() {
void CoreData::load() { void CoreData::load() {
string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey); string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey);
if(data_path != "") {
endPathWithSlash(data_path);
}
const string dir = data_path + "data/core"; const string dir = data_path + "data/core";
Logger::getInstance().add("Core data"); Logger::getInstance().add("Core data");

View File

@ -65,6 +65,7 @@ SurfaceCell::SurfaceCell() {
normal= Vec3f(0.f, 1.f, 0.f); normal= Vec3f(0.f, 1.f, 0.f);
surfaceType= -1; surfaceType= -1;
surfaceTexture= NULL; surfaceTexture= NULL;
nearSubmerged = false;
} }
SurfaceCell::~SurfaceCell() { SurfaceCell::~SurfaceCell() {

View File

@ -655,7 +655,7 @@ TextureGl::~TextureGl() {
// ===================================================== // =====================================================
// class Texture1DGl // class Texture1DGl
// ===================================================== // =====================================================
Texture1DGl::Texture1DGl() {} Texture1DGl::Texture1DGl() : TextureGl(), Texture1D() {}
Texture1DGl::~Texture1DGl() { Texture1DGl::~Texture1DGl() {
end(); end();
@ -748,7 +748,7 @@ void Texture1DGl::end(bool deletePixelBuffer) {
// class Texture2DGl // class Texture2DGl
// ===================================================== // =====================================================
Texture2DGl::Texture2DGl() {} Texture2DGl::Texture2DGl() : TextureGl(), Texture2D() {}
Texture2DGl::~Texture2DGl() { Texture2DGl::~Texture2DGl() {
end(); end();
@ -854,7 +854,7 @@ void Texture2DGl::end(bool deletePixelBuffer) {
// class Texture3DGl // class Texture3DGl
// ===================================================== // =====================================================
Texture3DGl::Texture3DGl() {} Texture3DGl::Texture3DGl() : TextureGl(), Texture3D() {}
Texture3DGl::~Texture3DGl() { Texture3DGl::~Texture3DGl() {
end(); end();
@ -929,7 +929,7 @@ void Texture3DGl::end(bool deletePixelBuffer) {
// class TextureCubeGl // class TextureCubeGl
// ===================================================== // =====================================================
TextureCubeGl::TextureCubeGl() {} TextureCubeGl::TextureCubeGl() : TextureGl(), TextureCube() {}
TextureCubeGl::~TextureCubeGl() { TextureCubeGl::~TextureCubeGl() {
end(); end();

View File

@ -37,17 +37,18 @@ POSSIBILITY OF SUCH DAMAGE.
* of the xmlbuffer is reached. */ * of the xmlbuffer is reached. */
static int parseatt(struct xmlparser * p) static int parseatt(struct xmlparser * p)
{ {
const char * attname; const char * attname = 0;
int attnamelen; int attnamelen = 0;
const char * attvalue; const char * attvalue = 0;
int attvaluelen; int attvaluelen = 0;
char sep = 0;
while(p->xml < p->xmlend) while(p->xml < p->xmlend)
{ {
if(*p->xml=='/' || *p->xml=='>') if(*p->xml=='/' || *p->xml=='>')
return 0; return 0;
if( !IS_WHITE_SPACE(*p->xml) ) if( !IS_WHITE_SPACE(*p->xml) )
{ {
char sep; sep = 0;
attname = p->xml; attname = p->xml;
attnamelen = 0; attnamelen = 0;
while(*p->xml!='=' && !IS_WHITE_SPACE(*p->xml) ) while(*p->xml!='=' && !IS_WHITE_SPACE(*p->xml) )
@ -108,8 +109,8 @@ static int parseatt(struct xmlparser * p)
* call the callback functions when needed... */ * call the callback functions when needed... */
static void parseelt(struct xmlparser * p) static void parseelt(struct xmlparser * p)
{ {
int i; int i = 0;
const char * elementname; const char * elementname = 0;
while(p->xml < (p->xmlend - 1)) while(p->xml < (p->xmlend - 1))
{ {
if((p->xml)[0]=='<' && (p->xml)[1]!='?') if((p->xml)[0]=='<' && (p->xml)[1]!='?')