mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 15:11:20 +02:00
Code Issues Projects Releases Wiki Activity

code cleanup based on cppcheck results

Browse Source
This commit is contained in:
Mark Vejvoda
2013-05-17 05:21:14 +00:00
parent c55b9c3ffe
commit 748763f0f1
11 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/linux/mg_cppcheck.sh
View File

@@ -9,6 +9,6 @@ OUTFILE=./cppcheck.log
CPUS=`lscpu -p | grep -cv '^#'`
if [ "$CPUS" = '' ]; then CPUS=1; fi
cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -j $CPUS --enable=all --force --verbose 2> $OUTFILE
cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -j $CPUS --enable=all --force --verbose 2> $OUTFILE
echo "Results from cppcheck were written to $OUTFILE"

15
source/glest_game/ai/ai_interface.cpp
View File

@@ -246,6 +246,21 @@ AiInterface::AiInterface(Game &game, int factionIndex, int teamIndex,
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
void AiInterface::init() {
world=NULL;;
commander=NULL;;
console=NULL;;
gameSettings=NULL;;
timer=0;
factionIndex=0;
teamIndex=0;
redir=false;
logLevel=0;
fp=NULL;;
aiMutex=NULL;
workerThread=NULL;
}
AiInterface::~AiInterface() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] deleting AI factionIndex = %d, teamIndex = %d\n",__FILE__,__FUNCTION__,__LINE__,this->factionIndex,this->teamIndex);
cacheUnitHarvestResourceLookup.clear();

4
source/glest_game/ai/ai_interface.h
View File

@@ -88,9 +88,11 @@ public:
~AiInterface();
AiInterface(const AiInterface& obj) {
init();
throw megaglest_runtime_error("class AiInterface is NOT safe to copy!");
}
AiInterface & operator=(const AiInterface& obj) {
init();
throw megaglest_runtime_error("class AiInterface is NOT safe to assign!");
}
@@ -161,6 +163,8 @@ public:
private:
string getLogFilename() const {return "ai"+intToStr(factionIndex)+".log";}
bool executeCommandOverNetwork();
void init();
};
}}//end namespace

6
source/glest_game/ai/path_finder.cpp
View File

@@ -85,6 +85,12 @@ void PathFinder::init(const Map *map) {
this->map= map;
}
void PathFinder::init() {
minorDebugPathfinder = false;
factionMutex = NULL;
map=NULL;
}
PathFinder::~PathFinder() {
for(int i = 0; i < GameConstants::maxPlayers; ++i) {
factions[i].nodePool.clear();

4
source/glest_game/ai/path_finder.h
View File

@@ -160,9 +160,11 @@ public:
~PathFinder();
PathFinder(const PathFinder& obj) {
init();
throw megaglest_runtime_error("class PathFinder is NOT safe to copy!");
}
PathFinder & operator=(const PathFinder& obj) {
init();
throw megaglest_runtime_error("class PathFinder is NOT safe to assign!");
}
@@ -181,6 +183,8 @@ public:
void loadGame(const XmlNode *rootNode);
private:
void init();
TravelState aStar(Unit *unit, const Vec2i &finalPos, bool inBailout, int frameIndex, int maxNodeCount=-1,uint32 *searched_node_count=NULL);
//Node *newNode(FactionState &faction,int maxNodeCount);
inline static Node *newNode(FactionState &faction, int maxNodeCount) {

4
source/glest_game/menu/menu_state_options_sound.cpp
View File

@@ -47,7 +47,7 @@ MenuStateOptionsSound::MenuStateOptionsSound(Program *program, MainMenu *mainMen
int leftLabelStart=50;
int leftColumnStart=leftLabelStart+280;
int rightLabelStart=450;
//int rightLabelStart=450;
//int rightColumnStart=rightLabelStart+280;
int buttonRowPos=50;
int buttonStartPos=170;
@@ -139,7 +139,7 @@ MenuStateOptionsSound::MenuStateOptionsSound(Program *program, MainMenu *mainMen
listBoxVolumeMusic.registerGraphicComponent(containerName,"listBoxVolumeMusic");
listBoxVolumeMusic.init(currentColumnStart, currentLine, 80);
labelVolumeMusic.setText(lang.get("MusicVolume"));
currentLine-=lineOffset;
//currentLine-=lineOffset;
for(int i=0; i<=100; i+=5){
listBoxVolumeFx.pushBackItem(intToStr(i));

8
source/glest_game/network/network_interface.cpp
View File

@@ -47,7 +47,15 @@ NetworkInterface::NetworkInterface() {
networkGameDataSynchCheckOkTile=false;
networkGameDataSynchCheckOkTech=false;
receivedDataSynchCheck=false;
}
void NetworkInterface::init() {
networkAccessMutex = NULL;
networkGameDataSynchCheckOkMap=false;
networkGameDataSynchCheckOkTile=false;
networkGameDataSynchCheckOkTech=false;
receivedDataSynchCheck=false;
}
NetworkInterface::~NetworkInterface() {

3
source/glest_game/network/network_interface.h
View File

@@ -187,6 +187,7 @@ protected:
Mutex *networkAccessMutex;
void init();
public:
static const int readyWaitTimeout;
GameSettings gameSettings;
@@ -196,9 +197,11 @@ public:
virtual ~NetworkInterface();
NetworkInterface(const NetworkInterface& obj) {
init();
throw megaglest_runtime_error("class NetworkInterface is NOT safe to copy!");
}
NetworkInterface & operator=(const NetworkInterface& obj) {
init();
throw megaglest_runtime_error("class NetworkInterface is NOT safe to assign!");
}

8
source/glest_map_editor/program.cpp
View File

@@ -153,6 +153,14 @@ Program::Program(int w, int h) {
renderer.initMapSurface(w, h);
}
void Program::init() {
cellSize = 6;
grid=false;
ofsetX = 0;
ofsetY = 0;
map = NULL;
}
Program::~Program() {
delete map;
map = NULL;

3
source/glest_map_editor/program.h
View File

@@ -103,14 +103,17 @@ private:
ChangeStack undoStack, redoStack;
void init();
public:
Program(int w, int h);
~Program();
Program(const Program& obj) {
init();
throw runtime_error("class Program is NOT safe to copy!");
}
Program & operator=(const Program& obj) {
init();
throw runtime_error("class Program is NOT safe to assign!");
}

2
source/shared_lib/sources/util/profiler.cpp
View File

@@ -44,7 +44,7 @@ Section *Section::getChild(const string &name){
void Section::print(FILE *outStream, int tabLevel){
float percent= (parent==NULL || parent->milisElapsed==0)? 100.0f: 100.0f*milisElapsed/parent->milisElapsed;
string pname= parent==NULL? "": parent->getName();
//string pname= parent==NULL? "": parent->getName();
for(int i=0; i<tabLevel; ++i)
fprintf(outStream, "\t");