- Rewrote the txt->sql converter. It now links directly to the char server files so that it should get auto-updated with any code changes in the later.

- The converter will now also convert: account-wide variables, parties, guilds, guild storage and guild castles. At this point the only two things not converted are login-server-wide account variables (##, they belong to the login converter) and homunculus (the SQL save function is messy and doesn't lends itself to be integrated with the converter the way all the other functions are).
- Modified the char servers so they are compatible with the converter, the define TXT_SQL_CONVERT identifies sections unique to each char-server mode (this would had been a hella lot easier if both char servers where the same code-base instead of duplicated code <.<)
- Updated the Makefiles as per the new compiling requirements for the converter.
- misceffect2 will no longer cause the effect on top of the source object when it is the fake npc.
- Added check so that Frost Nova doesn't hides hitting animation on targets.
- Added the missing brackets around the trade logs condition check, thanks to Coltaro.


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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/char_sql/int_pet.h b/src/char_sql/int_pet.h
index 543dfe296..fa5cbac0d 100644
--- a/src/char_sql/int_pet.h
+++ b/src/char_sql/int_pet.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL

 // For more information, see LICENCE in the main folder

 

-#ifndef _INT_PET_H_

-#define _INT_PET_H_

+#ifndef _INT_PET_SQL_H_

+#define _INT_PET_SQL_H_

 

 int inter_pet_init(void);

 void inter_pet_sql_final(void);

@@ -13,4 +13,6 @@ int inter_pet_parse_frommap(int fd);
 int inter_pet_sql_init(void);

 //extern char pet_txt[256];

 

+//Exported for use in the TXT-SQL converter.

+int inter_pet_tosql(int pet_id, struct s_pet *p);

 #endif