diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-19 12:55:29 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-19 12:55:29 +0000 |
| commit | 3c89751e48a424ce26bc1c6f78f4bf7fb6242fac (patch) | |
| tree | 3c8b08a06bfe053c32d6312092576db372fc757e /src/map/pc.h | |
| parent | 2a2455a8ac012ef30c85c07d0ad5dd39307acae4 (diff) | |
| download | hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.gz hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.bz2 hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.xz hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.zip | |
* Cleaned/clarified some #include relationships between headers
* Changed clif_sitting() to use 'bl' instead of 'sd' (for non-player objects)
* Removed way messed-up script function 'unitdeadsit'
* Tagged 'FIXME' lines written by myself
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11040 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 7e0a8f7bb..ae7aeeda5 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -4,9 +4,12 @@ #ifndef _PC_H_ #define _PC_H_ -#include "map.h" -#include "unit.h" -#include "status.h" +#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus +#include "../common/timer.h" // INVALID_TIMER +#include "battle.h" // battle_config +#include "map.h" // MAX_PC_CLASS, struct map_session_data +#include "status.h" // OPTION_* +#include "unit.h" // unit_stop_attack(), unit_stop_walking() //Update this max as necessary. 53 is the value needed for Super Baby currently #define MAX_SKILL_TREE 53 @@ -89,7 +92,7 @@ enum { #define pc_setsit(sd) ((sd)->state.dead_sit = (sd)->vd.dead_sit = 2) #define pc_isdead(sd) ((sd)->state.dead_sit == 1) #define pc_issit(sd) ((sd)->vd.dead_sit == 2) -#define pc_isidle(sd) ((sd)->chatID || (sd)->vender_id || DIFF_TICK(last_tick, sd->idletime) >= battle_config.idle_no_share) +#define pc_isidle(sd) ((sd)->chatID || (sd)->vender_id || DIFF_TICK(last_tick, (sd)->idletime) >= battle_config.idle_no_share) #define pc_setdir(sd,b,h) ((sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) #define pc_setchatid(sd,n) ((sd)->chatID = n) #define pc_ishiding(sd) ((sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) |