summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-07 18:42:53 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-07 18:42:53 +0000
commit90fd7a2c221c9e13a43d2c01e3af53c04e393945 (patch)
tree130cfcc656939ca5103deec186ee32bf7888344e /src/map
parent1a348ede4934a1ba78f337ee1dffe11a699f4bef (diff)
downloadhercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.gz
hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.bz2
hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.xz
hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.zip
G++ is now the default on trunk [MouseJstr]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1443 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/.svnignore3
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/npc_chat.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/map/.svnignore b/src/map/.svnignore
new file mode 100644
index 000000000..d2a881f54
--- /dev/null
+++ b/src/map/.svnignore
@@ -0,0 +1,3 @@
+txtobj
+GNUmakefile
+sqlobj
diff --git a/src/map/clif.c b/src/map/clif.c
index c8f190c5a..70d7cdaa9 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8007,7 +8007,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c <
WFIFOSET(fd, WFIFOW(fd,2));
#ifdef PCRE_SUPPORT
- map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen(RFIFOP(fd,4)), &sd->bl);
+ map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen((char *) RFIFOP(fd,4)), &sd->bl);
#endif
// Celest
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 5ec8540ae..c15a26bf0 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -387,7 +387,7 @@ int npc_chat_sub(struct block_list *bl, va_list ap)
int offsets[20];
char buf[255];
// perform pattern match
- int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0,
+ int r = pcre_exec(e->pcre_, e->pcre_extra_, (char *) msg, len, 0,
0, offsets, sizeof(offsets) / sizeof(offsets[0]));
if (r >= 0) {
// save out the matched strings