From b0ad05d8032f1c423a8d5dc831fb43b00f0d599e Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 7 Apr 2011 16:10:02 +0000
Subject: [PATCH] * Fixed monster skill associated emotions were always ignored
 when having less than three digits ( = all ) (bugreport:4842).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14778 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 1 +
 src/map/mob.c       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9426b2dc40..50a95a4447 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 9bd8c086ca..1626f49a0a 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;