[Eliot-dev] Changes to eliot/game/game_factory.cpp [antoine-1]

[eliot-dev]

Index: eliot/game/game_factory.cpp
diff -u eliot/game/game_factory.cpp:1.5.2.1 eliot/game/game_factory.cpp:1.5.2.2
--- eliot/game/game_factory.cpp:1.5.2.1 Sun Oct 23 17:16:24 2005
+++ eliot/game/game_factory.cpp Sun Oct 23 18:44:43 2005
@@ -2,7 +2,7 @@
  * Copyright (C) 2005 Eliot
  * Authors: Olivier Teuliere  <address@hidden>
  *
- * $Id: game_factory.cpp,v 1.5.2.1 2005/10/23 17:16:24 afrab Exp $
+ * $Id: game_factory.cpp,v 1.5.2.2 2005/10/23 18:44:43 afrab Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -173,12 +173,9 @@
         return NULL;
     }
 
-<<<<<<< game_factory.cpp
+
 #if 0
     // 4) Add the players
-=======
-    // 5) Add the players
->>>>>>> 1.5
     for (int i = 0; i < m_human; i++)
         game->addHumanPlayer();
     for (int i = 0; i < m_ai; i++)
@@ -201,7 +198,6 @@
 
 void GameFactory::printUsage(const std::string &iBinaryName) const
 {
-<<<<<<< game_factory.cpp
     std::cout << "Usage: " << iBinaryName << " [options]\n"
              << "\n"
              << "  -h, --help               Print this help and exit\n"
@@ -212,18 +208,6 @@
              << "      --human              Add a human player\n"
              << "      --ai                 Add a AI (Artificial Intelligence) 
player\n"
              << "      --joker              Play with the \"Joker game\" 
variant\n";
-=======
-    cout << "Usage: " << iBinaryName << " [options]\n"
-         << "Options:\n"
-         << "  -h, --help               Print this help and exit\n"
-         << "  -v, --version            Print version information and exit\n"
-         << "  -m, --mode {duplicate,d,freegame,f,training,t}\n"
-         << "                           Choose game mode (mandatory)\n"
-         << "  -d, --dict <string>      Choose a dictionary (mandatory)\n"
-         << "      --human              Add a human player\n"
-         << "      --ai                 Add a AI (Artificial Intelligence) 
player\n"
-         << "      --joker              Play with the \"Joker game\" 
variant\n";
->>>>>>> 1.5
 }