summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 17:57:44 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 17:57:44 +0000
commitbb46a19f03b01c2882ad4fca8d121ff42819ec69 (patch)
treecbda04edb20f3403b66269e3afb6f3b801ea6eac /src
parent4be6ca0c2b518877d58d21aa9e61cb94322d0a02 (diff)
downloadhercules-bb46a19f03b01c2882ad4fca8d121ff42819ec69.tar.gz
hercules-bb46a19f03b01c2882ad4fca8d121ff42819ec69.tar.bz2
hercules-bb46a19f03b01c2882ad4fca8d121ff42819ec69.tar.xz
hercules-bb46a19f03b01c2882ad4fca8d121ff42819ec69.zip
- Added a crash-fix on status_calc_bl_sub_homun to abort in case the homun has no master (need to clean up this function later)
- Tested char-txt load/save, it seems to be working fine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8296 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 4022565e0..4b4609fa5 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2537,6 +2537,9 @@ void status_calc_bl_sub_hom(struct homun_data *hd, unsigned long flag) //[orn]
struct status_data *status = &hd->battle_status, *b_status = &hd->base_status;
int skill = 0;
+ if (!hd->master)
+ return; //Don't do anything if there isn't a master...
+
if(flag&(SCB_MAXHP|SCB_VIT))
{
flag|=SCB_MAXHP; //Ensures client-side refresh