Browse Source

- 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://svn.code.sf.net/p/rathena/svn/trunk@8399 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 19 years ago
parent
commit
cb54955cc4
4 changed files with 11 additions and 5 deletions
  1. 8 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/atcommand.c
  3. 1 1
      src/map/pc.c
  4. 1 3
      src/map/script.c

+ 8 - 0
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.
 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.
 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
 2006/08/20
 	* Added a check during mob_db loading so that the six basic stats, max hp
 	* 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
 	  and max sp are never below 1, as this could cause crashes when using

+ 1 - 1
src/map/atcommand.c

@@ -510,7 +510,7 @@ static AtCommandInfo atcommand_info[] = {
 	{ AtCommand_Charstoreall,		"@charstoreall",		40, atcommand_charstoreall }, // MouseJstr
 	{ AtCommand_Charstoreall,		"@charstoreall",		40, atcommand_charstoreall }, // MouseJstr
 	{ AtCommand_Skillid,			"@skillid",			40, atcommand_skillid }, // MouseJstr
 	{ AtCommand_Skillid,			"@skillid",			40, atcommand_skillid }, // MouseJstr
 	{ AtCommand_Useskill,			"@useskill",		40, atcommand_useskill }, // 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_Snow,				"@snow",			99, atcommand_snow },
 	{ AtCommand_Sakura,			"@sakura",			99, atcommand_sakura },
 	{ AtCommand_Sakura,			"@sakura",			99, atcommand_sakura },
 	{ AtCommand_Clouds,			"@clouds",			99, atcommand_clouds },
 	{ AtCommand_Clouds,			"@clouds",			99, atcommand_clouds },

+ 1 - 1
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;
 	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;
 		save_flag = 1;
 		return 1;
 		return 1;
 	}
 	}

+ 1 - 3
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
 		//is this item important? does it have cards? or Player's name? or Refined/Upgraded
 		if(itemdb_isspecial(sd->status.inventory[i].card[0]) ||
 		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) {
 		  	sd->status.inventory[i].refine) {
 			//this is important item, count it (except for pet eggs)
 			//this is important item, count it (except for pet eggs)
 			if(sd->status.inventory[i].card[0] != CARD0_PET)
 			if(sd->status.inventory[i].card[0] != CARD0_PET)