Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jumpNrun
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wise2023_jumpnrun
jumpNrun
Commits
642ebc1f
"src/io/vtk.cc" did not exist on "bb40443ebbd9938888ef39c42029bc961e56dc51"
Commit
642ebc1f
authored
1 year ago
by
Janos
Browse files
Options
Downloads
Patches
Plain Diff
Spiel wir jetzt nicht mehr mit exit(),sondern korrekt beendet
parent
891f3e34
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
gameLoop.c
+7
-4
7 additions, 4 deletions
gameLoop.c
gameLoop.h
+1
-1
1 addition, 1 deletion
gameLoop.h
main.c
+2
-2
2 additions, 2 deletions
main.c
map.c
+2
-2
2 additions, 2 deletions
map.c
menu2.c
+1
-1
1 addition, 1 deletion
menu2.c
with
13 additions
and
10 deletions
gameLoop.c
+
7
−
4
View file @
642ebc1f
...
...
@@ -8,7 +8,7 @@ int playerhighscore;
//V: enum vehicle exists with 4 correct themes, Renderer exists
//N: renderer still exists, all objects are still exist or have been correctly removed
//E: game has been played for one round, which was at least 16ms long
void
gameLoop
(
enum
vehicle
theme
,
SDL_Renderer
*
renderer
)
{
bool
gameLoop
(
enum
vehicle
theme
,
SDL_Renderer
*
renderer
)
{
SDL_Event
e
;
int
speed
=
0
;
...
...
@@ -30,6 +30,7 @@ void gameLoop(enum vehicle theme,SDL_Renderer* renderer) {
bool
start_game
=
false
;
//ends game if game over criteria have been met
bool
end_game
=
false
;
bool
quit_game
=
false
;
//used to implement rows and allows to remove rows out of view
struct
LinkedList
*
map
=
init_map
(
theme
);
...
...
@@ -48,7 +49,8 @@ void gameLoop(enum vehicle theme,SDL_Renderer* renderer) {
switch
(
e
.
type
){
// if user closes window exit frees all used space
case
SDL_QUIT
:
exit
(
0
);
end_game
=
true
;
quit_game
=
true
;
// any key input starts game and takes player input
case
SDL_KEYDOWN
:
start_game
=
true
;
...
...
@@ -72,7 +74,8 @@ void gameLoop(enum vehicle theme,SDL_Renderer* renderer) {
// Die Map wird bewegt und gezeichnet (inklusive Fahrzeuge)
// Bei einer ungültigen Kollision wird das Spiel beendet
end_game
=
move_map
(
theme
,
speed
,
map
,
renderer
);
if
(
!
end_game
)
end_game
=
move_map
(
theme
,
speed
,
map
,
renderer
);
// Wenn der Spieler nicht im Fenster zu sehen ist, dann wird das Spiel beendet
if
(
player
->
y
>=
SCREEN_HEIGHT
||
player
->
x
>=
SCREEN_WIDTH
||
player
->
x
<=
-
60
){
...
...
@@ -98,5 +101,5 @@ void gameLoop(enum vehicle theme,SDL_Renderer* renderer) {
write_table
(
theme
);
//wir löschen die map
free_map
(
map
);
return
;
return
(
quit_game
)
;
}
This diff is collapsed.
Click to expand it.
gameLoop.h
+
1
−
1
View file @
642ebc1f
...
...
@@ -22,6 +22,6 @@ extern int playerhighscore;
//Declaration of functions
void
gameLoop
(
enum
vehicle
,
SDL_Renderer
*
);
bool
gameLoop
(
enum
vehicle
,
SDL_Renderer
*
);
#endif
\ No newline at end of file
This diff is collapsed.
Click to expand it.
main.c
+
2
−
2
View file @
642ebc1f
...
...
@@ -48,7 +48,6 @@ int main(void) {
int
theme
;
bool
change_Map
=
true
;
while
(
true
)
{
if
(
change_Map
){
...
...
@@ -57,7 +56,8 @@ int main(void) {
if
(
theme
==
(
-
1
)){
// Spiel wurde geschlossen oder es kam zu einem Fehler
break
;
}
gameLoop
(
theme
,
renderer
);
if
(
gameLoop
(
theme
,
renderer
))
break
;
change_Map
=
end_screen
(
renderer
);
}
...
...
This diff is collapsed.
Click to expand it.
map.c
+
2
−
2
View file @
642ebc1f
...
...
@@ -34,7 +34,7 @@ struct LinkedList* init_map(enum vehicle theme){
n
->
next
=
m
;
n
=
m
;
for
(
int
i
=
0
;
i
<
10
;
i
++
){
for
(
int
i
=
0
;
i
<
10
000
;
i
++
){
struct
Row
*
m
;
...
...
@@ -125,7 +125,7 @@ int move_map(enum vehicle theme,int delta_y,struct LinkedList *list, SDL_Rendere
return
(
1
);
}
}
if
(
cur
->
next
==
NULL
){
break
;
}
...
...
This diff is collapsed.
Click to expand it.
menu2.c
+
1
−
1
View file @
642ebc1f
...
...
@@ -69,7 +69,7 @@ enum vehicle startscreen(SDL_Renderer* renderer){
switch
(
event
.
type
)
{
case
SDL_QUIT
:
exit
(
0
);
return
(
-
1
);
case
SDL_MOUSEBUTTONDOWN
:
if
(
0
<=
event
.
button
.
y
&&
event
.
button
.
y
<=
200
){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment