diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-23 20:38:44 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-23 20:38:44 +0000 |
| commit | 2c5fabbc0b492cb5456e670ce9eb2352a11d5e3b (patch) | |
| tree | 89c47d81729687d5a69cadde99ee350306eb814f /src/map/map.h | |
| parent | c4e6857d4774b25dcd9b9137f76c14c92015d691 (diff) | |
| download | hercules-2c5fabbc0b492cb5456e670ce9eb2352a11d5e3b.tar.gz hercules-2c5fabbc0b492cb5456e670ce9eb2352a11d5e3b.tar.bz2 hercules-2c5fabbc0b492cb5456e670ce9eb2352a11d5e3b.tar.xz hercules-2c5fabbc0b492cb5456e670ce9eb2352a11d5e3b.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@968 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/map.h b/src/map/map.h index 26fc3e6c8..1b699b960 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -329,7 +329,7 @@ struct map_session_data { unsigned short eventcount; // [celest] int last_skillid,last_skilllv; // Added by RoVeRT - + unsigned char change_level; // [celest] #ifndef TXT_ONLY @@ -414,6 +414,7 @@ struct mob_data { unsigned walk_easy : 1; unsigned special_mob_ai : 3; unsigned soul_change_flag : 1; // Celest + int provoke_flag; // Celest } state; int timer; short to_x,to_y; @@ -509,7 +510,7 @@ enum { struct map_data { char name[24]; - unsigned char *gat; // NULLなら下のmap_data_other_serverとして扱う + char *gat; // NULLなら下のmap_data_other_serverとして扱う char *alias; // [MouseJstr] int *gat_fileused[MAX_CELL_TYPE+1+1]; //もしビットマップを使うならこちらを使う、 //上のgatはキャストされてgat_fileused[0]に指す @@ -562,7 +563,7 @@ struct map_data { }; struct map_data_other_server { char name[24]; - unsigned char *gat; // NULL固定にして判断 + char *gat; // NULL固定にして判断 unsigned long ip; unsigned int port; }; @@ -634,7 +635,7 @@ enum { * CHELL_CHKTOUCH：セルはタッチ系の場合は1を返す、以外は0 * CELL_CHKTYPE： セルのタイプを知りたい場合は1を返す、以外は0 */ -typedef enum { +typedef enum { CELL_CHKPASS,CELL_CHKNOPASS,CELL_CHKWATER=3,CELL_CHKHIGH=5,CELL_CHKTOUCH,CELL_CHKTYPE } CELL_CHK; @@ -671,7 +672,7 @@ extern int night_flag; // 0=day, 1=night [Yor] int map_getcell(int,int,int,CELL_CHK); int map_getcellp(struct map_data*,int,int,CELL_CHK); extern int map_read_flag; //セル情報のソース判定フラグ、0ならgrfファイル、1ならビットマップファイル -enum { +enum { READ_FROM_GAT, READ_FROM_AFM, READ_FROM_BITMAP, CREATE_BITMAP, READ_FROM_BITMAP_COMPRESSED, CREATE_BITMAP_COMPRESSED |