diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 14:05:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 14:05:24 +0000 |
| commit | 74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984 (patch) | |
| tree | 0399235ad0454e7baa6ab1c93b5b338f9ef8bfa5 | |
| parent | 4d56e510be1ebe8075e3e186cf501c2fe8617952 (diff) | |
| download | hercules-74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984.tar.gz hercules-74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984.tar.bz2 hercules-74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984.tar.xz hercules-74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984.zip | |
- Fixed the Autosave routine not working when there's only one player online.
- Disabled command @rain since the client no longer supports it anyway.
- Fixed delitem not checking for the first slot's card, also optimized it so that it doesn't checks on the other slots.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8399 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 8 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 663e4a63f..33ccc89a2 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -2,6 +2,14 @@ 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.
+
+2006/08/21
+ * Fixed the Autosave routine not working when there's only one player
+ online. [Skotlex]
+ * Disabled command @rain since the client no longer supports it anyway.
+ [Skotlex]
+ * Fixed delitem not checking for the first slot's card, also optimized it
+ so that it doesn't checks on the other slots. [Skotlex]
2006/08/20
* Added a check during mob_db loading so that the six basic stats, max hp
and max sp are never below 1, as this could cause crashes when using
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index b07d77520..c18a94425 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -510,7 +510,7 @@ static AtCommandInfo atcommand_info[] = { { AtCommand_Charstoreall, "@charstoreall", 40, atcommand_charstoreall }, // MouseJstr
{ AtCommand_Skillid, "@skillid", 40, atcommand_skillid }, // MouseJstr
{ AtCommand_Useskill, "@useskill", 40, atcommand_useskill }, // MouseJstr
- { AtCommand_Rain, "@rain", 99, atcommand_rain },
+// { AtCommand_Rain, "@rain", 99, atcommand_rain }, //Client no longer supports rain!
{ AtCommand_Snow, "@snow", 99, atcommand_snow },
{ AtCommand_Sakura, "@sakura", 99, atcommand_sakura },
{ AtCommand_Clouds, "@clouds", 99, atcommand_clouds },
diff --git a/src/map/pc.c b/src/map/pc.c index befbce5f8..50e97249e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6858,7 +6858,7 @@ static int pc_autosave_sub(DBKey key,void * data,va_list app) { struct map_session_data *sd = (TBL_PC*)data; - if(sd->bl.id == last_save_id) { + if(sd->bl.id == last_save_id && save_flag != 1) { save_flag = 1; return 1; } diff --git a/src/map/script.c b/src/map/script.c index 070722866..6aa199d1b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -5430,9 +5430,7 @@ int buildin_delitem(struct script_state *st) } //is this item important? does it have cards? or Player's name? or Refined/Upgraded if(itemdb_isspecial(sd->status.inventory[i].card[0]) || - sd->status.inventory[i].card[1] || - sd->status.inventory[i].card[2] || - sd->status.inventory[i].card[3] || + sd->status.inventory[i].card[0] || sd->status.inventory[i].refine) { //this is important item, count it (except for pet eggs) if(sd->status.inventory[i].card[0] != CARD0_PET) |