From 7881ebb6cb8f90a3f586c1f7af1543a2c3e1b661 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 15 Dec 2015 19:48:04 +0100
Subject: Added const qualifier to the w1~w4 arguments of npc_parse_warp
Signed-off-by: Haru <haru@dotalux.com>
---
src/map/npc.c | 21 +++++++++++++++++++--
src/map/npc.h | 2 +-
2 files changed, 20 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/map/npc.c b/src/map/npc.c
index be03d5ab5..a70d3798d 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2630,8 +2630,25 @@ struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short
return nd;
}
-/// Parses a warp npc.
-const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, int *retval) {
+/**
+ * Parses a warp NPC.
+ *
+ * @param[in] w1 First tab-delimited part of the string to parse.
+ * @param[in] w2 Second tab-delimited part of the string to parse.
+ * @param[in] w3 Third tab-delimited part of the string to parse.
+ * @param[in] w4 Fourth tab-delimited part of the string to parse.
+ * @param[in] start Pointer to the beginning of the string inside buffer.
+ * This must point to the same buffer as `buffer`.
+ * @param[in] buffer Pointer to the buffer containing the script. For
+ * single-line mapflags not inside a script, this may be
+ * an empty (but initialized) single-character buffer.
+ * @param[in] filepath Source file path.
+ * @param[out] retval Pointer to return the success (EXIT_SUCCESS) or failure
+ * (EXIT_FAILURE) status. May be NULL.
+ * @return A pointer to the advanced buffer position.
+ */
+const char *npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval)
+{
int x, y, xs, ys, to_x, to_y, m;
unsigned short i;
char mapname[32], to_mapname[32];
diff --git a/src/map/npc.h b/src/map/npc.h
index 3d046008b..4899838f1 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -234,7 +234,7 @@ struct npc_interface {
bool (*viewisid) (const char *viewid);
struct npc_data *(*create_npc) (enum npc_subtype subtype, int m, int x, int y, uint8 dir, int16 class_);
struct npc_data* (*add_warp) (char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
- const char* (*parse_warp) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
+ const char *(*parse_warp) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
const char* (*parse_shop) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
const char* (*parse_unknown_object) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
void (*convertlabel_db) (struct npc_label_list *label_list, const char *filepath);
--
cgit v1.2.3-70-g09d2