Skip to content

Instantly share code, notes, and snippets.

@tomprince
Created March 22, 2011 20:31
Show Gist options
  • Save tomprince/881988 to your computer and use it in GitHub Desktop.
Save tomprince/881988 to your computer and use it in GitHub Desktop.
diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index ca980d6..ca0757e 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -1152,7 +1152,7 @@ int EffectQueue::ApplyEffect(Actor* target, Effect* fx, ieDword first_apply, ieD
case FX_PERMANENT:
//don't stick around if it was executed permanently
//for example, a permanent strength modifier effect
- if( (fx->TimingMode == FX_DURATION_INSTANT_PERMANENT) ) {
+ if(fx->TimingMode == FX_DURATION_INSTANT_PERMANENT) {
fx->TimingMode = FX_DURATION_JUST_EXPIRED;
}
break;
diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index f87db86..d6966ab 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -1735,7 +1735,7 @@ void GameControl::HandleContainer(Container *container, Actor *actor)
return;
}
- if ((target_mode == TARGET_MODE_PICK)) {
+ if (target_mode == TARGET_MODE_PICK) {
TryToPick(actor, container);
return;
}
@@ -1795,7 +1795,7 @@ bool GameControl::HandleActiveRegion(InfoPoint *trap, Actor * actor, Point &p)
//don't bother with this region further
return true;
}
- if ((target_mode == TARGET_MODE_PICK)) {
+ if (target_mode == TARGET_MODE_PICK) {
TryToDisarm(actor, trap);
return true;
}
diff --git a/gemrb/core/GUI/MapControl.cpp b/gemrb/core/GUI/MapControl.cpp
index 4abd158..7d66c84 100644
--- a/gemrb/core/GUI/MapControl.cpp
+++ b/gemrb/core/GUI/MapControl.cpp
@@ -471,7 +471,7 @@ void MapControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short Bu
return;
case MAP_VIEW_NOTES:
//left click allows setting only when in MAP_SET_NOTE mode
- if ((Button == GEM_MB_ACTION) ) {
+ if (Button == GEM_MB_ACTION) {
ViewHandle(x,y);
}
ClickHandle(Button);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment