nessar/lightup
Archived
1
0 Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

cleaned gameprint +clang + remove sol on q + usage

Browse Source
This commit is contained in:
Théophyl Hoguet committed 2022-02-14 00:29:55 +01:00
1 parent 56b90263f5
commit 9eab8c9638
1 file changed
+19 -19
Download Patch File Download Diff File Expand all files Collapse all files
game_text.c
+19 -19
View File
@@ -8,6 +8,9 @@
#define NBCHARERR 4 #define NBCHARERR 4
#define CHAR0ASCII 48 #define CHAR0ASCII 48
#define GAME_PRINT_PLUS_LINE(g) \
printf("--------------------------------------------------\n"); \
game_print(g);
/** /**
* @brief Edit the stringError with all errors of g * @brief Edit the stringError with all errors of g
@@ -60,7 +63,7 @@ void checkPlayMove(game g, square s) {
game_play_move(g, i, j, s); game_play_move(g, i, j, s);
else else
printf("Coordonnées invalide.\n"); printf("Coordonnées invalide.\n");
game_print(g); GAME_PRINT_PLUS_LINE(g);
return; return;
} }
printf("Commande inconnue.\n"); printf("Commande inconnue.\n");
@@ -80,33 +83,34 @@ void printhelp(void) {
} }
void usage(char* argv[]) { void usage(char* argv[]) {
printf("Usage : %s => Joue la partie par défaut\n", argv[0]); printf("Usage : %s => Joue la partie par défaut\n", argv[0]);
printf(" %s <filename> => Charge la partie sur le fichier <filename>\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
game g; game g;
if (argc == 1){ if (argc == 1) {
// Create new game // Create new game
g = game_default(); g = game_default();
}else if (argc == 2){ } else if (argc == 2) {
char* gameFile = argv[1]; char* gameFile = argv[1];
g = game_load(gameFile); g = game_load(gameFile);
}else{ } else {
usage(argv); usage(argv);
} }
// init string for errors // init string for errors
char stringError[game_nb_rows(g) * game_nb_cols(g) * NBCHARERR]; char stringError[game_nb_rows(g) * game_nb_cols(g) * NBCHARERR];
char c; char c;
char* fileSave = (char*)malloc(sizeof(char)*20); char* fileSave = (char*)malloc(sizeof(char) * 20);
// print game // print game
game_print(g); GAME_PRINT_PLUS_LINE(g);
// test if game is over // test if game is over
while (!game_is_over(g)) { while (!game_is_over(g)) {
// print errors // print errors
if (checkerrors(g, stringError)) if (checkerrors(g, stringError))
printf("Il y a un problème case(s): %s\n", stringError); printf("\nIl y a un problème case(s): %s\n", stringError);
printf("Entrez une commande (h pour afficher l'aide): "); printf("\nEntrez une commande (h pour afficher l'aide): ");
// scan the first command without args // scan the first command without args
if (scanf(" %c", &c)) { if (scanf(" %c", &c)) {
switch (c) { switch (c) {
@@ -115,25 +119,20 @@ int main(int argc, char* argv[]) {
break; break;
case 'r': case 'r':
game_restart(g); game_restart(g);
printf("Partie réinitialisé avec succes !\n"); printf("\nPartie réinitialisé avec succes !\n");
game_print(g); GAME_PRINT_PLUS_LINE(g);
break; break;
case 'q': case 'q':
printf("Solution: \n");
game solution = game_default_solution();
game_print(solution);
game_delete(solution);
game_delete(g); game_delete(g);
printf("shame\n"); printf("shame on you :o\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
break;
case 'z': case 'z':
game_undo(g); game_undo(g);
game_print(g); GAME_PRINT_PLUS_LINE(g);
break; break;
case 'y': case 'y':
game_redo(g); game_redo(g);
game_print(g); GAME_PRINT_PLUS_LINE(g);
break; break;
case 'l': case 'l':
checkPlayMove(g, S_LIGHTBULB); checkPlayMove(g, S_LIGHTBULB);
@@ -148,6 +147,7 @@ int main(int argc, char* argv[]) {
scanf(" %s", fileSave); scanf(" %s", fileSave);
game_save(g, fileSave); game_save(g, fileSave);
printf("Partie sauvegardée au nom %s\n", fileSave); printf("Partie sauvegardée au nom %s\n", fileSave);
GAME_PRINT_PLUS_LINE(g);
break; break;
default: default:
printf("Commande inconnue.\n"); printf("Commande inconnue.\n");