From 922db0c31ca09cbf57b743ed6316b7c0ff2687cb Mon Sep 17 00:00:00 2001 From: Florian Baeseler Date: Fri, 9 Feb 2024 21:05:37 +0100 Subject: [PATCH] Interface Cleanup im gesamten Programm --- build/test/out/c/casualQuiz.o | Bin 15515 -> 15407 bytes build/test/out/test_casualQuiz.out | Bin 126190 -> 126190 bytes build/test/results/test_casualQuiz.pass | 10 ++--- build/test/results/test_quizduell.pass | 2 +- build/test/results/test_timequiz.pass | 2 +- build/test/results/test_wwm.pass | 2 +- src/casualQuiz.c | 50 +++++++++++------------- 7 files changed, 28 insertions(+), 38 deletions(-) diff --git a/build/test/out/c/casualQuiz.o b/build/test/out/c/casualQuiz.o index abef013376486b41e6e6005e4f2d5d9053668db7..ac0153f6312c1b32c7dfb2b676282675171301a9 100644 GIT binary patch delta 4371 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 K*h>JGS>QS*$uy5HG1n3O`m7e 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 delta 12651 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 F{|{ZI%Rm4C diff --git a/build/test/results/test_casualQuiz.pass b/build/test/results/test_casualQuiz.pass index 650dbc0..08a415a 100644 --- a/build/test/results/test_casualQuiz.pass +++ b/build/test/results/test_casualQuiz.pass @@ -55,15 +55,11 @@ :failed: 0 :ignored: 0 :stdout: -- Case 1 - Right Answer, well done. -- Case 2 - Right Answer, well done. -- Case 3 - Right Answer, well done. -- Case 4 - Right Answer, well done. -- Wrong Input! -- Wrong Input! +- Wrong Input! Going to the next question... +- Wrong Input! Going to the next question... - It looks like you havent played the program yet, starting it up... -:time: 0.015266000060364604 +:time: 0.03372880001552403 diff --git a/build/test/results/test_quizduell.pass b/build/test/results/test_quizduell.pass index 37d2fa8..0e6b059 100644 --- a/build/test/results/test_quizduell.pass +++ b/build/test/results/test_quizduell.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.014835100038908422 +:time: 0.013811899931170046 diff --git a/build/test/results/test_timequiz.pass b/build/test/results/test_timequiz.pass index 93c422b..7526152 100644 --- a/build/test/results/test_timequiz.pass +++ b/build/test/results/test_timequiz.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.013974100002087653 +:time: 0.014014000073075294 diff --git a/build/test/results/test_wwm.pass b/build/test/results/test_wwm.pass index 3c9badc..f0829e0 100644 --- a/build/test/results/test_wwm.pass +++ b/build/test/results/test_wwm.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.015707500046119094 +:time: 0.01363929989747703 diff --git a/src/casualQuiz.c b/src/casualQuiz.c index bee238a..b050dcb 100644 --- a/src/casualQuiz.c +++ b/src/casualQuiz.c @@ -7,7 +7,6 @@ void casualQuiz() { - printf("Print aus der Funktion Casual Quiz"); int index = 0; char* fragen[] = { //eingabe der Fragen in ein Array "Which Disney character famously leaves a glass shoe behind at a royal ball?", @@ -55,12 +54,11 @@ void casualQuiz() { bool end = false; while (end == false) { //schleife, in der das Programm läuft already_played = activePlaying(fragen, *antworten, richtigeAntworten, length_frag_array, answeredP, correctP); - printf("korrekte Antworten: %d\n", correct); - printf("bei: %d beantworteten Fragen", answered); + printf("You had %d answers correct, while answering %d questions.\n", correct, answered); end = ftryAgain(already_played); //man wird gefragt ob man nochmal spielen möchte correct = 0;//zurücksetzen der beiden zählervariablen answered = 0; - + } return; } @@ -78,8 +76,8 @@ bool activePlaying(char* fragen[], char* antworten[], int richtige_antwort[], in eingabe = feingabeInteger(); //eingabe Funktion richtig = fcheckaufRichtigkeit(eingabe, antworten, richtige_antwort, i); //überprüfung der eingabe anhand des richtige_eingabe arrays und dem index fzaehlernachAuswahl(richtig, answeredP, correctP); // zähler werden hochgezählt je nach eingabe - - + printf("\n----------------------------------------------------------------------------------------\n\n"); + } return true; } @@ -97,75 +95,71 @@ int feingabeInteger() { scanf_s("%d", &eingabe); //reine ingabe, prints sind vorher schon passiert return eingabe; // return der eingabe } -bool fcheckaufRichtigkeit(int eingabe,char* antworten[], int richtige_antwort[], int i) { +bool fcheckaufRichtigkeit(int eingabe, char* antworten[], int richtige_antwort[], int i) { int ansehen = 0; switch (eingabe) {//start vom switch - case 0:{ //eingabe 0: abbruch funktion wird aufgerufen + case 0: { //eingabe 0: abbruch funktion wird aufgerufen fabbruch(); break; } - case 1: { - printf("Case 1\n"); + case 1: { if (richtige_antwort[i] == 1) { //vergleichen vov der eingabe zu welche richtige zahl hinter dem passenden index versteckt ist printf("Right Answer, well done.\n"); return true; } else { printf("Wrong answer.\n"); //wenn eingabe falsch ist - printf("Would you like to know the right answer?\nInput 1 if oyu want to see it, 0 if not: "); + printf("Would you like to know the right answer?\nInput 1 if you want to see it, 0 if not: "); scanf_s("%d", &ansehen); - if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i],antworten[4 * i + richtige_antwort[i]-1]); + if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i], antworten[4 * i + richtige_antwort[i] - 1]); else printf("Continuing...\n"); } break; } case 2: { - printf("Case 2\n"); if (richtige_antwort[i] == 2) { //vergleichen vov der eingabe zu welche richtige zahl hinter dem passenden index versteckt ist printf("Right Answer, well done.\n"); return true; } else { printf("Wrong answer.\n"); //wenn eingabe falsch ist - printf("Would you like to know the right answer?\nInput 1 if oyu want to see it, 0 if not: "); + printf("Would you like to know the right answer?\nInput 1 if you want to see it, 0 if not: "); scanf_s("%d", &ansehen); - if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i],antworten[4 * i + richtige_antwort[i]-1]); + if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i], antworten[4 * i + richtige_antwort[i] - 1]); else printf("Continuing...\n"); } break; } case 3: { - printf("Case 3\n"); if (richtige_antwort[i] == 3) { //vergleichen vov der eingabe zu welche richtige zahl hinter dem passenden index versteckt ist printf("Right Answer, well done.\n"); return true; } else { printf("Wrong answer.\n"); //wenn eingabe falsch ist - printf("Would you like to know the right answer?\nInput 1 if oyu want to see it, 0 if not: "); + printf("Would you like to know the right answer?\nInput 1 if you want to see it, 0 if not: "); scanf_s("%d", &ansehen); - if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i],antworten[4 * i + richtige_antwort[i]-1]); + if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i], antworten[4 * i + richtige_antwort[i] - 1]); else printf("Continuing...\n"); } break; } case 4: { - printf("Case 4\n"); if (richtige_antwort[i] == 4) { //vergleichen vov der eingabe zu welche richtige zahl hinter dem passenden index versteckt ist printf("Right Answer, well done.\n"); return true; } else { printf("Wrong answer.\n"); //wenn eingabe falsch ist - printf("Would you like to know the right answer?\nInput 1 if oyu want to see it, 0 if not: "); + printf("Would you like to know the right answer?\nInput 1 if you want to see it, 0 if not: "); scanf_s("%d", &ansehen); - if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i],antworten[4 * i + richtige_antwort[i]-1]); + if (ansehen == 1) printf("The right answer was: %d) %s\n", richtige_antwort[i], antworten[4 * i + richtige_antwort[i] - 1]); else printf("Continuing...\n"); } break; } default: { // eingabe war was anderes als 1,2,3,4 oder 5 - printf("Wrong Input!"); + printf("Wrong Input! Going to the next question...\n"); return false; break; } @@ -182,14 +176,14 @@ void fzaehlernachAuswahl(bool richtig, int* answeredP, int* correctP) { } return; } -bool ftryAgain(bool already_played){ +bool ftryAgain(bool already_played) { if (already_played == true) { //wenn man das spiel schon gespielt hat int sure; printf("Would you like to play again?\n"); - printf("Input 1 to continue Gaming, input 0 to return to the main menu: "); + printf("Input 1 to continue gaming, input 0 to return to the main menu: "); scanf_s("%d", &sure); //eingabe pb man das spiel nochmal spielen möchte - - if (sure == 1){ // nochmal spielen + + if (sure == 1) { // nochmal spielen printf("Starting the program up again..."); return false; } @@ -202,9 +196,9 @@ bool ftryAgain(bool already_played){ printf("It looks like you havent played the program yet, starting it up..."); return false; } - + } -void fabbruch(){ +void fabbruch() { int wirklich; printf("Do you really want to close the program?\nInput 1 to exit, input 0 to continue gaming: "); scanf_s("%d", &wirklich); //eingabe ob man denn wirklich das programm beenden möchte