From 9c1fcacd1f0b72d130b5bac3d2f2f542a11879c7 Mon Sep 17 00:00:00 2001
From: "omegablast2002@yahoo.com"
 <omegablast2002@yahoo.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 14 Mar 2012 10:52:14 +0000
Subject: [PATCH] psp comp fix.

---
 projects/mtg/include/AllAbilities.h | 4 ++--
 projects/mtg/src/AllAbilities.cpp   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 565bda926..317f81a49 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -4846,7 +4846,7 @@ public:
     string after;
     bool aNext;
     APhaseAlter(GameObserver* observer, int _id, MTGCardInstance * card,Targetable * targetPlayer, bool _adding,string _phaseToAlter,string targeting, bool _aNext,string _after = "") :
-        TriggeredAbility(observer, _id, card),targetPlayerWho(targetPlayer),adding(_adding),phaseToAlter(_phaseToAlter),targetingString(targeting),aNext(_aNext),after(_after)
+        TriggeredAbility(observer, _id, card),targetPlayerWho(targetPlayer),adding(_adding),phaseToAlter(_phaseToAlter),targetingString(targeting),after(_after),aNext(_aNext)
     {
             applied = false;
             who = NULL;
@@ -5396,8 +5396,8 @@ class AASetTypeChosen: public InstantAbility
 {
 public:
     int type;
-    string menutext;
     string abilityToAlter;
+    string menutext;
     MTGAbility * abilityAltered;
     AASetTypeChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _type = 0,string menu = "error" ,string toAdd = "");
     int resolve();
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 7464fb292..31ca54591 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -330,7 +330,8 @@ ActivatedAbility(observer, _id, _source, _cost, 0)
 int AALibraryBottom::resolve()
 {
     MTGCardInstance * _target = (MTGCardInstance *) target;
-    if (_target = _target->owner->game->putInLibrary(_target))
+    _target = _target->owner->game->putInLibrary(_target);
+    if (_target)
     {
         MTGLibrary * library = _target->owner->game->library;
         vector<MTGCardInstance *>oldOrder = library->cards;