diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8583617bc8..3aba154734 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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. EVERYTHING ELSE GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/15 + * Fixed crash in chrif_load_scdata warning message. [Skotlex] * Fixed pets displaying "strangely" when they did not have their pet armor. [Skotlex] * Added battle config option pk_level_range for specifying valid level diff --git a/src/map/chrif.c b/src/map/chrif.c index c1d127a442..52cb3ef057 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1224,7 +1224,7 @@ int chrif_load_scdata(int fd) memcpy(&data, RFIFOP(fd,14 + i*sizeof(struct status_change_data)), sizeof(struct status_change_data)); if (data.tick < 1) { //Protection against invalid tick values. [Skotlex] - ShowWarning("chrif_load_scdata: Received invalid duration (%d ms) for status change %d (character %s)\n", data.tick, sd->status.name); + ShowWarning("chrif_load_scdata: Received invalid duration (%d ms) for status change %d (character %s)\n", data.tick, data.type, sd->status.name); continue; } status_change_start(&sd->bl, data.type, 100, data.val1, data.val2, data.val3, data.val4, data.tick, 15);