Skip to content

Commit

Permalink
Форматирование: заменил отступы на три пробела.
Browse files Browse the repository at this point in the history
  • Loading branch information
ozkriff committed Jun 12, 2012
1 parent 6f93068 commit 7246aea
Show file tree
Hide file tree
Showing 21 changed files with 264 additions and 264 deletions.
4 changes: 2 additions & 2 deletions aichooser.cpp
Expand Up @@ -5,10 +5,10 @@
#include "movepass.h"

AiChooser::AiChooser()
: NextBrickChooser()
: NextBrickChooser()
{
}

Move* AiChooser::do_move() {
return new MovePass();
return new MovePass();
}
4 changes: 2 additions & 2 deletions aichooser.h
Expand Up @@ -7,8 +7,8 @@

class AiChooser : public NextBrickChooser {
public:
AiChooser();
virtual Move* do_move();
AiChooser();
virtual Move* do_move();
};

#endif /* AICHOOSER_H_ */
46 changes: 23 additions & 23 deletions brick.cpp
Expand Up @@ -4,40 +4,40 @@
#include <cstdio>

void Brick::print_no_rot(int a, int b) {
// const char *s = "(%i|%i)";
// const char *s = "[%i:%i]";
const char *s = "%i-%i";
printf(s, a, b);
// const char *s = "(%i|%i)";
// const char *s = "[%i:%i]";
const char *s = "%i-%i";
printf(s, a, b);
}

Brick::Brick(int left, int right, bool is_rotated)
: is_rotated(is_rotated),
left(left),
right(right)
: is_rotated(is_rotated),
left(left),
right(right)
{
}

void Brick::print() {
if (is_rotated) {
print_no_rot(left, right);
} else {
print_no_rot(right, left);
}
if (is_rotated) {
print_no_rot(left, right);
} else {
print_no_rot(right, left);
}
}

bool Brick::can_connect(const Brick *brick) {
return left == brick->left
|| left == brick->right
|| right == brick->left
|| right == brick->right;
return left == brick->left
|| left == brick->right
|| right == brick->left
|| right == brick->right;
}

void print_bricks_list(const BricksList *list) {
for (BricksList::const_iterator it = list->begin();
it != list->end(); ++it)
{
(*it)->print();
putchar(' ');
}
putchar('\n');
for (BricksList::const_iterator it = list->begin();
it != list->end(); ++it)
{
(*it)->print();
putchar(' ');
}
putchar('\n');
}
14 changes: 7 additions & 7 deletions brick.h
Expand Up @@ -7,15 +7,15 @@

class Brick {
private:
void print_no_rot(int a, int b);
void print_no_rot(int a, int b);
public:
bool is_rotated;
int left;
int right;
bool is_rotated;
int left;
int right;
public:
Brick(int left, int right, bool is_rotated = false);
void print();
bool can_connect(const Brick *brick);
Brick(int left, int right, bool is_rotated = false);
void print();
bool can_connect(const Brick *brick);
};

typedef std::list<Brick*> BricksList;
Expand Down
2 changes: 1 addition & 1 deletion dominoes.cpp
Expand Up @@ -4,5 +4,5 @@
#include "misc.h"

int main(int /*ac*/, char ** /*av*/) {
return Game().run();
return Game().run();
}
132 changes: 66 additions & 66 deletions game.cpp
Expand Up @@ -11,90 +11,90 @@
#include "misc.h"

void Game::generate_bricks() {
for (int left = 0; left <= 6; ++left) {
for (int right = 0; right <= left; ++right) {
all_bricks->push_front(new Brick(left, right));
}
}
{
std::vector<Brick*> tmp(all_bricks->begin(), all_bricks->end());
std::random_shuffle(tmp.begin(), tmp.end());
std::copy(tmp.begin(), tmp.end(), all_bricks->begin());
}
for (int left = 0; left <= 6; ++left) {
for (int right = 0; right <= left; ++right) {
all_bricks->push_front(new Brick(left, right));
}
}
{
std::vector<Brick*> tmp(all_bricks->begin(), all_bricks->end());
std::random_shuffle(tmp.begin(), tmp.end());
std::copy(tmp.begin(), tmp.end(), all_bricks->begin());
}
#if 1
print_bricks_list(all_bricks);
print_bricks_list(all_bricks);
#endif
}

