diff options
| author | Haru <haru@dotalux.com> | 2014-05-10 17:46:37 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-10 17:46:37 +0200 |
| commit | 65e43c2ab18a446102dea9237cfd4152392d7f33 (patch) | |
| tree | 907b458ce04d09be8056bb84dc950b9aa02d6a81 /src/map/pc.c | |
| parent | 0ab52ac65bdba93be94e4149e267698d31b41d72 (diff) | |
| download | hercules-65e43c2ab18a446102dea9237cfd4152392d7f33.tar.gz hercules-65e43c2ab18a446102dea9237cfd4152392d7f33.tar.bz2 hercules-65e43c2ab18a446102dea9237cfd4152392d7f33.tar.xz hercules-65e43c2ab18a446102dea9237cfd4152392d7f33.zip | |
Moved MAX_CARTS and NEW_CARTS defines into common/mmo.h
- Fixes bugreport:8184, allowing re-commit of
94657284973f4037596bae468ebfbee5c217e02b
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 45adfe22a..08ff8baf9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4,7 +4,7 @@ #define HERCULES_CORE -#include "../config/core.h" // DBPATH, GP_BOUND_ITEMS, MAX_CARTS, MAX_SPIRITBALL, NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EXP, SECURE_NPCTIMEOUT +#include "../config/core.h" // DBPATH, GP_BOUND_ITEMS, MAX_SPIRITBALL, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EXP, SECURE_NPCTIMEOUT #include "pc.h" #include <stdio.h> @@ -45,7 +45,7 @@ #include "../common/conf.h" #include "../common/core.h" // get_svn_revision() #include "../common/malloc.h" -#include "../common/mmo.h" //NAME_LENGTH +#include "../common/mmo.h" // NAME_LENGTH, MAX_CARTS, NEW_CARTS #include "../common/nullpo.h" #include "../common/random.h" #include "../common/showmsg.h" @@ -8039,7 +8039,7 @@ int pc_setoption(struct map_session_data *sd,int type) *------------------------------------------*/ int pc_setcart(struct map_session_data *sd,int type) { #ifndef NEW_CARTS - int cart[6] = {0x0000,OPTION_CART1,OPTION_CART2,OPTION_CART3,OPTION_CART4,OPTION_CART5}; + int cart[6] = {OPTION_NOTHING,OPTION_CART1,OPTION_CART2,OPTION_CART3,OPTION_CART4,OPTION_CART5}; int option; #endif nullpo_ret(sd); |