AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't call AM_LevelInit when screen size/resolution is changed (#1464)

Browse Source
This commit is contained in:
Roman Fomin 2024-02-16 14:02:13 +07:00 committed by GitHub
parent 5aed42c18e
commit f76409d68f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/am_map.c
View File

@ -586,7 +586,7 @@ static void AM_initScreenSize(void)
if (automapoverlay && scaledviewheight == SCREENHEIGHT) if (automapoverlay && scaledviewheight == SCREENHEIGHT)
f_h = video.height; f_h = video.height;
else else
f_h = video.height - ((ST_HEIGHT * video.yscale) >> FRACBITS); f_h = video.height - V_ScaleY(ST_HEIGHT);
} }
void AM_ResetScreenSize(void) void AM_ResetScreenSize(void)
@ -624,7 +624,7 @@ static void AM_LevelInit(void)
{ {
fixed_t a = FixedDiv(f_w, (max_w>>MAPBITS < 2048) ? 2*(max_w>>MAPBITS) : 4096); fixed_t a = FixedDiv(f_w, (max_w>>MAPBITS < 2048) ? 2*(max_w>>MAPBITS) : 4096);
fixed_t b = FixedDiv(f_h, (max_h>>MAPBITS < 2048) ? 2*(max_h>>MAPBITS) : 4096); fixed_t b = FixedDiv(f_h, (max_h>>MAPBITS < 2048) ? 2*(max_h>>MAPBITS) : 4096);
scale_mtof = FixedDiv(a < b ? a : b, (int) (0.7*MAPUNIT)); scale_mtof = FixedDiv((a < b ? a : b), (int) (0.7*MAPUNIT));
} }
if (scale_mtof > max_scale_mtof) if (scale_mtof > max_scale_mtof)
@ -665,22 +665,21 @@ void AM_Stop (void)
// //
void AM_Start() void AM_Start()
{ {
static int lastlevel = -1, lastepisode = -1, last_width = -1, last_height = -1, last_viewheight = -1; static int lastlevel = -1, lastepisode = -1;
if (!stopped) if (!stopped)
AM_Stop(); AM_Stop();
stopped = false; stopped = false;
if (lastlevel != gamemap || lastepisode != gameepisode || if (lastlevel != gamemap || lastepisode != gameepisode)
last_width != video.width || last_height != video.height ||
viewheight != last_viewheight)
{ {
last_height = video.height;
last_width = video.width;
last_viewheight = viewheight;
AM_LevelInit(); AM_LevelInit();
lastlevel = gamemap; lastlevel = gamemap;
lastepisode = gameepisode; lastepisode = gameepisode;
} }
else
{
AM_ResetScreenSize();
}
AM_initVariables(); AM_initVariables();
AM_loadPics(); AM_loadPics();
} }