diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-07 21:15:34 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-07 21:15:34 +0000 |
| commit | cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de (patch) | |
| tree | 3fa1de03a0c77861780d048a8e96351d0121352e /src/map | |
| parent | 2326caf8d02d81d7f4bb96817cbad8e1c639169d (diff) | |
| download | hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.gz hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.bz2 hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.xz hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.zip | |
- Fixed the platform-specific stricmp compilation problem
- Fixed inverted vending tax equation (venders getting only 2% zeny instead of 98%), and made it more precise
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10182 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/vending.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 36ae1d658..92361d4e9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5593,9 +5593,9 @@ int clif_openvending(struct map_session_data *sd,int id,struct vending *vending) nullpo_retr(0, sd); fd=sd->fd; - WFIFOHEAD(fd, 8+sd->vend_num*22); + WFIFOHEAD(fd, 8+sd->vend_num*22); buf = WFIFOP(fd,0); - for(i=0,n=0;i<sd->vend_num;i++){ + for(i = 0, n = 0; i < sd->vend_num; i++) { if (sd->vend_num > 2+pc_checkskill(sd,MC_VENDING)) return 0; WBUFL(buf,8+n*22)=vending[i].value; WBUFW(buf,12+n*22)=(index=vending[i].index)+2; @@ -5615,7 +5615,7 @@ int clif_openvending(struct map_session_data *sd,int id,struct vending *vending) clif_addcards(WBUFP(buf, 22+n*22), &sd->status.cart[index]); n++; } - if(n > 0){ + if(n > 0) { WBUFW(buf,0)=0x136; WBUFW(buf,2)=8+n*22; WBUFL(buf,4)=id; diff --git a/src/map/vending.c b/src/map/vending.c index 44f1a0f11..23a7d9ce8 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -159,7 +159,7 @@ void vending_purchasereq(struct map_session_data *sd,int len,int id,unsigned cha pc_payzeny(sd, (int)z); if (battle_config.vending_tax) - z = z*battle_config.vending_tax/10000; + z = z*(1 - battle_config.vending_tax/10000); pc_getzeny(vsd, (int)z); for(i = 0; 8 + 4 * i < len; i++) { |