diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2020-06-23 08:00:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 08:00:00 +0800 |
| commit | 520863eaeda83da14b88d09f6378cd8abd5a5174 (patch) | |
| tree | 2496ea36744dc2f51d264741a78699e719ceeb3b /src/map/battle.h | |
| parent | 0b7768837bed2aa521de5b9b76b2348943d7db20 (diff) | |
| parent | 9b89425550094f51d633e5b5d6e86af65bffbf39 (diff) | |
| download | hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.gz hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.bz2 hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.xz hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.zip | |
Merge branch 'master' into jedzkie-pr03
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 24594f4e6..e47755040 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -580,6 +580,8 @@ struct Battle_Config { int magicrod_type; + int skill_enabled_npc; + int feature_enable_achievement; int ping_timer_interval; |