diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /src/map/duel.h | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to 'src/map/duel.h')
| -rw-r--r-- | src/map/duel.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/duel.h b/src/map/duel.h index 9fa33833a..7802f6163 100644 --- a/src/map/duel.h +++ b/src/map/duel.h @@ -21,8 +21,8 @@ struct duel { struct duel_interface { /* vars */ - struct duel duel_list[MAX_DUEL]; - int duel_count; + struct duel list[MAX_DUEL]; + int count; /* funcs */ //Duel functions // [LuzZza] @@ -34,12 +34,12 @@ struct duel_interface { void (*showinfo) (const unsigned int did, struct map_session_data* sd); int (*checktime) (struct map_session_data* sd); - void (*do_init_duel) (void); - void (*do_final_duel) (void); -} iDuel_s; + void (*init) (void); + void (*final) (void); +} duel_s; -struct duel_interface *iDuel; +struct duel_interface *duel; -void iDuel_defaults(void); +void duel_defaults(void); #endif /* _DUEL_H_ */ |