summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-12 16:10:15 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-12 16:10:15 +0000
commit162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1 (patch)
treef0cdd949fa860b66678f2b1d8c59464ce3b733d5 /src/map
parent617311ef61537ed544e53e81956b8d687e8b8789 (diff)
downloadhercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.gz
hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.bz2
hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.xz
hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.zip
- Corrected the new packet version entries for skilluseposinfo
- Corrected item reloading not unsetting the "delay consume" flag if the item had changed it's type. - the Attack_Type variable in skill_attack now inherits the damage.flag properties, this fixes ranged status effects not triggering. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9992 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/itemdb.c3
-rw-r--r--src/map/skill.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index f39e3d809..404d8514f 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -742,7 +742,8 @@ static int itemdb_read_sqldb(void)
//(yggdrasil leaf, spells & pet lures) [Skotlex]
id->type = IT_USABLE;
id->flag.delay_consume=1;
- }
+ } else //In case of an itemdb reload and the item type changed.
+ id->flag.delay_consume=0;
// If price_buy is not NULL and price_sell is not NULL...
if ((sql_row[4] != NULL) && (sql_row[5] != NULL)) {
diff --git a/src/map/skill.c b/src/map/skill.c
index 96fe56b94..93345b559 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1867,6 +1867,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
return 0;
dmg=battle_calc_attack(attack_type,src,bl,skillid,skilllv,flag&0xFFF);
+ attack_type|=dmg.flag; //Add on the rest of attack properties.
//Skotlex: Adjusted to the new system
if(src->type==BL_PET)