summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mob.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9426b2dc4..50a95a444 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/04/07
+ * Fixed monster skill associated emotions were always ignored when having less than three digits ( = all ) (bugreport:4842). [Ai4rei]
* Throwing around with packet updates. [Ai4rei]
- Clarified the description for role-change chatroom packets 0xe0 (CZ_REQ_ROLE_CHANGE) and 0xe1 (ZC_ROLE_CHANGE).
- Fixed auction window opening packet 0x25f (ZC_AUCTION_WINDOWS) had also a close button packet attached (since r12270).
diff --git a/src/map/mob.c b/src/map/mob.c
index 9bd8c086c..1626f49a0 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4167,7 +4167,7 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
ms->val[1] = 0; //Do not "set" it.
}
- if(str[17] != NULL && strlen(str[17])>2)
+ if(*str[17])
ms->emotion=atoi(str[17]);
else
ms->emotion=-1;