summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c3
-rw-r--r--src/map/intif.c2
-rw-r--r--src/map/mob.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 68b1909d0..7304990d6 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9861,7 +9861,8 @@ int atcommand_fakename(const int fd, struct map_session_data* sd, const char* co
return 0;
}
- memcpy(sd->fakename,name,NAME_LENGTH-1);
+ memcpy(sd->fakename,name,NAME_LENGTH);
+ sd->fakename[NAME_LENGTH-1] = '\0';
clif_charnameack(0, &sd->bl);
clif_displaymessage(sd->fd,"Fake name enabled.");
diff --git a/src/map/intif.c b/src/map/intif.c
index ad749d5f9..d53d6b8f2 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1267,6 +1267,8 @@ int intif_parse_GuildMemberInfoChanged(int fd)
if( g==NULL )
return 0;
idx=guild_getindex(g,account_id,char_id);
+ if (idx == -1)
+ return 0;
switch(type){
case GMI_POSITION:
g->member[idx].position=dd;
diff --git a/src/map/mob.c b/src/map/mob.c
index 7434aae3a..2d8c2591b 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2058,7 +2058,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
double exp;
//mapflag: noexp check [Lorky]
- if (map[m].flag.nobaseexp || !(type&2))
+ if (map[m].flag.nobaseexp || type&2)
exp =1;
else {
exp = md->db->mexp;