summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/char_sql/char.c1
-rw-r--r--src/map/mob.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 52cc8ef2e..66434285f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/27
+ * Removed a redeclared variable i in the parsing of the fame list (char-txt
+ server) which seems to be the cause of the random memory corruptions.
+ [Skotlex]
* Updated item_db.sql to latest. [Toms]
* Fix homunc & code cleanup [Toms]
- Timer problems on delete_timer
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 059e1aace..098736caf 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2877,7 +2877,6 @@ int parse_frommap(int fd) {
if (RFIFOREST(fd) < 12)
return 0;
{
- int i;
int id = RFIFOL(fd, 2);
int fame = RFIFOL(fd, 6);
char type = RFIFOB(fd, 10);
diff --git a/src/map/mob.c b/src/map/mob.c
index 961e79c49..7eed36758 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1765,7 +1765,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
mvp_sd=(struct map_session_data *)tmpbl[temp];
mvp_damage=md->dmglog[i].dmg;
}
-
temp++; // [Lance]
}
count = i; //Total number of attackers.