Skip to content

Commit

Permalink
Helmets do not check for armor conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
luciensadi committed Nov 23, 2023
1 parent 803687f commit 53ce86b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/act.obj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3381,10 +3381,11 @@ void perform_wear(struct char_data * ch, struct obj_data * obj, int where, bool
return;
}

// Iterate through what they're wearing and check for compatibility.
struct obj_data *worn_item = NULL;
for (int wearloc = 0; wearloc < NUM_WEARS; wearloc++) {
// They're allowed to wear helmets.
// Iterate through what they're wearing and check for compatibility-- but only if this is not a helmet.
if (where != ITEM_WEAR_HEAD) {
struct obj_data *worn_item = NULL;
for (int wearloc = 0; wearloc < NUM_WEARS; wearloc++) {
// Helmets never conflict.
if (wearloc == WEAR_HEAD)
continue;

Expand All @@ -3408,6 +3409,7 @@ void perform_wear(struct char_data * ch, struct obj_data * obj, int where, bool
return;
}
}
}

// Gyros take a bit to get into.
if (GET_OBJ_TYPE(obj) == ITEM_GYRO) {
Expand Down

0 comments on commit 53ce86b

Please sign in to comment.