From c6b5397e443179b28e6e094452fd4966ceb36798 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 23 Jan 2007 14:08:34 +0000 Subject: - Added view_data support to mercenary.*, so that the Homunculus entries are no longer required on the mob_db. - Removed homunculus entries from mob_db. - Added the status icon to NPC_CHANGEUNDEAD and the Flee/Hit foods - Corrected the check that lets you walk when vending/chatting/etc. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9697 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index 320045761..f448f006a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -418,14 +418,18 @@ void initChangeTables(void) { StatusIconChangeTable[SC_INCSTR] = SI_INCSTR; StatusIconChangeTable[SC_MIRACLE] = SI_SPIRIT; StatusIconChangeTable[SC_INTRAVISION] = SI_INTRAVISION; -#if PACKETVER > 7 + //This seems wrong as it sets the same icon to all skills that change your + //element, but alas, all of them are mob-target only with the exception of + //NPC_CHANGEUNDEAD, so this should be alright. [Skotlex] + StatusIconChangeTable[SC_ELEMENTALCHANGE] = SI_UNDEAD; StatusIconChangeTable[SC_STRFOOD] = SI_FOODSTR; StatusIconChangeTable[SC_AGIFOOD] = SI_FOODAGI; StatusIconChangeTable[SC_VITFOOD] = SI_FOODVIT; StatusIconChangeTable[SC_INTFOOD] = SI_FOODDEX; StatusIconChangeTable[SC_DEXFOOD] = SI_FOODINT; StatusIconChangeTable[SC_LUKFOOD] = SI_FOODLUK; -#endif + StatusIconChangeTable[SC_FLEEFOOD] = SI_FOODFLEE; + StatusIconChangeTable[SC_HITFOOD] = SI_FOODHIT; //Other SC which are not necessarily associated to skills. StatusChangeFlagTable[SC_ASPDPOTION0] = SCB_ASPD; StatusChangeFlagTable[SC_ASPDPOTION1] = SCB_ASPD; @@ -4223,6 +4227,8 @@ void status_set_viewdata(struct block_list *bl, int class_) vd = mob_get_viewdata(class_); else if (npcdb_checkid(class_) || (bl->type == BL_NPC && class_ == WARP_CLASS)) vd = npc_get_viewdata(class_); + else if (homdb_checkid(class_)) + vd = merc_get_hom_viewdata(class_); else vd = NULL; -- cgit v1.2.3-70-g09d2