diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-02-24 23:40:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-02-24 23:40:24 +0300 |
| commit | ff314da1740080a6cf1920f5ab2583ec3c60e3d2 (patch) | |
| tree | 629046feb2d98a8a8fe0bc9e3674b3952a529ecc /src/map/mercenary.c | |
| parent | 9ee06831aec11a8ffea77f3b5c81465579f993e9 (diff) | |
| parent | 027dfa3a608bb2986f4c495f20afdeba4e2ad459 (diff) | |
| download | hercules-ff314da1740080a6cf1920f5ab2583ec3c60e3d2.tar.gz hercules-ff314da1740080a6cf1920f5ab2583ec3c60e3d2.tar.bz2 hercules-ff314da1740080a6cf1920f5ab2583ec3c60e3d2.tar.xz hercules-ff314da1740080a6cf1920f5ab2583ec3c60e3d2.zip | |
Merge pull request #1165 from HerculesWS/const_rfifo
Const correctness (and typecast removal) for [RW]{FIFO,BUF}[PBWLQ] functions
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index e6c911ef6..ec0b2291f 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -301,7 +301,8 @@ void merc_contract_init(struct mercenary_data *md) md->regen.state.block = 0; } -int merc_data_received(struct s_mercenary *merc, bool flag) { +int merc_data_received(const struct s_mercenary *merc, bool flag) +{ struct map_session_data *sd; struct mercenary_data *md; struct s_mercenary_db *db; |