Skip to content
Snippets Groups Projects
Commit e26609f2 authored by 187Bit's avatar 187Bit
Browse files

Merge branch 'main' of git.imp.fu-berlin.de:wise2023_jumpnrun/jumpnrun

parents 2beb54f1 891f3e34
No related branches found
No related tags found
No related merge requests found
...@@ -115,17 +115,17 @@ int move_map(enum vehicle theme,int delta_y,struct LinkedList *list, SDL_Rendere ...@@ -115,17 +115,17 @@ int move_map(enum vehicle theme,int delta_y,struct LinkedList *list, SDL_Rendere
if (paste_row(renderer,cur->y_pos,cur->row_type)) if (paste_row(renderer,cur->y_pos,cur->row_type))
return(-1); return(-1);
if (cur->cars != NULL){
if (move_car(renderer,cur) && cur->y_pos <= player->y && player->y <= cur->y_pos + ROW_SIZE){
return(1);
}
}
if (cur->y_pos <= player->y && player->y <= cur->y_pos + ROW_SIZE && (cur->row_type == grassBright || if (cur->y_pos <= player->y && player->y <= cur->y_pos + ROW_SIZE && (cur->row_type == grassBright ||
cur->row_type == grassDark || cur->row_type == finishlineBright || cur->row_type == finishlineDark)){ cur->row_type == grassDark || cur->row_type == finishlineBright || cur->row_type == finishlineDark)){
recenter_player(); recenter_player();
} }
else if (cur->cars != NULL){
if (move_car(renderer,cur) && cur->y_pos <= player->y && player->y <= cur->y_pos + ROW_SIZE){
return(1);
}
}
if (cur->next == NULL){ if (cur->next == NULL){
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment