瀏覽代碼

Fixed #828
* Resolves required equipment check needing all equipment given to be equipped rather than just one. Thanks to @Paoly28.

aleos89 9 年之前
父節點
當前提交
27e90f8f45
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 6 3
      src/map/pc.c
  2. 2 2
      src/map/skill.c

+ 6 - 3
src/map/pc.c

@@ -5628,11 +5628,14 @@ short pc_checkequip(struct map_session_data *sd,int pos)
  * @max : see pc.h enum equip_index for @min to ?
  * -return true,false
  *------------------------------------------*/
-bool pc_checkequip2(struct map_session_data *sd, unsigned short nameid, int min, int max){
+bool pc_checkequip2(struct map_session_data *sd, unsigned short nameid, int min, int max)
+{
 	int i;
-	for(i=min;i<max;i++){
-		if(equip_pos[i]){
+
+	for(i = min; i < max; i++) {
+		if(equip_pos[i]) {
 			int idx = sd->equip_index[i];
+
 			if (sd->status.inventory[idx].nameid == nameid)
 				return true;
 		}

+ 2 - 2
src/map/skill.c

@@ -15188,8 +15188,8 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
 					clif_skill_fail(sd,skill_id,USESKILL_FAIL_THIS_WEAPON,0);
 					return false;
 				}
-				continue;
-			}
+			} else
+				break; // Wearing an applicable item.
 		}
 	}