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

Arreglada la cárrega de opcions i recursos

Browse Source 
Modificats els parametros dels fitxers .ani a snake_case
This commit is contained in:
Sergio
2025-02-26 08:50:12 +01:00
parent a07a08adb7
commit a8e5517a77
67 changed files with 244 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/director.cpp
View File

@@ -1,42 +1,42 @@
#include "director.h"
#include <SDL2/SDL.h> // for SDL_Init, SDL_Quit, SDL_INIT_EV...
#include <SDL2/SDL_audio.h> // for AUDIO_S16
#include <SDL2/SDL_blendmode.h> // for SDL_BLENDMODE_BLEND
#include <SDL2/SDL_error.h> // for SDL_GetError
#include <SDL2/SDL_gamecontroller.h> // for SDL_CONTROLLER_BUTTON_B, SDL_CO...
#include <SDL2/SDL_hints.h> // for SDL_SetHint, SDL_HINT_RENDER_DR...
#include <SDL2/SDL_scancode.h> // for SDL_SCANCODE_A, SDL_SCANCODE_ES...
#include <SDL2/SDL_stdinc.h> // for Uint32
#include <SDL2/SDL_timer.h> // for SDL_GetTicks
#include <errno.h> // for errno, EEXIST, EACCES, ENAMETOO...
#include <stdio.h> // for printf, perror
#include <string.h> // for strcmp
#include <sys/stat.h> // for mkdir, stat, S_IRWXU
#include <unistd.h> // for getuid
#include <cstdlib> // for exit, EXIT_FAILURE, srand
#include <iostream> // for basic_ostream, operator<<, cout
#include <memory> // for make_unique, unique_ptr
#include <string> // for operator+, allocator, char_traits
#include "asset.h" // for Asset, AssetType
#include "cheevos.h" // for Cheevos
#include "credits.h" // for Credits
#include "debug.h" // for Debug
#include "defines.h" // for WINDOW_CAPTION, borderColor
#include "demo.h" // for Demo
#include "ending.h" // for Ending
#include "ending2.h" // for Ending2
#include "game.h" // for Game
#include "game_over.h" // for GameOver
#include "input.h" // for Input, inputs_e
#include "jail_audio.h" // for JA_GetMusicState, JA_DeleteMusic
#include "loading_screen.h" // for LoadingScreen
#include "logo.h" // for Logo
#include "notifier.h" // for Notifier
#include "options.h" // for Options, options, Section, Cheat
#include "resource.h" // for Resource
#include "screen.h" // for Screen
#include "title.h" // for Title
#include "utils.h" // for Color
#include <SDL2/SDL.h> // for SDL_Init, SDL_Quit, SDL_INIT_EV...
#include <SDL2/SDL_audio.h> // for AUDIO_S16
#include <SDL2/SDL_blendmode.h> // for SDL_BLENDMODE_BLEND
#include <SDL2/SDL_error.h> // for SDL_GetError
#include <SDL2/SDL_gamecontroller.h> // for SDL_CONTROLLER_BUTTON_B, SDL_CO...
#include <SDL2/SDL_hints.h> // for SDL_SetHint, SDL_HINT_RENDER_DR...
#include <SDL2/SDL_scancode.h> // for SDL_SCANCODE_A, SDL_SCANCODE_ES...
#include <SDL2/SDL_stdinc.h> // for Uint32
#include <SDL2/SDL_timer.h> // for SDL_GetTicks
#include <errno.h> // for errno, EEXIST, EACCES, ENAMETOO...
#include <stdio.h> // for printf, perror
#include <string.h> // for strcmp
#include <sys/stat.h> // for mkdir, stat, S_IRWXU
#include <unistd.h> // for getuid
#include <cstdlib> // for exit, EXIT_FAILURE, srand
#include <iostream> // for basic_ostream, operator<<, cout
#include <memory> // for make_unique, unique_ptr
#include <string> // for operator+, allocator, char_traits
#include "asset.h" // for Asset, AssetType
#include "cheevos.h" // for Cheevos
#include "credits.h" // for Credits
#include "debug.h" // for Debug
#include "defines.h" // for WINDOW_CAPTION, borderColor
#include "demo.h" // for Demo
#include "ending.h" // for Ending
#include "ending2.h" // for Ending2
#include "game.h" // for Game
#include "game_over.h" // for GameOver
#include "input.h" // for Input, inputs_e
#include "jail_audio.h" // for JA_GetMusicState, JA_DeleteMusic
#include "loading_screen.h" // for LoadingScreen
#include "logo.h" // for Logo
#include "notifier.h" // for Notifier
#include "options.h" // for Options, options, Section, Cheat
#include "resource.h" // for Resource
#include "screen.h" // for Screen
#include "title.h" // for Title
#include "utils.h" // for Color
#ifndef _WIN32
#include <pwd.h>
@@ -321,7 +321,7 @@ bool Director::initSDL()
const auto window_width = options.video.border.enabled ? options.game.width + options.video.border.width * 2 : options.game.width;
const auto window_height = options.video.border.enabled ? options.game.height + options.video.border.height * 2 : options.game.height;
window_ = SDL_CreateWindow(WINDOW_CAPTION, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, window_width, window_height, SDL_WINDOW_HIDDEN);
window_ = SDL_CreateWindow(WINDOW_CAPTION, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, window_width * options.window.zoom, window_height * options.window.zoom, SDL_WINDOW_HIDDEN);
if (window_ == nullptr)
{
if (options.console)