kohlerma104069/Wortsalat
1
0 Fork 0
forked from freudenreichan/info2Praktikum-Wortsalat
Code Pull Requests Activity

final fix

Browse Source
This commit is contained in:
sengpielto106561 committed 2026-10-29 15:27:06 +01:00
1 parent 547fc13e0f
commit 4079cb02bf
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
Startcode/main.c
+2 -3
View File
@@ -1,5 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "input.h" #include "input.h"
#include "game.h" #include "game.h"
#include "graphicalGame.h" #include "graphicalGame.h"
@@ -7,8 +8,7 @@
#define MAX_NUMBER_OF_WORDS 100 #define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 36 #define SALAD_SIZE 36
<<<<<<< HEAD
=======
int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], int placedWords, int wordCount){ int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], int placedWords, int wordCount){
//Iteriere über alle verfügbaren Wörter //Iteriere über alle verfügbaren Wörter
int foundWords = 0; int foundWords = 0;
@@ -45,7 +45,6 @@ int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][
return -1; return -1;
} }
>>>>>>> 61221a5b8ddad53683e9cad057577a9e8b9ea958
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int exitCode = EXIT_SUCCESS; int exitCode = EXIT_SUCCESS;