CVSROOT: /cvsroot/eliot
Module name: eliot
Branch:
Changes by: Olivier Teulière <address@hidden> 05/12/27 13:11:17
Modified files:
game : game.cpp training.cpp
Log message:
- Commented out some debug messages preventing the regression to work
properly.
- Re-indented a few lines to remove tabulations and keep a consistent
coding style
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/game/game.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/game/training.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: eliot/game/game.cpp
diff -u eliot/game/game.cpp:1.25 eliot/game/game.cpp:1.26
--- eliot/game/game.cpp:1.25 Tue Dec 27 01:06:54 2005
+++ eliot/game/game.cpp Tue Dec 27 13:11:17 2005
@@ -419,10 +419,10 @@
if (n < 0)
{
- debug("Game::back negative argument\n");
- n = -n;
+// debug("Game::back negative argument\n");
+ n = -n;
}
- debug("Game::back %d\n",n);
+// debug("Game::back %d\n",n);
for (i = 0; i < n; i++)
{
if (m_history.getSize() > 0)
@@ -430,7 +430,7 @@
prevPlayer();
player = m_players[m_currPlayer];
const Round &lastround = m_history.getPreviousTurn().getRound();
- debug("Game::back last round %s\n",lastround.toString().c_str());
+// debug("Game::back last round
%s\n",lastround.toString().c_str());
/* Remove the word from the board, and put its letters back
* into the bag */
m_board.removeRound(*m_dic, lastround);
@@ -447,8 +447,8 @@
/* Remove the points of this round */
player->addPoints(- lastround.getPoints());
m_points -= lastround.getPoints();
- /* Remove the turns */
- player->removeLastTurn();
+ /* Remove the turns */
+ player->removeLastTurn();
m_history.removeLastTurn();
}
else
Index: eliot/game/training.cpp
diff -u eliot/game/training.cpp:1.13 eliot/game/training.cpp:1.14
--- eliot/game/training.cpp:1.13 Mon Dec 26 22:53:26 2005
+++ eliot/game/training.cpp Tue Dec 27 13:11:17 2005
@@ -64,9 +64,9 @@
m_results.clear();
uLetters = iLetters;
for(it = uLetters.begin(); it != uLetters.end(); it ++)
- {
- *it = toupper(*it);
- }
+ {
+ *it = toupper(*it);
+ }
res = helperSetRackManual(p, iCheck, uLetters);
// 0 : ok
// 1 : not enough tiles
@@ -78,17 +78,17 @@
{
int res = 0;
switch(iMode)
- {
- case RACK_MANUAL:
- res = setRackManual(iCheck, iLetters);
- break;
- case RACK_ALL:
- res = setRackRandom(m_currPlayer, iCheck, iMode);
- break;
- case RACK_NEW:
- res = setRackRandom(m_currPlayer, iCheck, iMode);
- break;
- }
+ {
+ case RACK_MANUAL:
+ res = setRackManual(iCheck, iLetters);
+ break;
+ case RACK_ALL:
+ res = setRackRandom(m_currPlayer, iCheck, iMode);
+ break;
+ case RACK_NEW:
+ res = setRackRandom(m_currPlayer, iCheck, iMode);
+ break;
+ }
return res;
}
@@ -140,7 +140,7 @@
// Search for the current player
Rack r;
m_players[m_currPlayer]->getCurrentRack().getRack(r);
- debug("Training::search for %s\n",r.toString().c_str());
+// debug("Training::search for %s\n",r.toString().c_str());
m_results.search(*m_dic, m_board, r, m_history.getSize());
}
_______________________________________________
Eliot-dev mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/eliot-dev