Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up to ee12429

Browse Source 
The incomplete count was not updated before moving the memory that way the counter had the wrong value.
Also the memory manager would complain that the pointer is invalid when we have zero achievements.

Thanks to @CairoLee
This commit is contained in:
Lemongrass3110
2017-08-07 12:54:16 +02:00
parent 34aa59d82b
commit 8310253b84
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/map/achievement.c
View File

@@ -128,14 +128,19 @@ bool achievement_remove(struct map_session_data *sd, int achievement_id)
return false;
}
if (!sd->achievement_data.achievements[i].completed)
sd->achievement_data.incompleteCount--;
if (i != sd->achievement_data.count - 1)
memmove(&sd->achievement_data.achievements[i], &sd->achievement_data.achievements[i + 1], sizeof(struct achievement) * (sd->achievement_data.count - 1 - i));
aFree(&sd->achievement_data.achievements[sd->achievement_data.count-1]);
sd->achievement_data.count--;
if (!sd->achievement_data.achievements[i].completed)
sd->achievement_data.incompleteCount--;
RECREATE(sd->achievement_data.achievements, struct achievement, sd->achievement_data.count);
if( sd->achievement_data.count == 0 ){
sd->achievement_data.achievements = NULL;
}else{
RECREATE(sd->achievement_data.achievements, struct achievement, sd->achievement_data.count);
}
sd->achievement_data.save = true;
// Send a removed fake achievement