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

- a few more fixes found using cppcheck

This commit is contained in:
Mark Vejvoda 2012-03-28 06:34:34 +00:00
parent 9286130138
commit 433f4e84ce
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/linux/mg_cppcheck.sh
View File

@ -4,7 +4,7 @@
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -j 5 --enable=all 2> cppcheck.log
cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -j 5 --enable=all --force --verbose 2> cppcheck.log
echo "Results from cppcheck were written to cppcheck.log"

2
source/glest_game/world/map.cpp
View File

@ -1963,7 +1963,7 @@ void Map::loadGame(const XmlNode *rootNode, World *world) {
//XmlNode *surfaceCellNode = mapNode->getChild("SurfaceCell");
string exploredList = surfaceCellNode->getAttribute("exploredList")->getValue();
string visibleList = surfaceCellNode->getAttribute("visibleList")->getValue();
int batchIndex = surfaceCellNode->getAttribute("batchIndex")->getIntValue();
//int batchIndex = surfaceCellNode->getAttribute("batchIndex")->getIntValue();
vector<string> tokensExplored;
Tokenize(exploredList,tokensExplored,",");

2
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -617,7 +617,7 @@ pair<bool,time_t> hasCachedFileCRCValue(string crcCacheFile, int32 &value) {
time_t refreshDate = 0;
int32 crcValue = 0;
time_t lastUpdateDate = 0;
int readbytes = fscanf(fp,"%ld,%d,%ld",&refreshDate,&crcValue,&lastUpdateDate);
int readbytes = fscanf(fp,"%20ld,%20d,%20ld",&refreshDate,&crcValue,&lastUpdateDate);
fclose(fp);
result.second = lastUpdateDate;