summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-02-24 19:12:48 (GMT)
committer jacob1 <jfu614@gmail.com>2013-02-24 19:12:48 (GMT)
commit0939494747908bb702f24598e883c3d1f70e3710 (patch)
tree3477ed2cb7e995fa3c94880acee49bdd2232eaca /src/client
parentf138e10917b1bcdd7d270997312e8d672c182c3a (diff)
downloadpowder-0939494747908bb702f24598e883c3d1f70e3710.zip
powder-0939494747908bb702f24598e883c3d1f70e3710.tar.gz
fix problems found with valgrind with shifting stamps and saving
Diffstat (limited to 'src/client')
-rw-r--r--src/client/Client.cpp6
-rw-r--r--src/client/GameSave.cpp14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 8a82515..d694f45 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -877,7 +877,7 @@ RequestStatus Client::UploadSave(SaveInfo & save)
{
if(strncmp((const char *)data, "OK", 2)!=0)
{
- if(gameData) free(gameData);
+ if(gameData) delete[] gameData;
lastError = std::string((const char *)data);
free(data);
return RequestFailure;
@@ -898,14 +898,14 @@ RequestStatus Client::UploadSave(SaveInfo & save)
}
}
free(data);
- if(gameData) free(gameData);
+ if(gameData) delete[] gameData;
return RequestOkay;
}
else if(data)
{
free(data);
}
- if(gameData) free(gameData);
+ if(gameData) delete[] gameData;
return RequestFailure;
}
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 791069d..af8bbf2 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -366,7 +366,7 @@ void GameSave::Transform(matrix2d transform, vector2d translate)
signs[i].x = nx;
signs[i].y = ny;
}
- for (i=0; i<NPART; i++)
+ for (i=0; i<particlesCount; i++)
{
if (!particles[i].type) continue;
pos = v2d_new(particles[i].x, particles[i].y);
@@ -410,13 +410,13 @@ void GameSave::Transform(matrix2d transform, vector2d translate)
blockWidth = newBlockWidth;
blockHeight = newBlockHeight;
- delete blockMap;
- delete fanVelX;
- delete fanVelY;
+ delete[] blockMap;
+ delete[] fanVelX;
+ delete[] fanVelY;
- delete blockMapPtr;
- delete fanVelXPtr;
- delete fanVelYPtr;
+ delete[] blockMapPtr;
+ delete[] fanVelXPtr;
+ delete[] fanVelYPtr;
blockMap = blockMapNew;
fanVelX = fanVelXNew;