[Eliot-dev] eliot/game board.cpp game.h

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       09/03/12 18:56:26

Modified files:
        game           : board.cpp game.h 

Log message:
        Allow the first word to be vertical

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/game/board.cpp?cvsroot=eliot&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game.h?cvsroot=eliot&r1=1.49&r2=1.50

Patches:
Index: board.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/board.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- board.cpp   17 Jan 2009 14:57:32 -0000      1.22
+++ board.cpp   12 Mar 2009 18:56:25 -0000      1.23
@@ -353,8 +353,12 @@
     if (isolated && !m_isEmpty)
         return 5;
     // The first word must be horizontal
+    // Deactivated, as a vertical first word is allowed in free games,
+    // and possibly in duplicate games as well (it depends on the sources)
+#if 0
     if (m_isEmpty && iRound.getCoord().getDir() == Coord::VERTICAL)
         return 6;
+#endif
     // The first word must cover the H8 square
     if (m_isEmpty
         && (row != 8 || col > 8 || col + iRound.getWordLen() <= 8))

Index: game.h
===================================================================
RCS file: /cvsroot/eliot/eliot/game/game.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- game.h      24 Jan 2009 17:44:56 -0000      1.49
+++ game.h      12 Mar 2009 18:56:25 -0000      1.50
@@ -160,7 +160,7 @@
      *  7: invalid crosscheck
      *  8: word already present on the board (no new letter from the rack)
      *  9: isolated word (not connected to the rest)
-     * 10: first word not horizontal
+     * (10: first word not horizontal) <-- this one has been deactivated
      * 11: first word not covering the H8 square
      * 12: word going out of the board
      */