summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorpanikon <panikon@zoho.com>2014-06-28 19:39:00 -0300
committerpanikon <panikon@zoho.com>2014-06-28 19:39:00 -0300
commit0c40a490928500aeb41c9c406ecbf5ec5253ebf5 (patch)
treea18088c5b937936eec76d913590cfa72fcda6573 /src/map
parent83ff1b2f2b070f38d3f63338aae2104bedf3cc54 (diff)
downloadhercules-0c40a490928500aeb41c9c406ecbf5ec5253ebf5.tar.gz
hercules-0c40a490928500aeb41c9c406ecbf5ec5253ebf5.tar.bz2
hercules-0c40a490928500aeb41c9c406ecbf5ec5253ebf5.tar.xz
hercules-0c40a490928500aeb41c9c406ecbf5ec5253ebf5.zip
Changes in npc_parse_shop in order to fit documentation standard, now an unlimited item amount is supported in SHOP/CASHSHOP NPC objects and when value is a negative value other than -1 a warning is shown
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c36
1 files changed, 29 insertions, 7 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 2aa572720..bfac2b9d5 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2602,12 +2602,19 @@ const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const char* s
return strchr(start,'\n');// continue
}
-/// Parses a shop/cashshop npc.
+/**
+ * Parses a SHOP/CASHSHOP npc
+ * @param retval Pointer to the status, used to know whether there was an error or not, if so it will be EXIT_FAILURE
+ * @retval Parsing position (currently only '\n')
+ **/
const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, int *retval) {
//TODO: could be rewritten to NOT need this temp array [ultramage]
-#define MAX_SHOPITEM 100
- struct npc_item_list items[MAX_SHOPITEM];
-#undef MAX_SHOPITEM
+ // We could use nd->u.shop.shop_item to store directly the items, but this could lead
+ // to unecessary memory usage by the server, using a temp dynamic array is the
+ // best way to do this without having to do multiple reallocs [Panikon]
+ struct npc_item_list *items = NULL;
+ size_t items_count = 40; // Starting items size
+
char *p;
int x, y, dir, m, i;
struct npc_data *nd;
@@ -2633,7 +2640,7 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
if( m != -1 && ( x < 0 || x >= map->list[m].xs || y < 0 || y >= map->list[m].ys ) ) {
ShowError("npc_parse_shop: out-of-bounds coordinates (\"%s\",%d,%d), map is %dx%d, in file '%s', line '%d'\n", map->list[m].name, x, y, map->list[m].xs, map->list[m].ys,filepath,strline(buffer,start-buffer));
if (retval) *retval = EXIT_FAILURE;
- return strchr(start,'\n');;//try next
+ return strchr(start,'\n');//try next
}
if( strcmp(w2,"cashshop") == 0 )
@@ -2641,10 +2648,18 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
else
type = SHOP;
+ items = aMalloc(sizeof(items[0])*items_count);
+
p = strchr(w4,',');
- for( i = 0; i < ARRAYLENGTH(items) && p; ++i ) {
+ for( i = 0; p; ++i ) {
int nameid, value;
struct item_data* id;
+
+ if( i == items_count-1 ) { // Grow array
+ items_count *= 2;
+ items = aRealloc(items, sizeof(items[0])*items_count);
+ }
+
if( sscanf(p, ",%d:%d", &nameid, &value) != 2 ) {
ShowError("npc_parse_shop: Invalid item definition in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
if (retval) *retval = EXIT_FAILURE;
@@ -2659,6 +2674,10 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
}
if( value < 0 ) {
+ if( value != -1 )
+ ShowWarning("npc_parse_shop: Item %s [%d] with invalid selling value '%d' in file '%s', line '%d', defaulting to buy price...\n",
+ id->name, nameid, value, filepath, strline(buffer,start-buffer));
+
if( type == SHOP ) value = id->value_buy;
else value = 0; // Cashshop doesn't have a "buy price" in the item_db
}
@@ -2685,13 +2704,16 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
}
if( i == 0 ) {
ShowWarning("npc_parse_shop: Ignoring empty shop in file '%s', line '%d'.\n", filepath, strline(buffer,start-buffer));
+ aFree(items);
if (retval) *retval = EXIT_FAILURE;
return strchr(start,'\n');// continue
}
CREATE(nd, struct npc_data, 1);
CREATE(nd->u.shop.shop_item, struct npc_item_list, i);
- memcpy(nd->u.shop.shop_item, items, sizeof(struct npc_item_list)*i);
+ memcpy(nd->u.shop.shop_item, items, sizeof(items[0])*i);
+ aFree(items);
+
nd->u.shop.count = i;
nd->bl.prev = nd->bl.next = NULL;
nd->bl.m = m;