* Delayed the check for required items when a skill is cast to when they are consumed. Now skills only fail due to lack of items after being cast.

- Please make a bug report if you know of any skill that doesn't work like this in official.
* Fixed hp of other party members not being sent when you join a party.
* Removed unused global array names_id and renamed some structures that are used with variables of the same name.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11384 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/pet.h b/src/map/pet.h
index 821874359..8ecf94d93 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -7,7 +7,7 @@
 #define MAX_PET_DB	300
 #define MAX_PETLOOT_SIZE	30 // [Valaris] - Changed to MAX_PETLOOT_SIZE [Skotlex]
 
-struct pet_db {
+struct s_pet_db {
 	short class_;
 	char name[NAME_LENGTH],jname[NAME_LENGTH];
 	short itemID;
@@ -29,7 +29,7 @@ struct pet_db {
 	int change_target_rate;
 	struct script_code *script;
 };
-extern struct pet_db pet_db[MAX_PET_DB];
+extern struct s_pet_db pet_db[MAX_PET_DB];
 
 enum { PET_CLASS,PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };