Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
José Pardo Madera
/
ProjectoMultimeda2025
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e2376732
authored
Apr 10, 2025
by
José Pardo Madera
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
El carne sale en el puzzlele y sale la cinematica
parent
e77b8a5e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
Executable
Historia.cpp
PantallaFecha.cpp
PantallaFecha.h
Executable
View file @
e2376732
No preview for this file type
Historia.cpp
View file @
e2376732
...
@@ -140,6 +140,7 @@ static void iniciarCalendarioQuitado(){
...
@@ -140,6 +140,7 @@ static void iniciarCalendarioQuitado(){
getPantalla2
()
->
anadirObjeto
(
Puerta
);
getPantalla2
()
->
anadirObjeto
(
Puerta
);
auto
funcionCartera
=
[](
Objeto
*
Pantalla
,
Handle
&
handle
)
->
bool
{
auto
funcionCartera
=
[](
Objeto
*
Pantalla
,
Handle
&
handle
)
->
bool
{
play_video
(
"assets/AgapitoSacaCarne"
,
"es"
);
getPantallaFecha
()
->
setTieneCarne
(
true
);
getPantallaFecha
()
->
setTieneCarne
(
true
);
Agapito
.
inventario
[
0
]
=
generarObjetoCarne
();
Agapito
.
inventario
[
0
]
=
generarObjetoCarne
();
return
false
;
return
false
;
...
...
PantallaFecha.cpp
View file @
e2376732
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
PantallaFecha
::
PantallaFecha
()
:
PantallaFecha
::
PantallaFecha
()
:
fuente1
(
"assets/OpenSans-Italic.ttf"
,
100
),
fuente1
(
"assets/OpenSans-Italic.ttf"
,
100
),
Fondo1
(
"assets/pantallaPantalla.png"
),
Fondo1
(
"assets/pantallaPantalla.png"
),
Carne
(
"assets/carneNombre.png"
),
atras
(
Sprite
(
"assets/volver.png"
),
Sprite
(
"assets/volver.png"
),
Sprite
(
"assets/volver.png"
),
Hitbox
(
1800
,
1600
,
300
,
200
),
1600
,
200
,
100
,
100
,
normal
,
nullptr
),
atras
(
Sprite
(
"assets/volver.png"
),
Sprite
(
"assets/volver.png"
),
Sprite
(
"assets/volver.png"
),
Hitbox
(
1800
,
1600
,
300
,
200
),
1600
,
200
,
100
,
100
,
normal
,
nullptr
),
carne
(
Sprite
(
"assets/carneNombre.png"
),
Sprite
(
"assets/carneNombre.png"
),
Sprite
(
"assets/carneNombre.png"
),
Hitbox
(
0
,
0
,
0
,
0
),
0
,
0
,
0
,
0
,
normal
,
nullptr
),
botonesArriba
{
botonesArriba
{
Objeto
(
Sprite
(
"assets/flechaArriba.jpg"
),
Sprite
(
"assets/flechaArriba.jpg"
),
Sprite
(
"assets/flechaArriba.jpg"
),
Hitbox
(
500
,
300
,
300
,
200
),
300
,
200
,
200
,
100
,
normal
,
nullptr
),
Objeto
(
Sprite
(
"assets/flechaArriba.jpg"
),
Sprite
(
"assets/flechaArriba.jpg"
),
Sprite
(
"assets/flechaArriba.jpg"
),
Hitbox
(
500
,
300
,
300
,
200
),
300
,
200
,
200
,
100
,
normal
,
nullptr
),
...
@@ -87,7 +87,7 @@ void PantallaFecha::renderizar(SDL_Renderer *renderer, int tamx, int tamy) {
...
@@ -87,7 +87,7 @@ void PantallaFecha::renderizar(SDL_Renderer *renderer, int tamx, int tamy) {
botonesArriba
[
i
].
renderizar
(
renderer
,
tamx
,
tamy
);
botonesArriba
[
i
].
renderizar
(
renderer
,
tamx
,
tamy
);
}
}
if
(
AgapitoTieneCarne
){
if
(
AgapitoTieneCarne
){
carne
.
renderizar
(
renderer
,
tamx
,
tamy
);
Carne
.
renderizar
(
renderer
,
1248
,
800
,
400
,
300
,
tamx
,
tamy
);
}
}
...
...
PantallaFecha.h
View file @
e2376732
...
@@ -13,10 +13,10 @@ class PantallaFecha : public Pantalla {
...
@@ -13,10 +13,10 @@ class PantallaFecha : public Pantalla {
Objeto
botonesArriba
[
4
];
Objeto
botonesArriba
[
4
];
Objeto
botonesAbajo
[
4
];
Objeto
botonesAbajo
[
4
];
vector
<
Hitbox
>
colisionesBotones
;
vector
<
Hitbox
>
colisionesBotones
;
Objeto
carne
;
Objeto
atras
;
Objeto
atras
;
Fuente
fuente1
;
Fuente
fuente1
;
Sprite
Fondo1
;
Sprite
Fondo1
;
Sprite
Carne
;
int
combinacionActual
[
4
];
int
combinacionActual
[
4
];
int
combinacionBuena
[
4
];
int
combinacionBuena
[
4
];
bool
AgapitoTieneCarne
=
false
;
bool
AgapitoTieneCarne
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment