Browse Source

Follow-up to r17391 : Fix undeclared identifier error when not using Renewal ASPD - Fixes bugreport:7781
Fix map crash when a monster uses GS_FULLBUSTER - Fixes bugreport:7770

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17393 54d463be-8e91-2dee-dedb-b68131a5f0ec

akinari1087 12 years ago
parent
commit
f02129f66d
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/map/skill.c
  2. 1 1
      src/map/status.c

+ 2 - 2
src/map/skill.c

@@ -2524,8 +2524,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 			sc_start(src,src,SC_SMA,100,skill_lv,skill_get_time(SL_SMA, skill_lv));
 		break;
 	case GS_FULLBUSTER:
-		//Can't attack nor use items until skill's delay expires. [Skotlex]
-		sd->ud.attackabletime = sd->canuseitem_tick = sd->ud.canact_tick;
+		if(sd) //Can't attack nor use items until skill's delay expires. [Skotlex]
+			sd->ud.attackabletime = sd->canuseitem_tick = sd->ud.canact_tick;
 		break;
 	}
 

+ 1 - 1
src/map/status.c

@@ -1806,9 +1806,9 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
 int status_base_amotion_pc(struct map_session_data* sd, struct status_data* status)
 {
 	int amotion;
+	int classidx = pc_class2idx(sd->status.class_);
 #ifdef RENEWAL_ASPD
 	short mod = -1;
-	int classidx = pc_class2idx(sd->status.class_);
 
 	switch( sd->weapontype2 ){ // adjustment for dual weilding
 		case W_DAGGER:	mod = 0;	break; // 0, 1, 1