diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 11:44:12 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 11:44:12 +0000 |
| commit | c883ca205971275e576d34b54304c3c5c30f3580 (patch) | |
| tree | 4d0a218a184099c61a311d65b50e93973c4c773a /src/map/map.h | |
| parent | 230ba4e3dd84a19f7dee67fdc97532e5869bef63 (diff) | |
| download | hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.gz hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.bz2 hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.xz hercules-c883ca205971275e576d34b54304c3c5c30f3580.zip | |
* updated map server to jA1137~1159
* Some tidying up in mob.c and skill.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1342 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h index b25e6f05a..81d1b8cbc 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -220,6 +220,7 @@ struct map_session_data { struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; struct skill_timerskill skilltimerskill[MAX_SKILLTIMERSKILL]; char blockskill[MAX_SKILL]; // [celest] + //unsigned int skillstatictimer[MAX_SKILL]; unsigned short timerskill_count; // [celest] int cloneskill_id; int potion_hp,potion_sp,potion_per_hp,potion_per_sp; @@ -490,7 +491,9 @@ struct mob_data { struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; char npc_event[50]; unsigned char size; - int owner; + short recall_flag; + int recallmob_count; + short recallcount; }; struct pet_data { struct block_list bl; @@ -800,6 +803,16 @@ int cleanup_sub(struct block_list *bl, va_list ap); void map_helpscreen(); // [Valaris] int map_delmap(char *mapname); +extern char *INTER_CONF_NAME; +extern char *LOG_CONF_NAME; +extern char *MAP_CONF_NAME; +extern char *BATTLE_CONF_FILENAME; +extern char *ATCOMMAND_CONF_FILENAME; +extern char *CHARCOMMAND_CONF_FILENAME; +extern char *SCRIPT_CONF_NAME; +extern char *MSG_CONF_NAME; +extern char *GRF_PATH_FILENAME; + #ifndef TXT_ONLY // MySQL |