diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-11 03:27:22 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-11 03:27:22 (GMT) |
| commit | f2823b0ee8f3497e17194c35beb351a6be64eaa8 (patch) | |
| tree | 4303cbe0593c019cdda053535c5e5e0263b15d23 /src/client/Client.cpp | |
| parent | 2caa240d9db7f9957d916ce078774cba3049a82f (diff) | |
| parent | a65d93523d98d33cc8964a905c06976dfb5d8a9e (diff) | |
| download | powder-f2823b0ee8f3497e17194c35beb351a6be64eaa8.zip powder-f2823b0ee8f3497e17194c35beb351a6be64eaa8.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/client/Client.cpp')
| -rw-r--r-- | src/client/Client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 9496349..af650a9 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -1021,7 +1021,7 @@ std::string Client::AddStamp(GameSave * saveData) stampStream.write((const char *)gameData, gameDataLength); stampStream.close(); - free(gameData); + delete gameData; stampIDs.push_front(saveID.str()); @@ -1100,7 +1100,7 @@ RequestStatus Client::ExecVote(int saveID, int direction) if(authUser.ID) { - char * directionText = direction==1?"Up":"Down"; + char * directionText = (char*)(direction==1?"Up":"Down"); std::string saveIDText = format::NumberToString<int>(saveID); std::string userIDText = format::NumberToString<int>(authUser.ID); |