From 0d6c48bfd32a95049e14b14c224b94d5283ee598 Mon Sep 17 00:00:00 2001 From: h3ndrik Date: Thu, 22 Mar 2012 03:13:52 +0100 Subject: [PATCH] small fixes --- sdljpd | Bin 40675 -> 40675 bytes sdljpd.c | 8 +++----- sdljpd.c~ | 3 +-- tastaturbelegung.txt | 8 ++++++++ tastaturbelegung.txt~ | 15 +++++++++++++++ 5 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 tastaturbelegung.txt~ diff --git a/sdljpd b/sdljpd index 0c83aeef9f04e062a78ae21b3623549f2a528dea..300184e480f1c5ec828e428682cf4118d2c472ec 100755 GIT binary patch delta 7534 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 delta 7551 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 diff --git a/sdljpd.c b/sdljpd.c index b0de809..a2844b9 100644 --- a/sdljpd.c +++ b/sdljpd.c @@ -147,8 +147,7 @@ void Quit( int returnCode ) /*fclose(file);*/ - - printf("\033[33m sdljpd:\033[m So long, and thanks for all the fish <;))>< \n"); + printf("\033[33mPunktestand:\033[m\n%s: %i\n%s: %i\n%s: %i\n", pl1, score[0], pl2, score[1], pl3, score[2]); /* and exit appropriately */ exit( returnCode ); @@ -322,7 +321,6 @@ void get_buz (void) { n = SDL_JoystickGetButton ( joystick, i ); if ( n != 0 ) { - printf ( "found you pressed button %i\n", i ); if(i == 0) { plselect = 0; @@ -860,8 +858,8 @@ int main( int argc, char **argv ) /* Reset playing field */ case SDLK_r: - /* lockbz = FALSE; - system("./set_led 1 1 1 0"); */ + lockbz = FALSE; + system("./set_led 1 1 1 0"); inp = FALSE; enp = FALSE; break; diff --git a/sdljpd.c~ b/sdljpd.c~ index dfa2465..893d29f 100644 --- a/sdljpd.c~ +++ b/sdljpd.c~ @@ -147,8 +147,7 @@ void Quit( int returnCode ) /*fclose(file);*/ - - printf("\033[33m sdljpd:\033[m So long, and thanks for all the fish <;))>< \n"); + printf("\033[33mPunktestand:\033[m\n%s: %i\n%s: %i\n%s: %i\n", pl1, score[0], pl2, score[1], pl3, score[2]); /* and exit appropriately */ exit( returnCode ); diff --git a/tastaturbelegung.txt b/tastaturbelegung.txt index c042563..4c76360 100644 --- a/tastaturbelegung.txt +++ b/tastaturbelegung.txt @@ -13,3 +13,11 @@ PgDown: nicht Gelöst (ohne Punkte) L: Lock. Buzzer sperren U: Unlock. Buzzer freigeben R: Reset. Spielfeld anzeigen, Buzzer freigeben + + +Workflow: +Mit Pfeiltasten frage auswählen +Enter drücken +Bei Richtig: Einfg +Bei Falsch: Entf +Danach mit Pfeiltasten weiter diff --git a/tastaturbelegung.txt~ b/tastaturbelegung.txt~ new file mode 100644 index 0000000..c042563 --- /dev/null +++ b/tastaturbelegung.txt~ @@ -0,0 +1,15 @@ +ESC, Q: Quit +F1: Fullscreen +A: Spieler links +D: Spieler rechts +W: Score+100 +S: Score-100 +RETURN: Frage anzeigen, Buzzer freigeben +Pfeiltasten: Frage auswählen +Insert: Gelöst, Antwort anzeigen, Punkte addieren +Delete: Punkte abziehen, Buzzer freigeben +PgUp: Gelöst (ohne Punkte) +PgDown: nicht Gelöst (ohne Punkte) +L: Lock. Buzzer sperren +U: Unlock. Buzzer freigeben +R: Reset. Spielfeld anzeigen, Buzzer freigeben