removed warnings

blackjack.conf

@@ -1,4 +1,4 @@
 flat_bet = 1
-max_bet = 2
-arranged_cards = 5,0,7,10
+# max_bet = 2
+arranged_cards = 2,4,11,1,7
 

src/base.h

@@ -46,7 +46,6 @@ enum class DealerAction {
   AskForPlay,
   MoveOnToNextHand,
   HitDealerHand,
-  Payout
 };
 
 enum class PlayerActionRequired {

src/blackjack.cpp

@@ -129,7 +129,7 @@ void Blackjack::deal(Player *player) {
         shuffle();        
           
         // burn as many cards as asked
-        for (int i = 0; i < number_of_burnt_cards; i++) {
+        for (unsigned int i = 0; i < number_of_burnt_cards; i++) {
           drawCard();
         }
         lastPass = false;
@@ -147,14 +147,10 @@ void Blackjack::deal(Player *player) {
       
     break;
     
-    
-    // -------------------------------------------------------------------------  
     case DealerAction::AskForBets:
-      // step 1. ask for bets
-      player->actionRequired = PlayerActionRequired::Bet;
-      return;
     break;
-
+    
+    // -------------------------------------------------------------------------  
     case DealerAction::DealPlayerFirstCard:
       // where's step 2? <- probably that's the player's bet
       // step 3. deal the first card to each player
@@ -210,13 +206,10 @@ void Blackjack::deal(Player *player) {
       return;
     break;
  
-    // TODO: ver esto
-/*    
     case DealerAction::AskForInsurance:
-      std::cout << "next action do you want insurance?" << std::endl;  
       return;
     break;
-*/    
+
     case DealerAction::CheckforBlackjacks:
       // step 8. check if there are any blackjack
       playerBlackack = player->currentHand->blackjack();
@@ -331,9 +324,9 @@ void Blackjack::deal(Player *player) {
 
       // hit if count is less than 17 (or equalt to soft 17 if hit_soft_17 is true)
       dealerTotal = hand.total();
-      while (((abs(dealerTotal) < 17 || (hit_soft_17 && dealerTotal == -17))) && hand.busted() == 0) {
+      while ((std::abs(dealerTotal) < 17 || (hit_soft_17 && dealerTotal == -17)) && hand.busted() == 0) {
         unsigned int dealerCard = drawCard(&hand);
-        player->info(Info::CardDealer, dealerTotal);
+        player->info(Info::CardDealer, dealerCard);
 
         dealerTotal = std::abs(hand.total());
 
@@ -356,7 +349,7 @@ void Blackjack::deal(Player *player) {
         } else {
           for (auto playerHand : player->hands) {
             if (playerHand.busted() == false) {  // busted hands have already been solved
-              unsigned int playerTotal = std::abs(playerHand.total());
+              playerTotal = std::abs(playerHand.total());
             
               if (dealerTotal > playerTotal) {
                   

src/conf.cpp

@@ -69,9 +69,9 @@ Configuration::Configuration(int argc, char **argv) {
     {NULL, 0, NULL, 0}
   };
 
-  int i, optc;
+  int optc = 0;
   int option_index = 0;
-  int opterr = 0;
+//  int opterr = 0;
   while ((optc = getopt_long_only(argc, argv, "c:hvd:n:if:", longopts, &option_index)) != -1) {
     switch (optc) {
       case 'h':
@@ -106,7 +106,13 @@ Configuration::Configuration(int argc, char **argv) {
           std::string line(argv[optind - 1]);
           std::size_t delimiterPos = line.find("=");
           if (delimiterPos != std::string::npos) {
-            auto name = line.substr(0, delimiterPos);
+            std::size_t offset = 0;  
+            if (line.substr(0, 2) == "--") {
+              offset = 2;
+            } else if (line.substr(0, 1) == "-") {
+              offset = 1;
+            }
+            auto name = line.substr(offset, delimiterPos-offset);
             auto value = line.substr(delimiterPos + 1);
             data[name] = value;
           } else {
@@ -191,12 +197,13 @@ int Configuration::readConfigFile(std::string filePath, bool mandatory) {
 bool Configuration::set(bool *value, std::list<std::string> key) {
   for (auto it : key) {
     if (exists(*(&it))) {
-      if (data[*(&it)] == "true") {
+      auto s = data[*(&it)];
+      if (s == "true" || s == "yes" || s == "y") {
         *value = true;  
-      } else if (data[*(&it)] == "false") {
+      } else if (s == "false" || s == "no" || s == "n") {
         *value = false; 
       } else {
-        *value = std::stoi(data[*(&it)]);
+        *value = std::stoi(s);
       }
       return true;
     }

src/main.cpp

@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
 
   
   // let the action begin!
-  int unknownCommands = 0;
+  unsigned int unknownCommands = 0;
   dealer->nextAction = DealerAction::StartNewHand;
   while (!dealer->finished()) {
     dealer->deal(player);

src/tty.cpp

@@ -43,7 +43,6 @@
 std::vector<std::string> commands;
 
 
-
 // trim from start (in place)
 static inline void ltrim(std::string &s) {
     s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
@@ -67,6 +66,9 @@ static inline void trim(std::string &s) {
 
 Tty::Tty(Configuration &conf) {
     
+  Libreblackjack::shortversion();
+//   Libreblackjack::copyright();
+
   conf.set(&flat_bet, {"flat_bet", "flatbet"});  
   conf.set(&no_insurance, {"no_insurance", "dont_insure"});  
 
@@ -76,13 +78,31 @@ Tty::Tty(Configuration &conf) {
     commands.push_back("stand");
     commands.push_back("double");
     commands.push_back("split");
+    commands.push_back("pair");
     commands.push_back("yes");
     commands.push_back("no");
     commands.push_back("quit");
   }
   
-  // TODO: check conf for colors
+  if (conf.exists("color")) {
+    conf.set(&color, {"color"});
+  }
+  
+  if (color) {
+    black   = "\x1B[0m";
+    red     = "\x1B[31m";
+    green   = "\x1B[32m";
+    yellow  = "\x1B[33m";
+    blue    = "\x1B[34m";
+    magenta = "\x1B[35m";
+    cyan    = "\x1B[36m";
+    white   = "\x1B[37m";
+    reset   = "\033[0m";
+  }
+  
   prompt = cyan + " > " + reset;
+  
+  return;
 }
 
 void Tty::info(Info msg, int intData) {
@@ -222,13 +242,15 @@ void Tty::info(Info msg, int intData) {
       std::cout << "help yourself" << std::endl;        
     break;
     
-          
-
     
     case Info::Bye:
 //      s = "bye";  
       s = "Bye bye! We'll play Blackjack again next time.";
     break;
+    
+    case Info::None:
+    break;
+    
   }
   
   if (delay > 0) {
@@ -256,6 +278,10 @@ int Tty::play() {
       renderTable();  
       s = "Play?";
     break;  
+    
+    case PlayerActionRequired::None:
+    break;
+    
   }
   
   if (s != "") {
@@ -318,7 +344,6 @@ int Tty::play() {
         break;
 
         case PlayerActionRequired::Play:
-
           // TODO: sort by higher-expected response first
                  if (command == "h" || command =="hit") {
             actionTaken = PlayerActionTaken::Hit;
@@ -332,6 +357,10 @@ int Tty::play() {
             actionTaken = PlayerActionTaken::None;
           }
         break;
+        
+        case PlayerActionRequired::None:
+        break;
+        
       }
     }
       
@@ -373,7 +402,7 @@ void Tty::renderTable(void) {
 
 void Tty::renderHand(Hand *hand) {
 
-  for (auto it : hand->cards) {
+  for (unsigned int i = 0; i < hand->cards.size(); i++) {
     std::cout << " _____   ";
   }
   std::cout << std::endl;
@@ -448,7 +477,7 @@ char *Tty::rl_command_generator(const char *text, int state) {
     len = strlen(text);
   }
 
-  for (auto i = list_index; i < commands.size(); i++) {
+  for (unsigned int i = list_index; i < commands.size(); i++) {
     if (commands[i].compare(0, len, text) == 0) {
       list_index = i+1;
       return strdup(commands[i].c_str());

src/tty.h

@@ -56,15 +56,16 @@ class Tty : public Player {
     
     int delay = 200;
     
-    std::string black   = "\x1B[0m";
-    std::string red     = "\x1B[31m";
-    std::string green   = "\x1B[32m";
-    std::string yellow  = "\x1B[33m";
-    std::string blue    = "\x1B[34m";
-    std::string magenta = "\x1B[35m";
-    std::string cyan    = "\x1B[36m";
-    std::string white   = "\x1B[37m";
-    std::string reset   = "\033[0m";
+    bool color = true;
+    std::string black;
+    std::string red;
+    std::string green;
+    std::string yellow;
+    std::string blue;
+    std::string magenta;
+    std::string cyan;
+    std::string white;
+    std::string reset;
       
 };
 #endif

src/version.cpp

@@ -20,6 +20,7 @@
  *------------------- ------------  ----    --------  --     -       -         -
  */
 #include <iostream>
+#include <cstring>
 #include "version-vcs.h"
 
 #define ENGINE  "a free & open blackjack engine\n"
@@ -30,7 +31,7 @@ void shortversion(void) {
 
   std::cout << "LibreBlackjack ";  
 #ifdef LIBREBLACKJACK_VCS_BRANCH
-  std::cout << LIBREBLACKJACK_VCS_VERSION << ((LIBREBLACKJACK_VCS_CLEAN == 0) ? "" : "+Δ") << ((LIBREBLACKJACK_VCS_BRANCH != "master") ? LIBREBLACKJACK_VCS_BRANCH : "") << std::endl;
+  std::cout << LIBREBLACKJACK_VCS_VERSION << ((LIBREBLACKJACK_VCS_CLEAN == 0) ? "" : "+Δ") << ((strcmp(LIBREBLACKJACK_VCS_BRANCH, "master") == 0) ? LIBREBLACKJACK_VCS_BRANCH : "") << std::endl;
 #else
   std::cout << PACKAGE_VERSION << std::endl;
 #endif