diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-29 20:01:09 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-29 20:01:09 +0000 |
| commit | df4a6f64d6b6de02b880aa81894207f55a24d21a (patch) | |
| tree | cd4ff19407aa0ebd906ed2917b6fb5a459c1454f /src/map | |
| parent | eab53cdb7d4564024793e2a1492af87bd3fae903 (diff) | |
| download | hercules-df4a6f64d6b6de02b880aa81894207f55a24d21a.tar.gz hercules-df4a6f64d6b6de02b880aa81894207f55a24d21a.tar.bz2 hercules-df4a6f64d6b6de02b880aa81894207f55a24d21a.tar.xz hercules-df4a6f64d6b6de02b880aa81894207f55a24d21a.zip | |
Fixed a compilation problem and warning (maybe).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11611 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 1 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/charcommand.c | 1 | ||||
| -rw-r--r-- | src/map/chrif.h | 3 | ||||
| -rw-r--r-- | src/map/itemdb.h | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a93bddb3d..d24884420 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8527,7 +8527,6 @@ bool is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str bool is_atcommand(const int fd, struct map_session_data* sd, const char* message) { int gmlvl = pc_isGM(sd); - int s_flag = 0; nullpo_retr(false, sd); diff --git a/src/map/battle.c b/src/map/battle.c index bd6c5b32a..66348ba6e 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2432,7 +2432,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list /*========================================== * ‚»‚Ì‘¼ƒ_ƒ??[ƒWŒvŽZ *------------------------------------------*/ -struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) +struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) { int skill; short i, nk; diff --git a/src/map/charcommand.c b/src/map/charcommand.c index d5746d379..4aecc260b 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -3853,7 +3853,6 @@ bool is_charcommand_sub(const int fd, struct map_session_data* sd, const char* s bool is_charcommand(const int fd, struct map_session_data* sd, const char* message) { int gmlvl = pc_isGM(sd); - int s_flag = 0; nullpo_retr(false, sd); diff --git a/src/map/chrif.h b/src/map/chrif.h index b4e9062dc..71f402233 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -4,6 +4,9 @@ #ifndef _CHRIF_H_ #define _CHRIF_H_ +#include "../common/cbasetypes.h" +#include <time.h> + struct auth_node{ int account_id, login_id1, login_id2, sex, fd; time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 9d1a62f6d..507478196 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -71,7 +71,7 @@ struct item_data { //Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command // some script commands should be revised as well... unsigned int class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2) - unsigned class_upper : 3; //Specifies if the upper-type can equip it (1: normal, 2: upper, 3: baby) + unsigned class_upper : 3; //Specifies if the upper-type can equip it (bitfield, 1: normal, 2: upper, 3: baby) struct { unsigned short chance; int id; |