Permalink
Browse files

CheckRemoveItem: fixed the CRI_REMOVEFORSWAP check

the last change caused a regression
  • Loading branch information...
1 parent b89f48a commit 8971b430d4fd5d61ba3920d16d2bdeafee4c7231 @lynxlynxlynx lynxlynxlynx committed Jan 18, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 gemrb/plugins/GUIScript/GUIScript.cpp
@@ -7484,9 +7484,9 @@ int CheckRemoveItem(Actor *actor, CREItem *si, int action)
// and make sure not to treat earrings improperly
case CRI_REMOVEFORSWAP:
int flags = UsedItems[i].flags;
- if ((flags&1 && flags&4) || !(flags&15)) {
+ if (!(flags&1) || flags&4) {
continue;
- } // no continue
+ }
break;
}

0 comments on commit 8971b43

Please sign in to comment.