gramppto99138/Info2DopleSpiel
1
0
Fork 0
generated from freudenreichan/info2Praktikum-DobleSpiel
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the programm except for the highscores being displayed in exactly the wrong order

Browse Source
This commit is contained in:
Tobias Grampp 2025-12-09 10:09:27 +01:00
parent fdfa3c5769
commit 027a8eaeb7
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bintree.c
View File

@ -22,7 +22,7 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
newNode->data = malloc(dataSize); newNode->data = malloc(dataSize);
newNode->left = NULL; newNode->left = NULL;
newNode->right = NULL; newNode->right = NULL;
strcpy(newNode->data, data); memcpy(newNode->data, data, dataSize);
if(isDuplicate) if(isDuplicate)
*isDuplicate = 0; *isDuplicate = 0;
return newNode; return newNode;
@ -52,19 +52,16 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
// push the top node and push all its left nodes. // push the top node and push all its left nodes.
void *nextTreeData(TreeNode *root) void *nextTreeData(TreeNode *root)
{ {
printf("nextTreeData wurde gecallt!\n");
if(root) if(root)
{ {
stackRoot = addTreeToStack(stackRoot, root); stackRoot = addTreeToStack(stackRoot, root);
printf("Baum wurde geladen!\n");
} }
printf("\n\nstackRoot ist: %x\n\n", stackRoot); void *stackBuffer = top(stackRoot);
StackNode *stackPuffer = pop(stackRoot); stackRoot = pop(stackRoot);
if(!stackPuffer) //void *buffer = (stackBuffer->stackData);
printf("Something went horriffically wrong! There is no Data!"); //printf("neuer Eintrag wurde geholt: %x\n", buffer);
void *buffer = (stackPuffer->stackData); //return buffer;
printf("neuer Eintrag wurde geholt: %x\n", buffer); return stackBuffer;
return buffer;
} }
// Adds all Treenode-Datas of a root into a stack ordered from left to right // Adds all Treenode-Datas of a root into a stack ordered from left to right
StackNode *addTreeToStack(StackNode *start, TreeNode *root) StackNode *addTreeToStack(StackNode *start, TreeNode *root)
@ -74,7 +71,6 @@ StackNode *addTreeToStack(StackNode *start, TreeNode *root)
start = addTreeToStack(start, root->left); start = addTreeToStack(start, root->left);
} }
start = push(start, root->data); start = push(start, root->data);
printf("\na new Dataset has been added! new stackRoot: %x", start);
if(root->right) if(root->right)
{ {
start = addTreeToStack(start, root->right); start = addTreeToStack(start, root->right);

19
highscores.txt
View File

@ -1,10 +1,9 @@
Ottp;4522070 HeldDerSteine;69
Ottp;4522070 Gunter11;121
Ottp;4522070 MaxiMustermann;316
Ottp;4522070 MillaMusterfrau;420
Ottp;4522070 testspieler68;2996
Ottp;4522070 testspieler69;2997
Ottp;4522070 testspieler67;2997
Ottp;4522070 testspieler1;2997
Ottp;4522070 testspieler68;4991
Ottp;4522070

1
main.c
View File

@ -84,6 +84,5 @@ int main(int argc, char *argv[])
exitCode = EXIT_SUCCESS; exitCode = EXIT_SUCCESS;
} }
return exitCode; return exitCode;
} }

6
stack.c
View File

@ -34,14 +34,12 @@ StackNode *push(StackNode *stack, void *data)
// freed by caller.) // freed by caller.)
StackNode *pop(StackNode *stack) StackNode *pop(StackNode *stack)
{ {
printf("A stack is being popped");
if(stack) { if(stack) {
StackNode* temp = stack; StackNode* temp = stack;
stack = stack->below; stack = stack->below;
temp->stackData = NULL; temp->stackData = NULL;
//free(temp); free(temp);
//temp = NULL; temp = NULL;
printf("Stack returns stack at: %x\n", stack);
return stack; return stack;
} }
else else