summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-15 06:26:50 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-15 06:26:50 +0000
commitd8ff7fd9bed5eebf76b02849b1cc5722ad6b3e23 (patch)
tree5aa40a2a50bbc2b5ac4410aad02185aa276f5a07 /src/map
parentfd0d48141125ddd5dc20f0ee6ab5752a5138bb87 (diff)
downloadhercules-d8ff7fd9bed5eebf76b02849b1cc5722ad6b3e23.tar.gz
hercules-d8ff7fd9bed5eebf76b02849b1cc5722ad6b3e23.tar.bz2
hercules-d8ff7fd9bed5eebf76b02849b1cc5722ad6b3e23.tar.xz
hercules-d8ff7fd9bed5eebf76b02849b1cc5722ad6b3e23.zip
* Fixed a compile warning in pc.c
* Updated Soul Breaker's damage display * Some shops and scripts fixes git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1234 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.c3
-rw-r--r--src/map/skill.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 6a325176c..abd758a02 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6821,7 +6821,8 @@ int pc_setsavepoint(struct map_session_data *sd,char *mapname,int x,int y)
*------------------------------------------
*/
static int last_save_fd,save_flag;
-static int Ghp[MAX_GUILDCASTLE][8]; // so save only if HP are changed // experimental code [Yor]
+// --- uncomment to reenable guild castle saving ---//
+//static int Ghp[MAX_GUILDCASTLE][8]; // so save only if HP are changed // experimental code [Yor]
static int pc_autosave_sub(struct map_session_data *sd,va_list ap)
{
diff --git a/src/map/skill.c b/src/map/skill.c
index 05c7bc89c..f75ffdd6a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1436,10 +1436,14 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
break;
case ASC_BREAKER: // [celest]
if (attack_type&BF_MAGIC) { // only display damage for the 2nd attack
- clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage+tmpdmg, dmg.div_, skillid, skilllv, type);
+ if (damage + tmpdmg != 0) // if both attacks missed, do not display a 2nd 'miss'
+ clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage+tmpdmg, dmg.div_, skillid, skilllv, type);
tmpdmg = 0; // clear the temporary damage
- } else
+ } else {
+ if (damage == 0) // if weapon attack missed, display the 'miss'
+ clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, 0, dmg.div_, skillid, skilllv, type);
tmpdmg = damage; // store the temporary weapon damage
+ }
break;
case NPC_SELFDESTRUCTION:
case NPC_SELFDESTRUCTION2: