diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-09 09:09:35 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-09 09:09:35 +0000 |
| commit | 1260d294ed795011b5b73284e308a6a01d9eef9e (patch) | |
| tree | 6663a0ae44f8ac7d830598311411843401f129a1 /src/map/mob.c | |
| parent | 28532995686a5315ddf0ad6557ae00cb2fe76206 (diff) | |
| download | hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.gz hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.bz2 hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.xz hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.zip | |
* Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 6135850b6..1626f49a0 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2586,7 +2586,7 @@ int mob_class_change (struct mob_data *md, int class_) mob_stop_walking(md, 0); unit_skillcastcancel(&md->bl, 0); status_set_viewdata(&md->bl, class_); - clif_mob_class_change(md,class_); + clif_mob_class_change(md,md->vd->class_); status_calc_mob(md, 1); md->ud.state.speed_changed = 1; //Speed change update. @@ -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; |