diff options
author | Dastgir Pojee <dastgirpojee@rocketmail.com> | 2013-10-17 21:39:11 +0530 |
---|---|---|
committer | Dastgir Pojee <dastgirpojee@rocketmail.com> | 2013-10-17 21:39:11 +0530 |
commit | b2c9f9de564065019684fcf22ed020b943fc5bbe (patch) | |
tree | d27ede8e334382211743c1e34a73a9db67778d38 /src/map/battle.h | |
parent | 97979fe1e577aebe77e978c248a08b33b2c0c1a2 (diff) | |
parent | 9128feccf3bddda94a7f8a170305565416815b40 (diff) | |
download | hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.gz hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.bz2 hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.xz hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.zip |
Merge remote-tracking branch 'upstream/master' into SkidConst
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 533fa40b0..1aa07b2be 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -463,6 +463,8 @@ struct Battle_Config { int feature_banking; int feature_auction; + + int mon_trans_disable_in_gvg; } battle_config; // Dammage delayed info |