Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blocked cart item movement on NoUseCart maps (#6970)

Browse Source
This commit is contained in:
Daegaladh 2022-05-21 12:05:59 +02:00 committed by GitHub
parent fa363b972d
commit 60813b28f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/mapflags.txt
View File

@ -165,7 +165,6 @@ Disables shop creation on a map from the ALL_BUYING_STORE skill.
*nousecart *nousecart
Disables cart usage on a map. Disables cart usage on a map.
[Not fully implemented.]
--------------------------------------- ---------------------------------------

8
src/map/clif.cpp
View File

@ -12607,6 +12607,8 @@ void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
return; return;
if (!pc_iscarton(sd)) if (!pc_iscarton(sd))
return; return;
if (map_getmapflag(sd->bl.m, MF_NOUSECART))
return;
pc_putitemtocart(sd,RFIFOW(fd,info->pos[0])-2,RFIFOL(fd,info->pos[1])); pc_putitemtocart(sd,RFIFOW(fd,info->pos[0])-2,RFIFOL(fd,info->pos[1]));
} }
@ -12618,6 +12620,8 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
struct s_packet_db* info = &packet_db[RFIFOW(fd,0)]; struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (!pc_iscarton(sd)) if (!pc_iscarton(sd))
return; return;
if (map_getmapflag(sd->bl.m, MF_NOUSECART))
return;
pc_getitemfromcart(sd,RFIFOW(fd,info->pos[0])-2,RFIFOL(fd,info->pos[1])); pc_getitemfromcart(sd,RFIFOW(fd,info->pos[0])-2,RFIFOL(fd,info->pos[1]));
} }
@ -13585,6 +13589,8 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd){
return; return;
if (!pc_iscarton(sd)) if (!pc_iscarton(sd))
return; return;
if (map_getmapflag(sd->bl.m, MF_NOUSECART))
return;
if (idx < 0 || idx >= MAX_INVENTORY || amount < 1) if (idx < 0 || idx >= MAX_INVENTORY || amount < 1)
return; return;
@ -13613,6 +13619,8 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd){
return; return;
if (!pc_iscarton(sd)) if (!pc_iscarton(sd))
return; return;
if (map_getmapflag(sd->bl.m, MF_NOUSECART))
return;
if (sd->state.storage_flag == 1) if (sd->state.storage_flag == 1)
storage_storagegettocart(sd, &sd->storage, idx, amount); storage_storagegettocart(sd, &sd->storage, idx, amount);