From 02f5d21c3228ddc43da70f77bf000e6bb59849bb Mon Sep 17 00:00:00 2001 From: Ondrej Novak Date: Fri, 14 Feb 2025 20:44:02 +0100 Subject: [PATCH] some fixes in win --- game/engine1.c | 2 +- game/gamesave.c | 18 +++++++++--------- game/skeldal.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/game/engine1.c b/game/engine1.c index 9cc0075..6729133 100644 --- a/game/engine1.c +++ b/game/engine1.c @@ -37,7 +37,7 @@ static short zooming_points[ZOOM_PHASES][4] {480,271,80,28}, {460,259,90,31} }; -static int zooming_step=2; +static int zooming_step=1; static int rot_phases=1; //int yreq; int last_scale; diff --git a/game/gamesave.c b/game/gamesave.c index 078a865..348ee3c 100644 --- a/game/gamesave.c +++ b/game/gamesave.c @@ -41,7 +41,7 @@ static TMPFILE_WR *story=NULL; static char load_another; static unsigned long current_campaign = 0; -static long prev_game_time_save = 0; +static long prev_game_time_save = -999; char reset_mobiles=0; @@ -617,14 +617,14 @@ int save_basic_info() s.game_time=game_time; s.enable_sort=enable_sort; s.sleep_long=sleep_ticks; - s.sample_vol=get_snd_effect(SND_GFX); - s.music_vol=get_snd_effect(SND_MUSIC); - s.xbass=get_snd_effect(SND_XBASS); - s.bass=get_snd_effect(SND_BASS); - s.treble=get_snd_effect(SND_TREBL); - s.stereing=get_snd_effect(SND_LSWAP); - s.swapchans=get_snd_effect(SND_SWAP); - s.out_filter=get_snd_effect(SND_OUTFILTER); + s.sample_vol=MIN(get_snd_effect(SND_GFX),255); + s.music_vol=MIN(get_snd_effect(SND_MUSIC),255); + s.xbass=MIN(get_snd_effect(SND_XBASS),255); + s.bass=MIN(get_snd_effect(SND_BASS),255); + s.treble=MIN(get_snd_effect(SND_TREBL),255); + s.stereing=MIN(get_snd_effect(SND_LSWAP),255); + s.swapchans=MIN(get_snd_effect(SND_SWAP),255); + s.out_filter=MIN(get_snd_effect(SND_OUTFILTER),255); s.autosave=autosave_enabled; s.game_flags=(enable_glmap!=0); strcopy_n(s.level_name,level_fname,sizeof(s.level_name)); diff --git a/game/skeldal.c b/game/skeldal.c index 690e689..1ace968 100644 --- a/game/skeldal.c +++ b/game/skeldal.c @@ -388,7 +388,7 @@ const void *load_mob_legacy_format(const void *p, int32_t *s) { d+=nx; ofs=nx; nx = sizeof(TMOB); - memcpy(d, c, nx - ofs); //last padding 1 + memcpy(d, c, nx - ofs-1); //last padding 1 c+=nx - ofs - 1; } *s = count * sizeof(TMOB);