annabunches/treewars
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up some debugging code

Browse Source
This commit is contained in:
Anna Rose 2011-06-28 22:14:55 -04:00
parent 7e17865c2a
commit 8550b0f8f1
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debug.h
View File

@ -2,11 +2,24 @@
#define _DEBUG_H_
#ifdef DEBUG
#include <iostream>
#include <cstdio>
#include <string>
using std::fprintf;
using std::cerr;
using std::endl;
using std::fprintf;
#endif
using std::string;
#endif
inline void debug(string msg)
{
#ifdef DEBUG
cerr << "debug: " << msg << endl;
#endif
return;
}
#endif

4
game.cpp
View File

@ -27,9 +27,7 @@ bool Game::init()
if (background == NULL)
{
#ifdef DEBUG
std::cerr << "debug: Game::init(): error: Couldn't load background image\n";
#endif
debug("Game::init(): error: Couldn't load background image");
return false;
}

12
gamedata.cpp
View File

@ -93,8 +93,8 @@ bool GameData::add_vertex(int x, int y, int r, int colour)
{
Graph::add_vertex(x, y, r, colour, 10);
#ifdef DEBUG
fprintf(stderr, "debug: GameData::add_vertex(): strength=%2.f\n",
calculate_strength(*(vertices.rbegin())));
fprintf(stderr, "debug: GameData::add_vertex(): strength=%2.f\n",
calculate_strength(*(vertices.rbegin())));
#endif
if (player == PLAYER1) player1_played = true;
if (player == PLAYER2) player2_played = true;
@ -225,17 +225,13 @@ bool GameData::endgame()
if (get_colour(PLAYER1_COLOUR).empty())
{
player = WIN2;
#ifdef DEBUG
fprintf(stderr, "debug: Gamedata::endgame(): player 2 wins\n");
#endif
debug("Gamedata::endgame(): player 2 wins\n");
return true;
}
if (get_colour(PLAYER2_COLOUR).empty())
{
player = WIN1;
#ifdef DEBUG
fprintf(stderr, "debug: Gamedata::endgame(): player 1 wins\n");
#endif
debug("Gamedata::endgame(): player 1 wins\n");
return true;
}

2
graph.cpp
View File

@ -101,7 +101,7 @@ bool Graph::add_vertex(int x, int y, int r, int colour, int score, Vertex* src)
if (planar && crosses_edge(v, src))
{
#ifdef DEBUG
fprintf(stderr, "debug: Graph::add_vertex(): failed to add due to edge collision: x1=%d, y1=%d, x2=%d, y2=%d\n", v->x, v->y, src->x, src->y);
fprintf(stderr, "debug: Graph::add_vertex(): failed to add due to edge collision: x1=%d, y1=%d, x2=%d, y2=%d\n", v->x, v->y, src->x, src->y);
#endif
delete v;
return false;

8
titlescreen.cpp
View File

@ -25,9 +25,7 @@ bool TitleScreen::init()
if (background == NULL)
{
#ifdef DEBUG
std::cerr << "debug: TitleScreen::init(): error: Couldn't load background image\n";
#endif
debug("TitleScreen::init(): error: Couldn't load background image");
return false;
}
@ -35,9 +33,7 @@ bool TitleScreen::init()
if (title_banner == NULL)
{
#ifdef DEBUG
std::cerr << "debug: TitleScreen::init(): error: Couldn't load title banner\n";
#endif
debug("TitleScreen::init(): error: Couldn't load title banner");
return false;
}
}