diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-15 13:06:43 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-15 13:06:43 +0000 |
| commit | 7ce8cd3af8480f5236497ccd59b75d221070927f (patch) | |
| tree | e1d2532d18e52452c6052e8d716ee5fcfe7ee7a7 /src/map/map.h | |
| parent | db4d0797f6bb0a54e0955b330a3ccd7675b7b95c (diff) | |
| download | hercules-7ce8cd3af8480f5236497ccd59b75d221070927f.tar.gz hercules-7ce8cd3af8480f5236497ccd59b75d221070927f.tar.bz2 hercules-7ce8cd3af8480f5236497ccd59b75d221070927f.tar.xz hercules-7ce8cd3af8480f5236497ccd59b75d221070927f.zip | |
- Corrected traps
- Some minor changes to Hiding, Cloaking and Chasewalk
- Corrected Cannibalize
- Updated Marionette Control, Berserk
* Changed the weather gm commands to be able to toggle on and off
* Added Jawaii and Ayothaya to @go list
* Changed the default values for ranged, magic and misc damage rate in battle_athena
* Removed redundant 'berserkdamagetick'
* Added changes to map.h according to Shinomori
* Changed Parasite in mob_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@570 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h index 3ad6105ad..060bfb451 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -212,10 +212,11 @@ struct map_session_data { unsigned int canact_tick; unsigned int canmove_tick; unsigned int canlog_tick; + unsigned int canregen_tick; int hp_sub,sp_sub; int inchealhptick,inchealsptick,inchealspirithptick,inchealspiritsptick; // -- moonsoul (new tick for berserk self-damage) - int berserkdamagetick; +// int berserkdamagetick; int fame; short view_class; @@ -481,8 +482,8 @@ enum { ATK_LUCKY=1,ATK_FLEE,ATK_DEF}; // 囲まれペナルティ計算用 struct map_data { char name[24]; - char *alias; // [MouseJstr] unsigned char *gat; // NULLなら下のmap_data_other_serverとして扱う + char *alias; // [MouseJstr] struct block_list **block; struct block_list **block_mob; int *block_count,*block_mob_count; |