summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-04 16:11:03 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-04 16:11:03 +0000
commit5c2e44cd3d10eb4b979d048d80914107485b6004 (patch)
treea156c1ad7d5edec6e5e8b0f4b1d892116887a809
parent8fea4f165cd27795ed134d3827da605d2536091e (diff)
downloadhercules-5c2e44cd3d10eb4b979d048d80914107485b6004.tar.gz
hercules-5c2e44cd3d10eb4b979d048d80914107485b6004.tar.bz2
hercules-5c2e44cd3d10eb4b979d048d80914107485b6004.tar.xz
hercules-5c2e44cd3d10eb4b979d048d80914107485b6004.zip
Follow up r16227 & bugreport:5932 fixed issues with my new-IDE tabbing, & default configuration setting.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16230 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/clif.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f407b49c9..044ab59e5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5329,7 +5329,7 @@ static const struct _battle_data {
{ "skill_amotion_leniency", &battle_config.skill_amotion_leniency, 90, 0, 100 },
{ "mvp_tomb_enabled", &battle_config.mvp_tomb_enabled, 1, 0, 1 },
{ "feature.atcommand_suggestions", &battle_config.atcommand_suggestions_enabled, 0, 0, 1 },
- { "min_npc_vending_distance", &battle_config.min_npc_vending_distance, 0, 0, 100 },
+ { "min_npc_vending_distance", &battle_config.min_npc_vending_distance, 3, 0, 100 },
};
diff --git a/src/map/clif.c b/src/map/clif.c
index 87263e72e..3ae2be6d5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11735,13 +11735,13 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd)
return;
}
- if( vending_checknearnpc(&sd->bl) ) {
- char output[50];
- sprintf(output,"You're too close to a NPC, you must be at least %d cells away from any NPC.",battle_config.min_npc_vending_distance);
- clif_displaymessage(sd->fd, output);
- clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
- return;
- }
+ if( vending_checknearnpc(&sd->bl) ) {
+ char output[50];
+ sprintf(output,"You're too close to a NPC, you must be at least %d cells away from any NPC.",battle_config.min_npc_vending_distance);
+ clif_displaymessage(sd->fd, output);
+ clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
+ return;
+ }
if( message[0] == '\0' ) // invalid input
return;