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

Forgot to test compilation, made it happen...

Browse Source
This commit is contained in:
Anna Rose 2011-06-24 10:19:41 -04:00
parent 3a3132e44a
commit 5205b9dfab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamedata.cpp
View File

@ -57,7 +57,7 @@ bool GameData::add_vertex(int x, int y, int r, int colour)
if ((player == PLAYER1 && !player1_played) || if ((player == PLAYER1 && !player1_played) ||
(player == PLAYER2 && !player2_played)) (player == PLAYER2 && !player2_played))
{ {
Graph::add_vertex(x, y, r, colour); Graph::add_vertex(x, y, r, colour, 10);
if (player == PLAYER1) player1_played = true; if (player == PLAYER1) player1_played = true;
if (player == PLAYER2) player2_played = true; if (player == PLAYER2) player2_played = true;
toggle_turn(); toggle_turn();
@ -66,7 +66,7 @@ bool GameData::add_vertex(int x, int y, int r, int colour)
return false; return false;
} }
if (Graph::add_vertex(x, y, r, colour, current)) if (Graph::add_vertex(x, y, r, colour, 10, current))
{ {
clear_current_vertex(); clear_current_vertex();
toggle_turn(); toggle_turn();

1
gamedata.h
View File

@ -10,6 +10,7 @@
enum Turn {PLAYER1, PLAYER2, WIN1, WIN2}; enum Turn {PLAYER1, PLAYER2, WIN1, WIN2};
class GameData : public Graph class GameData : public Graph
{ {
public: public:

3
graph.cpp
View File

@ -113,10 +113,11 @@ bool Graph::add_vertex(int x, int y, int r, int colour, int score, Vertex* src)
} }
Vertex::Vertex(int x, int y, int r, int colour) Vertex::Vertex(int x, int y, int r, int colour, int score)
{ {
this->x = x; this->x = x;
this->y = y; this->y = y;
this->r = r; this->r = r;
this->colour = colour; this->colour = colour;
this->score = score;
} }