Merge branch 'main' of https://gitea.zkd.ca/TAXON/taxon

0

@@ -1 +1 @@
-Appuyez sur une touche pour continuer... 
+Press any key to continue . . . 

mesFonctions.cpp

@@ -23,6 +23,7 @@ using namespace std::chrono_literals;
 
 #include <limits> //Sources : https://www.tutorialspoint.com/cpp_standard_library/limits.htm et https://stackoverflow.com/questions/2158943/split-string-into-array-of-chars
 
+const int BONNE_PLACE = 1, MAUVAIS_PLACE = 2, PAS_LA = 3;
 
 /*====================================
 MENU
@@ -130,7 +131,7 @@ void effectuerTour(int nbLettre)
 
 			for (int i = 0; i < nbLettre; i++) {
 
-				if (motRandom[i] == motPlayer[i]) {
+				if (lettreDansMot(motRandom, motPlayer, nbLettre, i) == BONNE_PLACE) {
 					string lettrePlayer;
 					lettrePlayer = motPlayer[i];
 					lettrePlayer.insert(0, "Alphabet/Normal/");
@@ -140,7 +141,7 @@ void effectuerTour(int nbLettre)
 					printLettre(monFlux, 1);
 					fermerFichier(monFlux);
 				}
-				else if (lettreDansMot(motRandom, motPlayer, nbLettre)) {
+				else if (lettreDansMot(motRandom, motPlayer, nbLettre, i) == MAUVAIS_PLACE) {
 					string lettrePlayer;
 					lettrePlayer = motPlayer[i];
 					lettrePlayer.insert(0, "Alphabet/Normal/");
@@ -192,18 +193,18 @@ bool dansListe(string motPlayer) {
 	
 }
 
-bool lettreDansMot(string motRandom, string motPlayer, int nbLettre) {
+int lettreDansMot(string motRandom, string motPlayer, int nbLettre, int i) {
 
-	for (int i = 0; i < nbLettre; i++) {
 	for (int k = 0; k < nbLettre; k++) {
-			if ((motRandom[i] == motPlayer[k]) && (motRandom[i] != motPlayer[i])) {
-				return true;
-			}
-			else {
-				return false;
+
+		if (motRandom[k] == motPlayer[i] && i == k) {
+			return BONNE_PLACE;
 		}
+		else if ((motRandom[k] == motPlayer[i]) && i != k) {
+			return MAUVAIS_PLACE;
 		}
 	}
+	return PAS_LA;
 }
 
 

mesFonctions.h

@@ -35,5 +35,5 @@ string goToLine(fstream& monFlux, int numeroLigne);
 void effectuerTour(int nbLettre);
 bool dansListe(string motPlayer);
 bool comparerMot(fstream& monFlux, string motPlayer, int numeroLigne);
-bool lettreDansMot(string motRandom, string motPlayer, int nbLettre);
+int lettreDansMot(string motRandom, string motPlayer, int nbLettre, int i);
 void printLettre(fstream& monFlux, int positionLettre);