diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-16 03:12:22 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-16 03:12:22 +0000 |
| commit | 44a3fb6000736374fbad13159f5a955151f039e9 (patch) | |
| tree | 4fd9e4eac42d41855b767615f720dca03a000749 | |
| parent | e71b9760374db9f0958dc8b9861d5f20d1d626a7 (diff) | |
| download | hercules-44a3fb6000736374fbad13159f5a955151f039e9.tar.gz hercules-44a3fb6000736374fbad13159f5a955151f039e9.tar.bz2 hercules-44a3fb6000736374fbad13159f5a955151f039e9.tar.xz hercules-44a3fb6000736374fbad13159f5a955151f039e9.zip | |
- Fixed crash in chrif_load_scdata warning message.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5293 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/chrif.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8583617bc..3aba15473 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 c1d127a44..52cb3ef05 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);
|