JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'master' of https://gitea.sustancia.synology.me/JailDoctor/thepool

Browse Source
This commit is contained in:
Raimon Zamora
2024-10-11 09:20:28 +02:00
parent 31f63516ca b5f4425672
commit 9c10b6a372
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/actor.cpp
View File

@@ -2435,13 +2435,13 @@ namespace actor
int partsCollected = 0;
bool roomVisited[MAX_ROOMS];
int livesLost = 0;
int catsLifeOdds = 5;
int catsLifeOdds = 2;
uint32_t start_time = 0;
void reset()
{
partsCollected = livesLost = 0;
catsLifeOdds = 5;
catsLifeOdds = 2;
for (int i = 0; i < MAX_ROOMS; ++i)
roomVisited[i] = false;
start_time = SDL_GetTicks();

20
source/jdraw.cpp
View File

@@ -93,9 +93,22 @@ namespace draw
sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
SDL_RendererInfo info;
const int num_render_drivers = SDL_GetNumRenderDrivers();
printf("Available renderers:\n");
for (int i=0; i<num_render_drivers; ++i)
{
SDL_GetRenderDriverInfo(i, &info);
printf(" - %i: %s\n", i, info.name);
}
SDL_GetRendererInfo(sdl_renderer, &info);
printf("\nRenderer: %s\n", info.name);
SDL_ShowCursor(false);
if (screen_fullscreen)
{
SDL_ShowCursor(false);
int w, h;
SDL_GetWindowSize(sdl_window, &w, &h);
fullscreen_scale = h/screen_height;
@@ -106,7 +119,6 @@ namespace draw
}
else
{
SDL_ShowCursor(true);
dest_rect.x = dest_rect.y = 0;
dest_rect.w = screen_width * zoom;
dest_rect.h = screen_height * zoom;
@@ -175,9 +187,10 @@ namespace draw
sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
SDL_ShowCursor(false);
if (screen_fullscreen)
{
SDL_ShowCursor(false);
int w, h;
SDL_GetWindowSize(sdl_window, &w, &h);
fullscreen_scale = h/screen_height;
@@ -188,7 +201,6 @@ namespace draw
}
else
{
SDL_ShowCursor(true);
dest_rect.x = dest_rect.y = 0;
dest_rect.w = screen_width * zoom;
dest_rect.h = screen_height * zoom;

3
source/m_game.cpp
View File

@@ -296,6 +296,7 @@ namespace modules
if ( (controller::pressed(KEY_MENU)) || (controller::pressed(KEY_PICK)) || (controller::pressed(KEY_JUMP)) )
{
missatge[0] = 0;
audio::resumeMusic();
return;
}
draw::color(BLACK);
@@ -989,6 +990,8 @@ namespace modules
void setMissatge(const char *text)
{
actor::pauseWalkSound();
audio::pauseMusic();
strcpy(missatge, text);
}

5
source/main.cpp
View File

@@ -104,9 +104,10 @@ void game::init()
{
if (game::getParams(1) && strcmp(game::getParams(1), "editor")==0) editor::setDevMode();
if (editor::isDevMode())
if (editor::isDevMode()) {
draw::init("The Pool", 520, 240, zoom);
else {
SDL_ShowCursor(true);
} else {
loadConfig();
draw::init("The Pool", 320, 240, zoom, fullscreen);
console::init();