diff options
author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/duel.h | |
parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'src/map/duel.h')
-rw-r--r-- | src/map/duel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/duel.h b/src/map/duel.h index d1ec58415..d60c9531a 100644 --- a/src/map/duel.h +++ b/src/map/duel.h @@ -34,7 +34,7 @@ struct duel_interface { void (*showinfo) (const unsigned int did, struct map_session_data* sd); int (*checktime) (struct map_session_data* sd); - void (*init) (void); + void (*init) (bool minimal); void (*final) (void); } duel_s; |