diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-30 21:54:01 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-30 21:54:01 +0000 |
| commit | edd03006c190712705117c6fedfef9fa6a667f9c (patch) | |
| tree | 83aa809a7e3a176a32271157adba3191befe32f9 /src/char/char.h | |
| parent | 5f57279825028c335ca328631d9eae2b4d3ff516 (diff) | |
| download | hercules-edd03006c190712705117c6fedfef9fa6a667f9c.tar.gz hercules-edd03006c190712705117c6fedfef9fa6a667f9c.tar.bz2 hercules-edd03006c190712705117c6fedfef9fa6a667f9c.tar.xz hercules-edd03006c190712705117c6fedfef9fa6a667f9c.zip | |
- 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
Diffstat (limited to 'src/char/char.h')
| -rw-r--r-- | src/char/char.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/char/char.h b/src/char/char.h index b6849f80f..d6ec8e5cb 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -16,11 +16,10 @@ #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
-struct mmo_map_server{
- long ip;
- short port;
- int users;
- unsigned short map[MAX_MAP_PER_SERVER];
+struct character_data {
+ struct mmo_charstatus status;
+ int global_num;
+ struct global_reg global[GLOBAL_REG_NUM];
};
struct mmo_charstatus* search_character(int aid, int cid);
@@ -50,4 +49,10 @@ extern char char_name_letters[]; extern int autosave_interval;
extern char db_path[];
extern int guild_exp_rate;
+extern int log_inter;
+//Exported for use in the TXT-SQL converter.
+extern char char_txt[];
+int char_config_read(const char *cfgName);
+int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int *reg_num);
+int parse_friend_txt(struct mmo_charstatus *p);
#endif
|