[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/game/game.h
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/game/game.h |
Date: |
Fri, 04 Nov 2005 18:26:06 -0500 |
Index: eliot/game/game.h
diff -u eliot/game/game.h:1.18 eliot/game/game.h:1.19
--- eliot/game/game.h:1.18 Fri Nov 4 20:00:06 2005
+++ eliot/game/game.h Fri Nov 4 23:26:03 2005
@@ -41,14 +41,6 @@
*************************/
#define IDENT_STRING "Eliot"
-/*************************
- * Dimensions of the board, the tiles placed on
- * the board can be accessed via getBoardChar()
- *************************/
-#define BOARD_MIN 1
-#define BOARD_MAX 15
-
-
/**
* Parent class of all the Game types.
* It offers the common attributes (Board, Bag, etc...) as well as useful
@@ -77,6 +69,9 @@
kJOKER // Joker game
};
+ const Board& getBoard() const { return m_board; }
+ const Bag& getBag() const { return m_bag; }
+
/**
* Accessors for the variant of the game.
* The variant can be changed during a game without any problem
@@ -109,28 +104,6 @@
int back(int);
/*************************
- * int coordinates have to be BOARD_MIN <= int <= BOARD_MAX
- *
- * getBoardChar returns an upper case letter
- * for normal tiles and a lower case letter for jokers.
- *
- * getBoardCharAttr tells the attributes of the tile
- * 0 : normal played tile
- * 1 : joker tile
- * 2 : test tile for preview purpose
- * attributes can be combined with the or (|) operator
- *************************/
-#define ATTR_NORMAL 0
-#define ATTR_JOKER 1
-#define ATTR_TEST 2
-
- char getBoardChar (int iRow, int iCol) const;
- int getBoardCharAttr(int iRow, int iCol) const;
-
- int getBoardWordMultiplier (int iRow, int iCol) const;
- int getBoardLetterMultiplier(int iRow, int iCol) const;
-
- /*************************
* Set the rack for searching
*
* The int parameter is a boolean, if this parameter
@@ -148,13 +121,6 @@
*************************/
static const int RACK_SIZE;
typedef enum {RACK_ALL, RACK_NEW} set_rack_mode;
-
- /*************************
- * Get the number of tiles available in the bag.
- * The parameter has to be
- * 'a' <= char <= 'z' or 'A' <= char <= 'Z' or '?'
- *************************/
- int getNCharInBag(const Tile&) const;
/**
* Methods to access already played words.