[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot/game bag.h game.h game_io.cpp [cppdic]
From: |
eliot-dev |
Subject: |
[Eliot-dev] eliot/game bag.h game.h game_io.cpp [cppdic] |
Date: |
Sat, 23 Dec 2006 16:48:33 +0000 |
CVSROOT: /sources/eliot
Module name: eliot
Branch: cppdic
Changes by: Olivier Teulière <ipkiss> 06/12/23 16:48:33
Modified files:
game : bag.h game.h game_io.cpp
Log message:
Cosmetic changes (backport from Head)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/game/bag.h?cvsroot=eliot&only_with_tag=cppdic&r1=1.8&r2=1.8.2.1
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game.h?cvsroot=eliot&only_with_tag=cppdic&r1=1.29.2.1&r2=1.29.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game_io.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.4&r2=1.4.2.1
Patches:
Index: bag.h
===================================================================
RCS file: /sources/eliot/eliot/game/bag.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- bag.h 1 Jan 2006 19:49:35 -0000 1.8
+++ bag.h 23 Dec 2006 16:48:33 -0000 1.8.2.1
@@ -47,7 +47,7 @@
/**
* Return how many tiles/vowels/consonants are available
- * Warning: nVowels(b) + nConsonants(b) != nTiles(b),
+ * Warning: b.nVowels() + b.nConsonants() != b.nTiles(),
* because of the jokers and the 'Y'.
*/
unsigned int nTiles() const { return m_ntiles; }
Index: game.h
===================================================================
RCS file: /sources/eliot/eliot/game/game.h,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -b -r1.29.2.1 -r1.29.2.2
--- game.h 15 Oct 2006 11:07:55 -0000 1.29.2.1
+++ game.h 23 Dec 2006 16:48:33 -0000 1.29.2.2
@@ -38,11 +38,6 @@
using namespace std;
-/*************************
- * Ident string used to identify saved Eliot games
- *************************/
-#define IDENT_STRING "Eliot"
-
/**
* Parent class of all the Game types.
* It offers the common attributes (Board, Bag, etc...) as well as useful
Index: game_io.cpp
===================================================================
RCS file: /sources/eliot/eliot/game/game_io.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- game_io.cpp 11 Aug 2006 22:14:49 -0000 1.4
+++ game_io.cpp 23 Dec 2006 16:48:33 -0000 1.4.2.1
@@ -486,12 +486,11 @@
void Game::gameSaveFormat_14(ostream &out) const
{
- int i;
char line[100];
- const char decal[]=" ";
+ const string decal = " ";
out << IDENT_STRING << endl << endl;
- for(i = 0; i < m_history.getSize(); i++)
+ for (int i = 0; i < m_history.getSize(); i++)
{
const Turn& turn = m_history.getTurn(i);
string rack =
convertToMb(turn.getPlayedRack().toString(PlayedRack::RACK_EXTRA));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot/game bag.h game.h game_io.cpp [cppdic],
eliot-dev <=