archives/gates_of_skeldal
2
0
Fork 0
mirror of https://github.com/ondra-novak/gates_of_skeldal.git synced 2025-07-15 10:46:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix memory leak in restore_items

Browse source
This commit is contained in:
Ondřej Novák 2025-03-16 15:44:44 +01:00
parent 1297cccd70
commit 66aaaeaf50
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
game/gamesave.c
View file

@ -231,6 +231,7 @@ void restore_items(TMPFILE_RD *f)
for(i=0;i<mapsize*4;i++) if (map_items[i]!=NULL) free(map_items[i]); for(i=0;i<mapsize*4;i++) if (map_items[i]!=NULL) free(map_items[i]);
memset(map_items,0,mapsize*4*sizeof(*map_items)); memset(map_items,0,mapsize*4*sizeof(*map_items));
free(map_items);
map_items = new_item_map; map_items = new_item_map;
} }

6
game/souboje.c
View file

@ -369,7 +369,7 @@ int vypocet_zasahu(const short *utocnik,const short *obrance, int chaos,int zbr
int ospod; int ospod;
int attack_roll,defense_roll,mag_att_roll,mg_def; int attack_roll,defense_roll,mag_att_roll,mg_def;
int dmzhit = 0; int dmzhit = 0;
int ddostal = 0; // int ddostal = 0;
int disadv = 0; int disadv = 0;
int obrbonus = obrance[VLS_OBRAT]/5; int obrbonus = obrance[VLS_OBRAT]/5;
int magbonus = utocnik[VLS_SMAGIE]/5; int magbonus = utocnik[VLS_SMAGIE]/5;
@ -424,7 +424,7 @@ int vypocet_zasahu(const short *utocnik,const short *obrance, int chaos,int zbr
if (zasah<0) zasah=0; if (zasah<0) zasah=0;
int damage = utocnik[VLS_DAMAGE]+zbran; int damage = utocnik[VLS_DAMAGE]+zbran;
if (zasah<=0 || damage<=0) damage = 0; if (zasah<=0 || damage<=0) damage = 0;
ddostal=zasah; // ddostal=zasah;
zasah+=damage; zasah+=damage;
if (log_combat) { if (log_combat) {
wzprintf(">"); wzprintf(">");
@ -457,7 +457,7 @@ int vypocet_zasahu(const short *utocnik,const short *obrance, int chaos,int zbr
int tmp = zasah; int tmp = zasah;
zasah/=2; zasah/=2;
if (log_combat) wzprintf( "Physical resistance applied: %d - %d (half)= %d\n", tmp,tmp - zasah, zasah); if (log_combat) wzprintf( "Physical resistance applied: %d - %d (half)= %d\n", tmp,tmp - zasah, zasah);
ddostal = zasah; // ddostal = zasah;
} }
int total_hit = zasah+dmzhit; int total_hit = zasah+dmzhit;
if (log_combat) { if (log_combat) {