From 8c1bb7b498aae6203289dd9295e187b05c8b7014 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sat, 7 Apr 2007 12:06:25 +0000 Subject: - Added function str2ip() to do platform-safe conversions - Removed a bunch of unused stuff - Moved SIGILL to unix-only defines since tests and docs show that Windows doesn't issue SIGILL - Fixed several annoying compilation warnings git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10177 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/vending.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/vending.c') diff --git a/src/map/vending.c b/src/map/vending.c index 63551272c..44f1a0f11 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -227,7 +227,7 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f vending_skill_lvl = pc_checkskill(sd, MC_VENDING); if(!vending_skill_lvl || !pc_iscarton(sd)) { // cart skill and cart check [Valaris] - clif_skill_fail(sd,MC_VENDING,0,0); + clif_skill_fail(sd, MC_VENDING, 0, 0); return; } @@ -247,8 +247,8 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f } sd->vending[i].amount = *(short*)(p+2+8*j); sd->vending[i].value = *(int*)(p+4+8*j); - if(sd->vending[i].value > battle_config.vending_max_value) - sd->vending[i].value=battle_config.vending_max_value; + if(sd->vending[i].value > (unsigned int)battle_config.vending_max_value) + sd->vending[i].value = (unsigned int)battle_config.vending_max_value; else if(sd->vending[i].value < 1) sd->vending[i].value = 1000000; // auto set to 1 million [celest] // カート内のアイテム数と販売するアイテム数に相違があったら中止 -- cgit v1.2.3-60-g2f50