diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-06 17:34:32 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-06 17:34:32 (GMT) |
| commit | e5a284a2bafd1e48525b3b3c4fbfe2464cce7c68 (patch) | |
| tree | 0402ab1a3a03d8b6f90826318eb1416fb3ee5155 /src/client | |
| parent | 122599763ef9827d7aadc0fe0295c2fbc96e82ab (diff) | |
| download | powder-e5a284a2bafd1e48525b3b3c4fbfe2464cce7c68.zip powder-e5a284a2bafd1e48525b3b3c4fbfe2464cce7c68.tar.gz | |
fix compiling warnings / error
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/Client.cpp | 2 | ||||
| -rw-r--r-- | src/client/GameSave.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp index fb14050..cf830a8 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -1612,7 +1612,7 @@ std::vector<std::pair<std::string, int> > * Client::GetTags(int start, int count { json::Number tagCount = tagsArray[j]["Count"]; json::String tag = tagsArray[j]["Tag"]; - tagArray->push_back(std::pair<std::string, int>(tag.Value(), tagCount.Value())); + tagArray->push_back(std::pair<std::string, int>(tag.Value(), (int)tagCount.Value())); } } catch (json::Exception &e) diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 1751c54..a4d654f 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -259,9 +259,9 @@ void GameSave::setSize(int newWidth, int newHeight) blockMapPtr = new unsigned char[blockHeight*blockWidth]; std::fill(blockMapPtr, blockMapPtr+(blockHeight*blockWidth), 0); fanVelXPtr = new float[(blockHeight)*(blockWidth)]; - std::fill(fanVelXPtr, fanVelXPtr+((blockHeight)*(blockWidth)), 0); + std::fill(fanVelXPtr, fanVelXPtr+((blockHeight)*(blockWidth)), 0.0f); fanVelYPtr = new float[(blockHeight)*(blockWidth)]; - std::fill(fanVelYPtr, fanVelYPtr+((blockHeight)*(blockWidth)), 0); + std::fill(fanVelYPtr, fanVelYPtr+((blockHeight)*(blockWidth)), 0.0f); blockMap = new unsigned char*[blockHeight]; for(int y = 0; y < blockHeight; y++) @@ -330,9 +330,9 @@ void GameSave::Transform(matrix2d transform, vector2d translate) blockMapPtrNew = new unsigned char[newBlockHeight*newBlockWidth]; std::fill(blockMapPtrNew, blockMapPtrNew+(newBlockHeight*newBlockWidth), 0); fanVelXPtrNew = new float[newBlockHeight*newBlockWidth]; - std::fill(fanVelXPtrNew, fanVelXPtrNew+(newBlockHeight*newBlockWidth), 0); + std::fill(fanVelXPtrNew, fanVelXPtrNew+(newBlockHeight*newBlockWidth), 0.0f); fanVelYPtrNew = new float[(newBlockHeight)*(newBlockWidth)]; - std::fill(fanVelYPtrNew, fanVelYPtrNew+(newBlockHeight*newBlockWidth), 0); + std::fill(fanVelYPtrNew, fanVelYPtrNew+(newBlockHeight*newBlockWidth), 0.0f); blockMapNew = new unsigned char*[newBlockHeight]; for(int y = 0; y < newBlockHeight; y++) |