JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma

Browse Source
This commit is contained in:
Sergio
2022-10-22 12:54:07 +02:00
parent 681e39644d 2921952ea5
commit a1c2df27c9
29 changed files with 395 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/demo.cpp
View File

@@ -5,12 +5,12 @@ Demo::Demo(SDL_Renderer *renderer, Screen *screen, Asset *asset, Debug *debug)
{
// Inicia algunas variables
board.iniClock = SDL_GetTicks();
rooms.push_back("04.room");
rooms.push_back("03.room");
rooms.push_back("02.room");
rooms.push_back("01.room");
rooms.push_back("05.room");
rooms.push_back("06.room");
rooms.push_back("54.room");
rooms.push_back("16.room");
rooms.push_back("45.room");
rooms.push_back("60.room");
rooms.push_back("58.room");
roomIndex = 0;
currentRoom = rooms.at(roomIndex);
@@ -157,7 +157,7 @@ void Demo::render()
scoreboard->render();
screen->renderFX();
text->write(0, 0, std::to_string(counter));
//text->write(0, 0, std::to_string(counter));
// Actualiza la pantalla
screen->blit();

23
source/director.cpp
View File

@@ -9,7 +9,7 @@ Director::Director(std::string path)
section.name = SECTION_PROG_LOGO;
section.subsection = SUBSECTION_LOGO_TO_INTRO;
section.name = SECTION_PROG_CREDITS;
section.name = SECTION_PROG_GAME;
// Crea el objeto que controla los ficheros de recursos
asset = new Asset(path.substr(0, path.find_last_of("\\/")));
@@ -353,14 +353,17 @@ bool Director::initSDL()
// Crea el indice de ficheros
bool Director::setFileList()
{
// Texto
asset->add("/../data/font/smb2.png", t_font);
asset->add("/../data/font/smb2.txt", t_font);
asset->add("/../data/font/debug.png", t_font);
asset->add("/../data/font/debug.txt", t_font);
// Configuración
asset->add("/../data/input/gamecontrollerdb.txt", t_data);
asset->add("/../data/config/config.txt", t_data, false);
// Habitaciones
asset->add("/../data/room/01.room", t_room);
asset->add("/../data/room/02.room", t_room);
asset->add("/../data/room/03.room", t_room);
@@ -422,6 +425,7 @@ bool Director::setFileList()
asset->add("/../data/room/59.room", t_room);
asset->add("/../data/room/60.room", t_room);
// Tilemaps
asset->add("/../data/room/01.tmx", t_room);
asset->add("/../data/room/02.tmx", t_room);
asset->add("/../data/room/03.tmx", t_room);
@@ -483,8 +487,11 @@ bool Director::setFileList()
asset->add("/../data/room/59.tmx", t_room);
asset->add("/../data/room/60.tmx", t_room);
// Tilesets
asset->add("/../data/tilesets/standard.png", t_bitmap);
asset->add("/../data/tilesets/standard_zxarne.png", t_bitmap);
// Enemigos
asset->add("/../data/enemies/paco.png", t_bitmap);
asset->add("/../data/enemies/paco.ani", t_data);
asset->add("/../data/enemies/chip.png", t_bitmap);
@@ -545,18 +552,30 @@ bool Director::setFileList()
asset->add("/../data/enemies/amstrad_character_set.ani", t_data);
asset->add("/../data/enemies/breakout.png", t_bitmap);
asset->add("/../data/enemies/breakout.ani", t_data);
asset->add("/../data/enemies/lamp.png", t_bitmap);
asset->add("/../data/enemies/lamp.ani", t_data);
asset->add("/../data/enemies/bry.png", t_bitmap);
asset->add("/../data/enemies/bry.ani", t_data);
asset->add("/../data/enemies/tv.png", t_bitmap);
asset->add("/../data/enemies/tv.ani", t_data);
asset->add("/../data/enemies/tv_panel.png", t_bitmap);
asset->add("/../data/enemies/tv_panel.ani", t_data);
// Jugador
asset->add("/../data/player/player.png", t_bitmap);
asset->add("/../data/player/player.ani", t_data);
// Items
asset->add("/../data/items/items.png", t_bitmap);
// Musicas
asset->add("/../data/music/title.ogg", t_music);
asset->add("/../data/music/game.ogg", t_music);
asset->add("/../data/music/loading_sound1.ogg", t_music);
asset->add("/../data/music/loading_sound2.ogg", t_music);
asset->add("/../data/music/loading_sound3.ogg", t_music);
// Efectos de sonido
asset->add("/../data/sound/item.wav", t_sound);
asset->add("/../data/sound/death.wav", t_sound);
asset->add("/../data/sound/jump1.wav", t_sound);
@@ -584,10 +603,12 @@ bool Director::setFileList()
asset->add("/../data/sound/jump23.wav", t_sound);
asset->add("/../data/sound/jump24.wav", t_sound);
// Logo
asset->add("/../data/logo/jailgames.png", t_bitmap);
asset->add("/../data/logo/since_1998.png", t_bitmap);
asset->add("/../data/logo/seagull.png", t_bitmap);
// Intro
asset->add("/../data/title/loading_screen1.png", t_bitmap);
asset->add("/../data/title/loading_screen2.png", t_bitmap);

2
source/game.cpp
View File

@@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
// ****
// this->debug->setEnabled(true);
currentRoom = "51.room";
currentRoom = "53.room";
const int x = 30;
const int y = 13;
spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};