diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-01 14:55:35 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-01 14:55:35 +0000 |
| commit | 41951f3f6be59e77117a5332c3be6cca92cedf90 (patch) | |
| tree | f10e689bca28d2265b14286c263f841e3f910f30 /src/map/map.h | |
| parent | 3a9351dbca5aaa24e614a4d15f7399efd8386e07 (diff) | |
| download | hercules-41951f3f6be59e77117a5332c3be6cca92cedf90.tar.gz hercules-41951f3f6be59e77117a5332c3be6cca92cedf90.tar.bz2 hercules-41951f3f6be59e77117a5332c3be6cca92cedf90.tar.xz hercules-41951f3f6be59e77117a5332c3be6cca92cedf90.zip | |
* Fixed various trading/vending glitches
- fixed vending_tax not working at all (integer division in r10182)
- undid change from r8273 where pc_getzeny() treated zeny overflow as an error condition; officially, the value is just bounded to MAX_ZENY
- fixed stupid code that, instead of properly checking and filtering invalid items during shop setup, opted to 'hide' these items from the vending list instead...
- removed some custom error message packets related to vending
- fixed a glitch where the server would open a shop with no items when all entered items were tagged as invalid
- split zeny handling from trade_tradeadditem() into a separate func (trade_tradeaddzeny())
- removed loads of redundant code from vending.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11344 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h index c26b00505..eef71e7c1 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -397,7 +397,7 @@ struct status_change { unsigned int option;// effect state }; -struct vending { +struct s_vending { short index; unsigned short amount; unsigned int value; @@ -771,7 +771,7 @@ struct map_session_data { int vender_id; int vend_num; char message[MESSAGE_SIZE]; - struct vending vending[MAX_VENDING]; + struct s_vending vending[MAX_VENDING]; struct pet_data *pd; struct homun_data *hd; // [blackhole89] |