From 5f629a6301b4de3f7569737ffc6df7d0e9ad4713 Mon Sep 17 00:00:00 2001
From: TheHresvelgian <sigrunhog@hotmail.com>
Date: Wed, 27 Apr 2022 17:42:55 +0200
Subject: [PATCH] Organizing code
---
src/kode/Tournament.cpp | 41 ++++++++++++++++++++++++++++++++++++++++-
src/kode/Tournament.h | 4 ++--
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/kode/Tournament.cpp b/src/kode/Tournament.cpp
index 742fb43..932e860 100644
--- a/src/kode/Tournament.cpp
+++ b/src/kode/Tournament.cpp
@@ -49,9 +49,47 @@ void Tournament::startNewTournament()
void Tournament::enterResults()
{
+ cout << endl << "Enter results for round " << currentRound;
for (int i = 0; i < nrOfTables; ++i)
{
+ int answer;
+ cout << endl << "Enter results for table " << i << "with "
+ << playerList[searchByID(white[i],1)]->lastName
+ << " as white and "
+ << playerList[searchByID(black[i],1)]->lastName
+ << " as black."
+ << endl << "1: white victory"
+ << endl << "2: black victory"
+ << endl << "3: draw";
+ answer = lesInt("\nResult: ",1,3);
+ switch (answer)
+ {
+ case 1:
+ playerList[searchByID(white[i],1)]->results.push_back(2);
+ playerList[searchByID(black[i],1)]->results.push_back(0);
+ break;
+ case 2:
+ playerList[searchByID(white[i],1)]->results.push_back(0);
+ playerList[searchByID(black[i],1)]->results.push_back(2);
+ break;
+ case 3:
+ playerList[searchByID(white[i],1)]->results.push_back(1);
+ playerList[searchByID(black[i],1)]->results.push_back(1);
+ break;
+ default:
+ cout << "Error!";
+ break;
+ }
+ }
+ sortRanking();
+ if(currentRound == nrOfRounds)
+ {
+ endTournament();
+ }
+ else
+ {
+ printTables();
}
}
@@ -171,7 +209,8 @@ bool Tournament::canStartRound()
void Tournament::endTournament()
{
-
+ cout << endl << endl << "The tournament is finished! Here are the final rankings:";
+ printRanking();
}
/**
diff --git a/src/kode/Tournament.h b/src/kode/Tournament.h
index fa0b3d7..03fe46b 100644
--- a/src/kode/Tournament.h
+++ b/src/kode/Tournament.h
@@ -29,8 +29,8 @@ class Tournament
vector<int>black;
virtual void startNewTournament(); //+
- virtual void enterResults(); //-
- virtual void endTournament(); //-
+ virtual void enterResults(); //+
+ virtual void endTournament(); //+
virtual void printTables(); //+
virtual void createMatchups();//+
bool canStartRound();//+
--
GitLab