jaildesigner-jailgames/projecte_2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mes canvis de merda

Browse Source
This commit is contained in:
Sergio
2026-04-07 21:38:23 +02:00
parent f3b113c95e
commit 0760dfc739
8 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/game/scenes/game.cpp
View File

@@ -66,7 +66,7 @@ Game::Game(Mode mode)
// Crea objetos e inicializa variables
ItemTracker::init();
demoInit();
room_ = std::make_shared<Room>(current_room_, scoreboard_data_);
room_ = getOrCreateRoom(current_room_);
initPlayer(spawn_data_, room_);
game_backbuffer_surface_ = std::make_shared<Surface>(Options::game.width, Options::game.height);
changeRoom(current_room_);
@@ -314,6 +314,7 @@ void Game::updatePlaying(float delta_time) {
if (transitioning_) {
transition_old_room_->update(delta_time);
}
updateAdjacentRooms(delta_time);
switch (mode_) {
case Mode::GAME:
#ifdef _DEBUG
@@ -420,8 +421,10 @@ void Game::transitionToState(State new_state) {
// Lógica de ENTRADA según el nuevo estado
if (new_state == State::BLACK_SCREEN) {
// Limpiar caché de habitaciones (enemigos vuelven a sus posiciones iniciales)
room_cache_.clear();
// Respawn room y player
room_ = std::make_shared<Room>(current_room_, scoreboard_data_);
room_ = getOrCreateRoom(current_room_);
initPlayer(spawn_data_, room_);
// Pausar ambos
room_->setPaused(true);
@@ -763,8 +766,8 @@ auto Game::changeRoom(const std::string& room_path) -> bool {
// Verifica que exista el fichero que se va a cargar
if (!Resource::List::get()->get(room_path).empty()) { // NOLINT(readability-static-accessed-through-instance)
// Crea un objeto habitación nuevo a partir del fichero
room_ = std::make_shared<Room>(room_path, scoreboard_data_);
// Obtiene la habitación del caché o la crea
room_ = getOrCreateRoom(room_path);
// Pone el color del marcador en función del color del borde de la habitación
if (room_tracker_->addRoom(room_path)) {
@@ -788,6 +791,32 @@ auto Game::changeRoom(const std::string& room_path) -> bool {
return false;
}
// Obtiene una habitación del caché o la crea si no existe
auto Game::getOrCreateRoom(const std::string& room_path) -> std::shared_ptr<Room> {
auto it = room_cache_.find(room_path);
if (it != room_cache_.end()) {
return it->second;
}
auto room = std::make_shared<Room>(room_path, scoreboard_data_);
room_cache_[room_path] = room;
return room;
}
// Actualiza los enemigos de las habitaciones adyacentes a la actual
void Game::updateAdjacentRooms(float delta_time) {
for (auto border : {Room::Border::TOP, Room::Border::RIGHT, Room::Border::BOTTOM, Room::Border::LEFT}) {
const auto ROOM_NAME = room_->getRoom(border);
if (ROOM_NAME == "0") {
continue;
}
auto adjacent = getOrCreateRoom(ROOM_NAME);
// Evitar actualizar la habitación actual o la que ya se actualiza en la transición
if (adjacent != room_ && adjacent != transition_old_room_) {
adjacent->update(delta_time);
}
}
}
// Comprueba si el jugador esta en el borde de la pantalla
void Game::checkPlayerIsOnBorder() {
// No permitir transiciones encadenadas