diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-03 17:52:26 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-03 17:52:26 +0000 |
| commit | decdda8a5c937499b7fddfe03b2fec645d1c4b1a (patch) | |
| tree | 9e247cb7443350af932867bc01292befef63ca7a | |
| parent | 356ba42e38233d3b29dd40da1d34af9b84dbb0a0 (diff) | |
| download | hercules-decdda8a5c937499b7fddfe03b2fec645d1c4b1a.tar.gz hercules-decdda8a5c937499b7fddfe03b2fec645d1c4b1a.tar.bz2 hercules-decdda8a5c937499b7fddfe03b2fec645d1c4b1a.tar.xz hercules-decdda8a5c937499b7fddfe03b2fec645d1c4b1a.zip | |
- SC_ENCHANTARMS will no longer fail to start if it's already running with a "higher elemental level".
- When trying to trade an untradeable item, the add-item-fail packet will be sent so the client does not gets stuck.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10142 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/status.c | 1 | ||||
| -rw-r--r-- | src/map/trade.c | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3c20b9729..2e73e9a2e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,11 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/04/04 + * SC_ENCHANTARMS will no longer fail to start if it's already running with + a "higher elemental level". + * When trying to trade an untradeable item, the add-item-fail packet will + be sent so the client does not gets stuck. [Skotlex] 2007/04/03 * Some spring-cleaning in sql-files, only left SVN 8k+ files [DracoRPG] * Updated sql files [Playtester] diff --git a/src/map/status.c b/src/map/status.c index d3891898c..e3be77a41 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4882,6 +4882,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_ASPDPOTION3: case SC_ATKPOTION: case SC_MATKPOTION: + case SC_ENCHANTARMS: case SC_ARMOR_ELEMENT: break; case SC_GOSPEL: diff --git a/src/map/trade.c b/src/map/trade.c index e4bb4a4b1..77bc80bdf 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -353,6 +353,7 @@ void trade_tradeadditem(struct map_session_data *sd, int index, int amount) { !itemdb_canpartnertrade(item, trade_i, trade_weight))) //Can't partner-trade { clif_displaymessage (sd->fd, msg_txt(260)); + clif_tradeitemok(sd, index+2, 1); return; } |