jaildesigner-jailgames/jaildoctors_dilemma
1
0
Fork 2
Code Issues 1 Pull Requests Projects Releases 20 Wiki Activity

fix: s'havien fotut els dos finals, pero ja estan corregits

Browse Source
This commit is contained in:
Sergio
2025-03-02 13:43:23 +01:00
parent cdf0b0a694
commit 0d74a8a29f
15 changed files with 214 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
source/ending.cpp
View File

@@ -1,23 +1,23 @@
#include "ending.h"
#include <SDL2/SDL_blendmode.h> // for SDL_BLENDMODE_BLEND
#include <SDL2/SDL_error.h> // for SDL_GetError
#include <SDL2/SDL_events.h> // for SDL_PollEvent, SDL_Event
#include <SDL2/SDL_pixels.h> // for SDL_PIXELFORMAT_RGBA8888
#include <SDL2/SDL_rect.h> // for SDL_Rect
#include <SDL2/SDL_timer.h> // for SDL_GetTicks
#include <algorithm> // for min
#include <iostream> // for basic_ostream, operator<<, cout, endl
#include "defines.h" // for GAMECANVAS_HEIGHT, GAMECANVAS_WIDTH
#include "global_events.h" // for check
#include "global_inputs.h" // for check
#include "jail_audio.h" // for JA_SetVolume, JA_PlayMusic, JA_StopM...
#include "options.h" // for Options, options, OptionsVideo, Sect...
#include "resource.h" // for Resource
#include "screen.h" // for Screen
#include "sprite.h" // for Sprite
#include "text.h" // for Text, TEXT_STROKE
#include "texture.h" // for Texture
#include "utils.h" // for Color, stringToColor, Palette
#include <SDL2/SDL_blendmode.h> // for SDL_BLENDMODE_BLEND
#include <SDL2/SDL_error.h> // for SDL_GetError
#include <SDL2/SDL_events.h> // for SDL_PollEvent, SDL_Event
#include <SDL2/SDL_pixels.h> // for SDL_PIXELFORMAT_RGBA8888
#include <SDL2/SDL_rect.h> // for SDL_Rect
#include <SDL2/SDL_timer.h> // for SDL_GetTicks
#include <algorithm> // for min
#include <iostream> // for basic_ostream, operator<<, cout, endl
#include "defines.h" // for GAMECANVAS_HEIGHT, options.game.width
#include "global_events.h" // for check
#include "global_inputs.h" // for check
#include "jail_audio.h" // for JA_SetVolume, JA_PlayMusic, JA_StopM...
#include "options.h" // for Options, options, OptionsVideo, Sect...
#include "resource.h" // for Resource
#include "screen.h" // for Screen
#include "sprite.h" // for Sprite
#include "text.h" // for Text, TEXT_STROKE
#include "texture.h" // for Texture
#include "utils.h" // for Color, stringToColor, Palette
// Constructor
Ending::Ending()
@@ -42,15 +42,8 @@ Ending::Ending()
// Cambia el color del borde
Screen::get()->setBorderColor(stringToColor(options.video.palette, "black"));
// Crea la textura para cubrir el rexto
cover_texture_ = SDL_CreateTexture(Screen::get()->getRenderer(), SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT + 8);
if (cover_texture_ == nullptr)
{
if (options.console)
{
std::cout << "Error: canvasTexture could not be created!\nSDL Error: " << SDL_GetError() << std::endl;
}
}
// Crea la textura para cubrir el texto
cover_texture_ = createTexture(Screen::get()->getRenderer(), options.game.width, options.game.height + 8);
SDL_SetTextureBlendMode(cover_texture_, SDL_BLENDMODE_BLEND);
// Rellena la textura para la cortinilla
@@ -60,7 +53,6 @@ Ending::Ending()
// Destructor
Ending::~Ending()
{
// Libera la memoria de los objetos
SDL_DestroyTexture(cover_texture_);
}
@@ -99,19 +91,19 @@ void Ending::render()
Screen::get()->start();
// Limpia la pantalla
Screen::get()->clean(stringToColor(options.video.palette, "black"));
Screen::get()->clean(stringToColor(options.video.palette, "yellow"));
// Dibuja las imagenes de la escena
sprite_pics_[current_scene_].sprite->render();
sprite_pics_[current_scene_].cover_sprite->render();
sprite_pics_.at(current_scene_).image_sprite->render();
sprite_pics_.at(current_scene_).cover_sprite->render();
// Dibuja los textos de la escena
for (auto ti : scenes_[current_scene_].text_index)
for (const auto &ti : scenes_.at(current_scene_).text_index)
{
if (counter_ > ti.trigger)
{
sprite_texts_[ti.index].sprite->render();
sprite_texts_[ti.index].cover_sprite->render();
sprite_texts_.at(ti.index).image_sprite->render();
sprite_texts_.at(ti.index).cover_sprite->render();
}
}
@@ -176,26 +168,26 @@ void Ending::iniTexts()
// Crea los sprites
sprite_texts_.clear();
for (const auto &t : texts)
for (const auto &txt : texts)
{
auto text = Resource::get()->getText("smb2");
const int WIDTH = text->lenght(t.caption, 1) + 2 + 2;
const int WIDTH = text->lenght(txt.caption, 1) + 2 + 2;
const int HEIGHT = text->getCharacterSize() + 2 + 2;
Color color = stringToColor(options.video.palette, "black");
EndingTexture st;
// Crea la texture
st.texture = std::make_shared<Texture>(Screen::get()->getRenderer());
st.texture->createBlank(WIDTH, HEIGHT);
st.texture->setAsRenderTarget(Screen::get()->getRenderer());
st.texture->setBlendMode(SDL_BLENDMODE_BLEND);
text->writeDX(TEXT_STROKE, 2, 2, t.caption, 1, color, 2, color);
// Crea la textura
st.image_texture = std::make_shared<Texture>(Screen::get()->getRenderer());
st.image_texture->createBlank(WIDTH, HEIGHT);
st.image_texture->setAsRenderTarget(Screen::get()->getRenderer());
st.image_texture->setBlendMode(SDL_BLENDMODE_BLEND);
text->writeDX(TEXT_STROKE, 2, 2, txt.caption, 1, color, 2, color);
// Crea el sprite
st.sprite = std::make_shared<Sprite>(st.texture, 0, 0, st.texture->getWidth(), st.texture->getHeight());
st.sprite->setPosition((GAMECANVAS_WIDTH - st.texture->getWidth()) / 2, t.pos);
st.image_sprite = std::make_shared<Sprite>(st.image_texture, 0, 0, st.image_texture->getWidth(), st.image_texture->getHeight());
st.image_sprite->setPosition((options.game.width - st.image_texture->getWidth()) / 2, txt.pos);
// Crea la coverTexture
st.cover_texture = std::make_shared<Texture>(Screen::get()->getRenderer());
@@ -207,7 +199,7 @@ void Ending::iniTexts()
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), 0, 0, 0, 0);
SDL_RenderClear(Screen::get()->getRenderer());
// Los primeros 8 pixels crea una malla
// Crea una malla de 8 pixels de alto
color = stringToColor(options.video.palette, "black");
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), color.r, color.g, color.b, 0xFF);
for (int i = 0; i < WIDTH; i += 2)
@@ -229,12 +221,12 @@ void Ending::iniTexts()
// Crea el sprite
st.cover_sprite = std::make_shared<Sprite>(st.cover_texture, 0, 0, st.cover_texture->getWidth(), st.cover_texture->getHeight() - 8);
st.cover_sprite->setPosition((GAMECANVAS_WIDTH - st.cover_texture->getWidth()) / 2, t.pos);
st.cover_sprite->setClip(0, 8, -1, -1);
st.cover_sprite->setPosition((options.game.width - st.cover_texture->getWidth()) / 2, txt.pos);
st.cover_sprite->setClip(0, 8, st.cover_texture->getWidth(), st.cover_texture->getHeight());
// Inicializa variables
st.clip_desp = 8;
st.clip_height = HEIGHT;
st.cover_clip_desp = 8;
st.cover_clip_height = HEIGHT;
sprite_texts_.push_back(st);
}
@@ -266,22 +258,22 @@ void Ending::iniPics()
// Crea los sprites
sprite_pics_.clear();
for (const auto &p : pics)
for (const auto &pic : pics)
{
EndingTexture sp;
// Crea la texture
sp.texture = Resource::get()->getTexture(p.caption);
const int width = sp.texture->getWidth();
const int height = sp.texture->getHeight();
sp.image_texture = Resource::get()->getTexture(pic.caption);
const int WIDTH = sp.image_texture->getWidth();
const int HEIGHT = sp.image_texture->getHeight();
// Crea el sprite
sp.sprite = std::make_shared<Sprite>(sp.texture, 0, 0, width, height);
sp.sprite->setPosition((GAMECANVAS_WIDTH - width) / 2, p.pos);
sp.image_sprite = std::make_shared<Sprite>(sp.image_texture, 0, 0, WIDTH, HEIGHT);
sp.image_sprite->setPosition((options.game.width - WIDTH) / 2, pic.pos);
// Crea la coverTexture
sp.cover_texture = std::make_shared<Texture>(Screen::get()->getRenderer());
sp.cover_texture->createBlank(width, height + 8);
sp.cover_texture->createBlank(WIDTH, HEIGHT + 8);
sp.cover_texture->setAsRenderTarget(Screen::get()->getRenderer());
sp.cover_texture->setBlendMode(SDL_BLENDMODE_BLEND);
@@ -289,10 +281,10 @@ void Ending::iniPics()
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), 0, 0, 0, 0);
SDL_RenderClear(Screen::get()->getRenderer());
// Los primeros 8 pixels crea una malla
// Crea una malla en los primeros 8 pixels
Color c = stringToColor(options.video.palette, "black");
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), c.r, c.g, c.b, 0xFF);
for (int i = 0; i < width; i += 2)
for (int i = 0; i < WIDTH; i += 2)
{
SDL_RenderDrawPoint(Screen::get()->getRenderer(), i, 0);
SDL_RenderDrawPoint(Screen::get()->getRenderer(), i, 2);
@@ -304,19 +296,19 @@ void Ending::iniPics()
}
// El resto se rellena de color sólido
SDL_Rect rect = {0, 8, width, height};
SDL_Rect rect = {0, 8, WIDTH, HEIGHT};
c = stringToColor(options.video.palette, "black");
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), c.r, c.g, c.b, 0xFF);
SDL_RenderFillRect(Screen::get()->getRenderer(), &rect);
// Crea el sprite
sp.cover_sprite = std::make_shared<Sprite>(sp.cover_texture, 0, 0, sp.cover_texture->getWidth(), sp.cover_texture->getHeight() - 8);
sp.cover_sprite->setPosition((GAMECANVAS_WIDTH - sp.cover_texture->getWidth()) / 2, p.pos);
sp.cover_sprite->setClip(0, 8, -1, -1);
sp.cover_sprite->setPosition((options.game.width - sp.cover_texture->getWidth()) / 2, pic.pos);
sp.cover_sprite->setClip(0, 8, sp.cover_texture->getWidth(), sp.cover_texture->getHeight());
// Inicializa variables
sp.clip_desp = 8;
sp.clip_height = height;
sp.cover_clip_desp = 8;
sp.cover_clip_height = HEIGHT;
sprite_pics_.push_back(sp);
}
@@ -327,7 +319,7 @@ void Ending::iniScenes()
{
// Variable para los tiempos
int trigger;
const int lapse = 80;
constexpr int LAPSE = 80;
// Crea el contenedor
SceneData sc;
@@ -340,13 +332,13 @@ void Ending::iniScenes()
sc.picture_index = 0;
sc.text_index.clear();
trigger = 85 * 2;
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({0, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({1, trigger});
trigger += lapse * 3;
trigger += LAPSE * 3;
sc.text_index.push_back({2, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({3, trigger});
scenes_.push_back(sc);
@@ -355,17 +347,17 @@ void Ending::iniScenes()
sc.picture_index = 1;
sc.text_index.clear();
trigger = 140 * 2;
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({4, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({5, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({6, trigger});
trigger += lapse * 3;
trigger += LAPSE * 3;
sc.text_index.push_back({7, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({8, trigger});
trigger += lapse * 3;
trigger += LAPSE * 3;
sc.text_index.push_back({9, trigger});
scenes_.push_back(sc);
@@ -374,9 +366,9 @@ void Ending::iniScenes()
sc.picture_index = 2;
sc.text_index.clear();
trigger = 148 / 2;
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({10, trigger});
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({11, trigger});
scenes_.push_back(sc);
@@ -385,9 +377,9 @@ void Ending::iniScenes()
sc.picture_index = 3;
sc.text_index.clear();
trigger = 87 / 2;
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({12, trigger});
trigger += lapse / 2;
trigger += LAPSE / 2;
sc.text_index.push_back({13, trigger});
scenes_.push_back(sc);
@@ -396,11 +388,11 @@ void Ending::iniScenes()
sc.picture_index = 4;
sc.text_index.clear();
trigger = 91 * 2;
trigger += lapse;
trigger += LAPSE;
sc.text_index.push_back({14, trigger});
trigger += lapse * 2;
trigger += LAPSE * 2;
sc.text_index.push_back({15, trigger});
trigger += lapse * 3;
trigger += LAPSE * 3;
sc.text_index.push_back({16, trigger});
scenes_.push_back(sc);
}
@@ -442,44 +434,45 @@ void Ending::updateCounters()
// Actualiza las cortinillas de los elementos
void Ending::updateSpriteCovers()
{ // Actualiza la cortinilla de los textos
{
// Actualiza la cortinilla de los textos
if (counter_ % 4 == 0)
{
for (auto ti : scenes_[current_scene_].text_index)
for (auto ti : scenes_.at(current_scene_).text_index)
{
if (counter_ > ti.trigger)
{
if (sprite_texts_[ti.index].clip_desp > 0)
if (sprite_texts_.at(ti.index).cover_clip_desp > 0)
{
sprite_texts_[ti.index].clip_desp -= 2;
sprite_texts_.at(ti.index).cover_clip_desp -= 2;
}
else if (sprite_texts_[ti.index].clip_height > 0)
else if (sprite_texts_.at(ti.index).cover_clip_height > 0)
{
sprite_texts_[ti.index].clip_height -= 2;
sprite_texts_[ti.index].cover_sprite->setY(sprite_texts_[ti.index].cover_sprite->getY() + 2);
sprite_texts_.at(ti.index).cover_clip_height -= 2;
sprite_texts_.at(ti.index).cover_sprite->setY(sprite_texts_.at(ti.index).cover_sprite->getY() + 2);
}
sprite_texts_[ti.index].cover_sprite->setClip(0, sprite_texts_[ti.index].clip_desp, sprite_texts_[ti.index].cover_sprite->getWidth(), sprite_texts_[ti.index].clip_height);
sprite_texts_.at(ti.index).cover_sprite->setClip(0, sprite_texts_.at(ti.index).cover_clip_desp, sprite_texts_.at(ti.index).cover_sprite->getWidth(), sprite_texts_.at(ti.index).cover_clip_height);
}
}
}
// Actualiza la cortinilla de las imagenes
// Actualiza la cortinilla de las imágenes
if (counter_ % 2 == 0)
{
if (sprite_pics_[current_scene_].clip_desp > 0)
if (sprite_pics_.at(current_scene_).cover_clip_desp > 0)
{
sprite_pics_[current_scene_].clip_desp -= 2;
sprite_pics_.at(current_scene_).cover_clip_desp -= 2;
}
else if (sprite_pics_[current_scene_].clip_height > 0)
else if (sprite_pics_.at(current_scene_).cover_clip_height > 0)
{
sprite_pics_[current_scene_].clip_height -= 2;
if (sprite_pics_[current_scene_].clip_height < 0)
sprite_pics_.at(current_scene_).cover_clip_height -= 2;
if (sprite_pics_.at(current_scene_).cover_clip_height < 0)
{
sprite_pics_[current_scene_].clip_height = 0;
sprite_pics_.at(current_scene_).cover_clip_height = 0;
}
sprite_pics_[current_scene_].cover_sprite->setY(sprite_pics_[current_scene_].cover_sprite->getY() + 2);
sprite_pics_.at(current_scene_).cover_sprite->setY(sprite_pics_.at(current_scene_).cover_sprite->getY() + 2);
}
sprite_pics_[current_scene_].cover_sprite->setClip(0, sprite_pics_[current_scene_].clip_desp, sprite_pics_[current_scene_].cover_sprite->getWidth(), sprite_pics_[current_scene_].clip_height);
sprite_pics_.at(current_scene_).cover_sprite->setClip(0, sprite_pics_.at(current_scene_).cover_clip_desp, sprite_pics_.at(current_scene_).cover_sprite->getWidth(), sprite_pics_.at(current_scene_).cover_clip_height);
}
}
@@ -536,10 +529,11 @@ void Ending::fillCoverTexture()
void Ending::renderCoverTexture()
{
if (cover_counter_ > 0)
{ // Dibuja la textura que cubre el texto
const int offset = std::min(cover_counter_, 100);
SDL_Rect srcRect = {0, 200 - (cover_counter_ * 2), 256, offset * 2};
SDL_Rect dstRect = {0, 0, 256, offset * 2};
{
// Dibuja la textura que cubre el texto
const int OFFSET = std::min(cover_counter_, 100);
SDL_Rect srcRect = {0, 200 - (cover_counter_ * 2), 256, OFFSET * 2};
SDL_Rect dstRect = {0, 0, 256, OFFSET * 2};
SDL_RenderCopy(Screen::get()->getRenderer(), cover_texture_, &srcRect, &dstRect);
}
}