[Eliot-dev] eliot/utils eliottxt.cpp game_io.cpp ncurses.cpp

[eliot-dev]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Branch:         
Changes by:     Antoine Fraboulet <address@hidden>      05/12/26 23:35:03

Modified files:
        utils          : eliottxt.cpp game_io.cpp ncurses.cpp 

Log message:
        - use of History class

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/utils/eliottxt.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/utils/game_io.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/utils/ncurses.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: eliot/utils/eliottxt.cpp
diff -u eliot/utils/eliottxt.cpp:1.9 eliot/utils/eliottxt.cpp:1.10
--- eliot/utils/eliottxt.cpp:1.9        Sat Nov  5 23:22:42 2005
+++ eliot/utils/eliottxt.cpp    Mon Dec 26 23:35:03 2005
@@ -320,7 +320,7 @@
             GameIO::printAllPoints(cout, iGame);
             break;
         case 't':
-            GameIO::printPlayedRack(cout, iGame, iGame.getNTurns());
+            GameIO::printPlayedRack(cout, iGame, iGame.getHistory().getSize());
             break;
         case 'T':
             GameIO::printAllRacks(cout, iGame);
Index: eliot/utils/game_io.cpp
diff -u eliot/utils/game_io.cpp:1.5 eliot/utils/game_io.cpp:1.6
--- eliot/utils/game_io.cpp:1.5 Sat Nov  5 15:48:59 2005
+++ eliot/utils/game_io.cpp     Mon Dec 26 23:35:03 2005
@@ -180,19 +180,22 @@
 
 static void searchResultLine(ostream &out, const Training &iGame, int num)
 {
-    string word = iGame.getSearchedWord(num);
+    const Results &res = iGame.getResults();
+    Round r = res.get(num);
+    string word = r.getWord();
     if (word.size() == 0)
         return;
     out << word << string(16 - word.size(), ' ')
-        << (iGame.getSearchedBonus(num) ? '*' : ' ')
-        << setw(4) << iGame.getSearchedPoints(num)
-        << ' ' << iGame.getSearchedCoords(num);
+        << (r.getBonus() ? '*' : ' ')
+        << setw(4) << r.getPoints()
+        << ' ' << r.getCoord().toString();
 }
 
 
 void GameIO::printSearchResults(ostream &out, const Training &iGame, int num)
 {
-    for (int i = 0; i < num && i < iGame.getNResults(); i++)
+    int size = (int) iGame.getResults().size();
+    for (int i = 0; i < num && i < size; i++)
     {
         out << setw(3) << i + 1 << ": ";
         searchResultLine(out, iGame, i);
Index: eliot/utils/ncurses.cpp
diff -u eliot/utils/ncurses.cpp:1.16 eliot/utils/ncurses.cpp:1.17
--- eliot/utils/ncurses.cpp:1.16        Sat Nov  5 23:22:42 2005
+++ eliot/utils/ncurses.cpp     Mon Dec 26 23:35:03 2005
@@ -209,7 +209,7 @@
 
     // Display a message when the search is complete
     if (m_game->getMode() == Game::kTRAINING &&
-        static_cast<Training*>(m_game)->getNResults())
+        static_cast<Training*>(m_game)->getHistory().getSize())
     {
         mvwprintw(win, y + 2*yOff - 1, x + 2, _("Search complete"));
     }
@@ -228,17 +228,19 @@
     drawBox(win, y, x, h, 25, _(" Search results "));
     m_boxY = y + 1;
     m_boxLines = h - 2;
-    m_boxLinesData = tr_game->getNResults();
+    m_boxLinesData = tr_game->getHistory().getSize();
 
     int i;
-    for (i = m_boxStart; i < tr_game->getNResults() &&
+    const Results& res = tr_game->getResults();
+    for (i = m_boxStart; i < res.size() &&
                          i < m_boxStart + m_boxLines; i++)
     {
-        string coord = tr_game->getSearchedCoords(i);
+        const Round &r = res.get(i);
+        string coord = r.getCoord().toString();
         boxPrint(win, i, x + 1, "%3d %s%s %3s",
-                 tr_game->getSearchedPoints(i),
-                 tr_game->getSearchedWord(i).c_str(),
-                 string(h - 3 - tr_game->getSearchedWord(i).size(), ' 
').c_str(),
+                 r.getPoints(),
+                 r.getWord().c_str(),
+                 string(h - 3 - r.getWordLen(), ' ').c_str(),
                  coord.c_str());
     }
     // Complete the list with empty lines, to avoid trails
@@ -257,7 +259,7 @@
     drawBox(win, y, x, LINES - y, COLS - x, _(" History of the game "));
     m_boxY = y + 1;
     m_boxLines = LINES - y - 2;
-    m_boxLinesData = m_game->getNTurns();
+    m_boxLinesData = m_game->getHistory().getSize();
 
     // Heading
     boxPrint(win, m_boxStart, x + 2,
@@ -265,18 +267,19 @@
     mvwhline(win, y + 2, x + 2, ACS_HLINE, 55);
 
     int i;
-    for (i = m_boxStart + 0; i < m_game->getNTurns() &&
+    for (i = m_boxStart + 0; i < m_game->getHistory().getSize() &&
                          i < m_boxStart + m_boxLines; i++)
     {
-        string word = m_game->getPlayedWord(i);
-        string coord = m_game->getPlayedCoords(i);
+        const Turn& t = m_game->getHistory().getTurn(i);
+       const Round& r = t.getRound();
+        string word = r.getWord();
+        string coord = r.getCoord().toString();
         boxPrint(win, i + 2, x + 2,
                  "%2d   %8s   %s%s   %3s   %3d   %1d   %c",
-                 i + 1, m_game->getPlayedRack(i).c_str(), word.c_str(),
+                 i + 1, t.getPlayedRack().toString().c_str(), word.c_str(),
                  string(15 - word.size(), ' ').c_str(),
-                 coord.c_str(), m_game->getPlayedPoints(i),
-                 m_game->getPlayedPlayer(i),
-                 m_game->getPlayedBonus(i) ? '*' : ' ');
+                 coord.c_str(), r.getPoints(),
+                t.getPlayer(), r.getBonus() ? '*' : ' ');
     }
     mvwvline(win, y + 1, x + 5,  ACS_VLINE, min(i + 2 - m_boxStart, 
m_boxLines));
     mvwvline(win, y + 1, x + 16, ACS_VLINE, min(i + 2 - m_boxStart, 
m_boxLines));