Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline

1 files changed, 9 insertions, 10 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 10d64db..0c6c922 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -996,8 +996,6 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 		pc_gainexp(sd,0,z);
 	}*/
 	if (battle_config.shop_exp > 0 && z > 0 && (skill = pc_checkskill(sd,MC_DISCOUNT)) > 0) {
-		if (sd->status.skill[MC_DISCOUNT].flag != 0)
-			skill = sd->status.skill[MC_DISCOUNT].flag - 2;
 		if (skill > 0) {
 			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
 			if (z < 1)
@@ -1053,8 +1051,6 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
 		pc_gainexp(sd,0,z);
 	}*/
 	if (battle_config.shop_exp > 0 && z > 0 && (skill = pc_checkskill(sd,MC_OVERCHARGE)) > 0) {
-		if (sd->status.skill[MC_OVERCHARGE].flag != 0)
-			skill = sd->status.skill[MC_OVERCHARGE].flag - 2;
 		if (skill > 0) {
 			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
 			if (z < 1)
@@ -1837,22 +1833,25 @@ static int npc_parse_mapflag(char *w1,char *w2,char *w3,char *w4)
 	}
 	else if (strcmpi(w3,"noicewall")==0) { // noicewall [Valaris]
 		map[m].flag.noicewall=1;
-	}	
+	}
 	else if (strcmpi(w3,"snow")==0) { // snow [Valaris]
 		map[m].flag.snow=1;
-	}	
+	}
 	else if (strcmpi(w3,"fog")==0) { // fog [Valaris]
 		map[m].flag.fog=1;
-	}	
+	}
 	else if (strcmpi(w3,"sakura")==0) { // sakura [Valaris]
 		map[m].flag.sakura=1;
-	}	
+	}
 	else if (strcmpi(w3,"leaves")==0) { // leaves [Valaris]
 		map[m].flag.leaves=1;
-	}	
+	}
 	else if (strcmpi(w3,"rain")==0) { // rain [Valaris]
 		map[m].flag.rain=1;
-	}	
+	}
+	else if (strcmpi(w3,"no_player_drops")==0) { // rain [Valaris]
+		map[m].flag.no_player_drops=1;
+	}
 	
 	return 0;
 }