Преглед на файлове

Follow up to fe14af99625d16f3c7ef1e8192a2d3b0214f33f1

* Thanks to @CairoLee
Daegaladh преди 5 години
родител
ревизия
c6aceea6c3
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      src/map/npc.cpp

+ 2 - 1
src/map/npc.cpp

@@ -3429,10 +3429,11 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
 		case NPCTYPE_POINTSHOP:
 		case NPCTYPE_MARKETSHOP:
 			++npc_shop;
-			safestrncpy( dnd->u.shop.pointshop_str, nd->u.shop.pointshop_str, strlen( nd->u.shop.pointshop_str ) );
+			safestrncpy( nd->u.shop.pointshop_str, dnd->u.shop.pointshop_str, strlen( dnd->u.shop.pointshop_str ) );
 			nd->u.shop.itemshop_nameid = dnd->u.shop.itemshop_nameid;
 			nd->u.shop.shop_item = dnd->u.shop.shop_item;
 			nd->u.shop.count = dnd->u.shop.count;
+			nd->u.shop.discount =  dnd->u.shop.discount;
 			break;
 
 		case NPCTYPE_WARP: