summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-20 14:07:00 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-20 14:07:00 +0000
commit531ae6ff24ed1164ba08dc61c47ad642597591dc (patch)
treed600357e4c0938612654584ca9e5fc560d82eb77
parent9d02f1a1b111f882ca824583b1380a96fdeb556d (diff)
downloadhercules-531ae6ff24ed1164ba08dc61c47ad642597591dc.tar.gz
hercules-531ae6ff24ed1164ba08dc61c47ad642597591dc.tar.bz2
hercules-531ae6ff24ed1164ba08dc61c47ad642597591dc.tar.xz
hercules-531ae6ff24ed1164ba08dc61c47ad642597591dc.zip
* Added check for max vending_max_value when reading config
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@268 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt4
-rw-r--r--src/map/battle.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 661058a21..133b50eff 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
-11/20 * Skill updates [celest]
+11/20
+ * Added check for max vending_max_value when reading config [kobra_k88]
+ * Skill updates [celest]
- Napalm vulcan, Enchant Deadly Poison, Slow Poison (based on jAthena 1066)
- Create Deadly Poison, thanks to DracoRPG!
- Added effect for Meteor Assault
diff --git a/src/map/battle.c b/src/map/battle.c
index a23f8b510..f334f3455 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5481,6 +5481,10 @@ void battle_validate_conf() {
if (battle_config.night_darkness_level > 10) // Celest
battle_config.night_darkness_level = 10;
+
+ if (battle_config.vending_max_value > 10000000 || battle_config.vending_max_value<=0) // Lupus & Kobra_k88
+ battle_config.vending_max_value = 10000000;
+
}
/*==========================================