int Game::get_players_count() {
int players_count;
do {
printf("Еnter players count (2 or 4): ");
scanf("%i", &players_count);
} while (players_count != 4 && players_count != 2);
return players_count;
int players_count;
do {
printf("Еnter players count (2 or 4): ");
scanf("%i", &players_count);
} while (players_count != 4 && players_count != 2);
return players_count;
}

void Game::get_players() {
int players_count = get_players_count();
for (int i = 0; i < players_count; ++i) {
printf("Is player %i - ai? (y/n) ", i);
char answer[10];
scanf("%9s", answer);
NextBrickChooser *chooser;
if (strcmp(answer, "y") == 0) {
chooser = new AiChooser();
} else if(strcmp(answer, "n") == 0) {
chooser = new HumanChooser();
} else {
// TODO
die("'%s'?!?!? [y] OR [n]!\n", answer);
}
players->push_back(new Player(this, chooser));
}
int players_count = get_players_count();
for (int i = 0; i < players_count; ++i) {
printf("Is player %i - ai? (y/n) ", i);
char answer[10];
scanf("%9s", answer);
NextBrickChooser *chooser;
if (strcmp(answer, "y") == 0) {
chooser = new AiChooser();
} else if(strcmp(answer, "n") == 0) {
chooser = new HumanChooser();
} else {
// TODO
die("'%s'?!?!? [y] OR [n]!\n", answer);
}
players->push_back(new Player(this, chooser));
}
}

Game::Game()
: snake(new Snake),
players(new PlayersList),
moves(new MovesList),
all_bricks(new BricksList)
: snake(new Snake),
players(new PlayersList),
moves(new MovesList),
all_bricks(new BricksList)
{
get_players();
get_players();
}

Game::~Game() {
}

int Game::run() {
generate_bricks();
for (PlayersList::iterator it = players->begin();
it != players->end(); ++it)
{
int bricks_num = 5;
for (int i = 0; i < bricks_num; ++i) {
Brick *b = all_bricks->front();
(*it)->bricks.push_back(b);
all_bricks->pop_front();
}
}
generate_bricks();
for (PlayersList::iterator it = players->begin();
it != players->end(); ++it)
{
int bricks_num = 5;
for (int i = 0; i < bricks_num; ++i) {
Brick *b = all_bricks->front();
(*it)->bricks.push_back(b);
all_bricks->pop_front();
}
}
#if 1
for (PlayersList::iterator pi = players->begin();
pi != players->end(); ++pi)
{
print_bricks_list(&(*pi)->bricks);
}
for (PlayersList::iterator pi = players->begin();
pi != players->end(); ++pi)
{
print_bricks_list(&(*pi)->bricks);
}
#endif
while (1) {
for (PlayersList::iterator it = players->begin();
it != players->end(); ++it)
{
Move *move = (*it)->do_move();
if (!move)
die("BAD MOVE!!!\n");
printf("move type %i\n", move->get_type());
moves->push_back(move);
}
}
return EXIT_SUCCESS;
while (1) {
for (PlayersList::iterator it = players->begin();
it != players->end(); ++it)
{
Move *move = (*it)->do_move();
if (!move)
die("BAD MOVE!!!\n");
printf("move type %i\n", move->get_type());
moves->push_back(move);
}
}
return EXIT_SUCCESS;
}
20 changes: 10 additions & 10 deletions game.h
Expand Up @@ -10,19 +10,19 @@

class Game {
public:
Snake *snake;
Snake *snake;
private:
PlayersList *players;
MovesList *moves;
BricksList *all_bricks;
PlayersList *players;
MovesList *moves;
BricksList *all_bricks;
private:
void generate_bricks();
int get_players_count();
void get_players();
void generate_bricks();
int get_players_count();
void get_players();
public:
Game();
~Game();
int run();
Game();
~Game();
int run();
};

#endif /* GAME_H_ */

0 comments on commit 7246aea

Please sign in to comment.