Prechádzať zdrojové kódy

Blocked cart item movement on NoUseCart maps (#6970)

Daegaladh 3 rokov pred
rodič
commit
60813b28f0
2 zmenil súbory, kde vykonal 8 pridanie a 1 odobranie
  1. 0 1
      doc/mapflags.txt
  2. 8 0
      src/map/clif.cpp

+ 0 - 1
doc/mapflags.txt

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

+ 8 - 0
src/map/clif.cpp

@@ -12607,6 +12607,8 @@ void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
 		return;
 	if (!pc_iscarton(sd))
 		return;
+	if (map_getmapflag(sd->bl.m, MF_NOUSECART))
+		return;
 	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)];
 	if (!pc_iscarton(sd))
 		return;
+	if (map_getmapflag(sd->bl.m, MF_NOUSECART))
+		return;
 	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;
 	if (!pc_iscarton(sd))
 		return;
+	if (map_getmapflag(sd->bl.m, MF_NOUSECART))
+		return;
 
 	if (idx < 0 || idx >= MAX_INVENTORY || amount < 1)
 		return;
@@ -13613,6 +13619,8 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd){
 		return;
 	if (!pc_iscarton(sd))
 		return;
+	if (map_getmapflag(sd->bl.m, MF_NOUSECART))
+		return;
 
 	if (sd->state.storage_flag == 1)
 		storage_storagegettocart(sd, &sd->storage, idx, amount);