Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GAME INSA PROJECT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
3EII INFO LKCH
GAME INSA PROJECT
Commits
7a0047f8
Commit
7a0047f8
authored
4 years ago
by
llebasca
Browse files
Options
Downloads
Patches
Plain Diff
All DS positions and Doxygen correction prof/personnage.c
parent
a76fe7cf
No related branches found
Branches containing commit
No related tags found
4 merge requests
!8
Modele
,
!7
Modele
,
!6
Modele
,
!5
Modele Version 1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GAME/src/DS.c
+87
-80
87 additions, 80 deletions
GAME/src/DS.c
GAME/src/personnage.c
+1
-0
1 addition, 0 deletions
GAME/src/personnage.c
GAME/src/prof.c
+4
-1
4 additions, 1 deletion
GAME/src/prof.c
with
92 additions
and
81 deletions
GAME/src/DS.c
+
87
−
80
View file @
7a0047f8
...
...
@@ -5,7 +5,7 @@
/*!
* \file DS.c
* \brief Exam Source File
* \authors Lucile
* \authors Lucile
, Tin
* \version 1
* \date 02/03/2021
*
...
...
@@ -14,6 +14,8 @@
*/
#include
<stdio.h>
#include
<string.h>
#include
<stdlib.h>
#include
<SDL2/SDL.h>
#include
<SDL2/SDL_image.h>
#include
"DS.h"
...
...
@@ -62,6 +64,7 @@ void init_DS(DS * exam, int door_DS, char * path){
exam
->
larg_DS
=
24
;
exam
->
long_DS
=
14
;
break
;
case
6
:
exam
->
x_DS
=
237
;
exam
->
y_DS
=
98
;
...
...
@@ -75,6 +78,7 @@ void init_DS(DS * exam, int door_DS, char * path){
exam
->
larg_DS
=
12
;
exam
->
long_DS
=
17
;
break
;
case
8
:
exam
->
x_DS
=
75
;
exam
->
y_DS
=
172
;
...
...
@@ -95,140 +99,143 @@ void init_DS(DS * exam, int door_DS, char * path){
exam
->
larg_DS
=
20
;
exam
->
long_DS
=
10
;
break
;
case
11
:
exam
->
x_DS
=
19
7
;
exam
->
y_DS
=
20
8
;
exam
->
larg_DS
=
10
;
exam
->
long_DS
=
3
;
exam
->
x_DS
=
19
1
;
exam
->
y_DS
=
20
3
;
exam
->
larg_DS
=
22
;
exam
->
long_DS
=
11
;
break
;
case
12
:
exam
->
x_DS
=
54
9
;
exam
->
y_DS
=
20
5
;
exam
->
larg_DS
=
5
;
exam
->
long_DS
=
1
2
;
exam
->
x_DS
=
54
4
;
exam
->
y_DS
=
20
1
;
exam
->
larg_DS
=
14
;
exam
->
long_DS
=
2
4
;
break
;
case
13
:
exam
->
x_DS
=
63
7
;
exam
->
y_DS
=
18
5
;
exam
->
larg_DS
=
5
;
exam
->
long_DS
=
14
;
exam
->
x_DS
=
63
2
;
exam
->
y_DS
=
18
1
;
exam
->
larg_DS
=
14
;
exam
->
long_DS
=
23
;
break
;
case
14
:
exam
->
x_DS
=
2
35
;
exam
->
y_DS
=
26
9
;
exam
->
larg_DS
=
4
;
exam
->
long_DS
=
11
;
exam
->
x_DS
=
2
28
;
exam
->
y_DS
=
26
3
;
exam
->
larg_DS
=
1
4
;
exam
->
long_DS
=
20
;
break
;
case
15
:
exam
->
x_DS
=
3
20
;
exam
->
y_DS
=
26
7
;
exam
->
larg_DS
=
8
;
exam
->
long_DS
=
4
;
exam
->
x_DS
=
3
14
;
exam
->
y_DS
=
26
1
;
exam
->
larg_DS
=
21
;
exam
->
long_DS
=
1
4
;
break
;
case
16
:
exam
->
x_DS
=
8
8
;
exam
->
y_DS
=
36
1
;
exam
->
larg_DS
=
3
;
exam
->
long_DS
=
15
;
exam
->
x_DS
=
8
2
;
exam
->
y_DS
=
3
5
6
;
exam
->
larg_DS
=
16
;
exam
->
long_DS
=
24
;
break
;
case
17
:
exam
->
x_DS
=
1
49
;
exam
->
y_DS
=
54
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
49
3
;
exam
->
y_DS
=
319
;
exam
->
larg_DS
=
1
6
;
exam
->
long_DS
=
21
;
break
;
case
18
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
54
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
600
;
exam
->
y_DS
=
308
;
exam
->
larg_DS
=
1
3
;
exam
->
long_DS
=
20
;
break
;
case
19
:
exam
->
x_DS
=
499
;
exam
->
y_DS
=
32
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
194
;
exam
->
y_DS
=
41
4
;
exam
->
larg_DS
=
2
1
;
exam
->
long_DS
=
13
;
break
;
case
20
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
54
;
exam
->
x_DS
=
553
;
exam
->
y_DS
=
392
;
exam
->
larg_DS
=
12
;
exam
->
long_DS
=
5
;
exam
->
long_DS
=
20
;
break
;
case
21
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
654
;
exam
->
y_DS
=
4
07
;
exam
->
larg_DS
=
2
0
;
exam
->
long_DS
=
12
;
break
;
case
22
:
exam
->
x_DS
=
1
49
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
3
49
;
exam
->
y_DS
=
43
4
;
exam
->
larg_DS
=
2
2
;
exam
->
long_DS
=
12
;
break
;
case
23
:
exam
->
x_DS
=
14
9
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
26
9
;
exam
->
y_DS
=
4
67
;
exam
->
larg_DS
=
1
6
;
exam
->
long_DS
=
20
;
break
;
case
24
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
461
;
exam
->
y_DS
=
5
07
;
exam
->
larg_DS
=
2
4
;
exam
->
long_DS
=
14
;
break
;
case
25
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
637
;
exam
->
y_DS
=
5
13
;
exam
->
larg_DS
=
1
3
;
exam
->
long_DS
=
24
;
break
;
case
26
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
32
;
exam
->
y_DS
=
5
56
;
exam
->
larg_DS
=
2
6
;
exam
->
long_DS
=
13
;
break
;
case
27
:
exam
->
x_DS
=
1
4
9
;
exam
->
y_DS
=
5
4
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
19
2
;
exam
->
y_DS
=
61
4
;
exam
->
larg_DS
=
1
8
;
exam
->
long_DS
=
24
;
break
;
case
28
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
54
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
238
;
exam
->
y_DS
=
653
;
exam
->
larg_DS
=
1
4
;
exam
->
long_DS
=
20
;
break
;
case
29
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
54
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
501
;
exam
->
y_DS
=
651
;
exam
->
larg_DS
=
1
4
;
exam
->
long_DS
=
21
;
break
;
case
30
:
exam
->
x_DS
=
149
;
exam
->
y_DS
=
54
;
exam
->
larg_DS
=
1
2
;
exam
->
long_DS
=
5
;
exam
->
x_DS
=
553
;
exam
->
y_DS
=
662
;
exam
->
larg_DS
=
1
7
;
exam
->
long_DS
=
23
;
break
;
}
...
...
This diff is collapsed.
Click to expand it.
GAME/src/personnage.c
+
1
−
0
View file @
7a0047f8
...
...
@@ -33,6 +33,7 @@
* \param [in] y the character's ordinate
* \param [in] length the character's length
* \param [in] width the character's width
* \param [in] speed the character's speed
* \param [in] path the path to the character's image
* \return 1 if the initialization went right.
*/
...
...
This diff is collapsed.
Click to expand it.
GAME/src/prof.c
+
4
−
1
View file @
7a0047f8
...
...
@@ -8,7 +8,7 @@
/*!
* \file prof.c
* \brief Teacher Source File
* \authors
c
orto
* \authors
C
orto
* \version 1
* \date 02/03/2021
*
...
...
@@ -17,6 +17,8 @@
*/
#include
<stdio.h>
#include
<string.h>
#include
<stdlib.h>
#include
<SDL2/SDL.h>
#include
<SDL2/SDL_image.h>
#include
"prof.h"
...
...
@@ -30,6 +32,7 @@
* \param [in] y the Teacher's ordinate
* \param [in] length the Teacher's length
* \param [in] width the Teacher's width
* \param [in] speed the Teacher's speed
* \param [in] path the path to the Teacher's image
* \return 1 if the initialization went right.
*/
...
...
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