From 2ea6887d116c5c45779471f550c646247edb7457 Mon Sep 17 00:00:00 2001
From: Maurizio Monge <maurizio@localhost.localdomain>
Date: Thu, 5 Jul 2007 01:08:37 +0100
Subject: [PATCH] Continued refactor work.

---
 src/graphicalapi.h                                 |   1 +
 src/highlevel.h                                    | 326 ++++++++++-----------
 src/kboard.h                                       |  13 +-
 src/unwrapped_graphicalapi.h                       |  20 +-
 src/variants/{atomic.cpp => atomic.cpp_}           |   0
 src/variants/{atomic.h => atomic.h_}               |   0
 .../{chainreaction.cpp => chainreaction.cpp_}      |   0
 src/variants/{chainreaction.h => chainreaction.h_} |   0
 src/variants/chess.cpp                             |  93 ++----
 src/variants/chess.h                               |   1 +
 src/variants/{connect4.cpp => connect4.cpp_}       |   0
 src/variants/{connect4.h => connect4.h_}           |   0
 src/variants/{crazyhouse.cpp => crazyhouse.cpp_}   |   0
 src/variants/{crazyhouse.h => crazyhouse.h_}       |   0
 src/variants/{crazyhouse_p.h => crazyhouse_p.h_}   |   3 +
 src/variants/{dummy.cpp => dummy.cpp_}             |   0
 src/variants/{dummy.h => dummy.h_}                 |   0
 src/variants/{king4pawns.cpp => king4pawns.cpp_}   |   0
 src/variants/{king4pawns.h => king4pawns.h_}       |   0
 src/variants/{progressive.cpp => progressive.cpp_} |   0
 src/variants/{progressive.h => progressive.h_}     |   0
 src/variants/{reversi.cpp => reversi.cpp_}         |   0
 src/variants/{reversi.h => reversi.h_}             |   0
 src/variants/{rubyvariant.cpp => rubyvariant.cpp_} |   0
 src/variants/{rubyvariant.h => rubyvariant.h_}     |   0
 src/variants/{shogi.cpp => shogi.cpp_}             |   0
 src/variants/{shogi.h => shogi.h_}                 |   0
 .../{trivialanimator.h => trivialanimator.h_}      |   0
 src/variants/variants.cpp                          |   3 +
 src/variants/xchess/position.h                     |   2 +-
 src/variants/{xiangqi.cpp => xiangqi.cpp_}         |   0
 src/variants/{xiangqi.h => xiangqi.h_}             |   0
 32 files changed, 203 insertions(+), 259 deletions(-)
 rename src/variants/{atomic.cpp => atomic.cpp_} (100%)
 rename src/variants/{atomic.h => atomic.h_} (100%)
 rename src/variants/{chainreaction.cpp => chainreaction.cpp_} (100%)
 rename src/variants/{chainreaction.h => chainreaction.h_} (100%)
 rename src/variants/{connect4.cpp => connect4.cpp_} (100%)
 rename src/variants/{connect4.h => connect4.h_} (100%)
 rename src/variants/{crazyhouse.cpp => crazyhouse.cpp_} (100%)
 rename src/variants/{crazyhouse.h => crazyhouse.h_} (100%)
 rename src/variants/{crazyhouse_p.h => crazyhouse_p.h_} (99%)
 rename src/variants/{dummy.cpp => dummy.cpp_} (100%)
 rename src/variants/{dummy.h => dummy.h_} (100%)
 rename src/variants/{king4pawns.cpp => king4pawns.cpp_} (100%)
 rename src/variants/{king4pawns.h => king4pawns.h_} (100%)
 rename src/variants/{progressive.cpp => progressive.cpp_} (100%)
 rename src/variants/{progressive.h => progressive.h_} (100%)
 rename src/variants/{reversi.cpp => reversi.cpp_} (100%)
 rename src/variants/{reversi.h => reversi.h_} (100%)
 rename src/variants/{rubyvariant.cpp => rubyvariant.cpp_} (100%)
 rename src/variants/{rubyvariant.h => rubyvariant.h_} (100%)
 rename src/variants/{shogi.cpp => shogi.cpp_} (100%)
 rename src/variants/{shogi.h => shogi.h_} (100%)
 rename src/variants/{trivialanimator.h => trivialanimator.h_} (100%)
 rename src/variants/{xiangqi.cpp => xiangqi.cpp_} (100%)
 rename src/variants/{xiangqi.h => xiangqi.h_} (100%)

diff --git a/src/graphicalapi.h b/src/graphicalapi.h
index 3ade273..7b6d69f 100644
--- a/src/graphicalapi.h
+++ b/src/graphicalapi.h
@@ -14,6 +14,7 @@
 #include <boost/shared_ptr.hpp>
 #include "kboard.h"
 #include "pointconverter.h"
+#include "sprite.h"
 
 typedef boost::shared_ptr<class Sprite> SpritePtr;
 
diff --git a/src/highlevel.h b/src/highlevel.h
index 7d35d97..26c0b76 100644
--- a/src/highlevel.h
+++ b/src/highlevel.h
@@ -21,6 +21,7 @@
 
 template <typename V> class WrappedPiece;
 template <typename V> class WrappedMove;
+template <typename V> class WrappedPosition;
 
 /**
   * @brief Wrap an high level position definition
@@ -60,9 +61,6 @@ template <typename V> class WrappedMove;
   *
   */
 
-template <typename V> class GenericGraphicalPosition;
-template <typename V> class WrappedGraphicalPosition;
-
 #ifdef Q_CC_GNU
   #define __FUNC__ __PRETTY_FUNCTION__
 #else
@@ -76,80 +74,176 @@ template <typename V> class WrappedGraphicalPosition;
                        
 #define TYPECHECK(x,y) if (typeid(x) != typeid(y)) MISMATCH(x,y); else { }
 
+
+
 template <typename Variant>
-class WrappedPosition : public AbstractPosition {
-  typedef typename Variant::Position Position;
-  typedef typename Variant::Move Move;
+class WrappedPiece : public AbstractPiece {
   typedef typename Variant::Piece Piece;
-  typedef typename Position::Pool Pool;
 
-  Position m_pos;
+  Piece m_piece;
 public:
-  const Position& inner() const { return m_pos; }
-  Position& inner() { return m_pos; }
+  const Piece& inner() const { return m_piece; }
 
-  WrappedPosition(const Position& pos)
-  : m_pos(pos) { }
+  WrappedPiece(const Piece& piece)
+  : m_piece(piece) { }
 
-  virtual QString variant() const {
-    return Variant::m_name;
+  virtual bool equals(AbstractPiece::Ptr _other) const {
+    if (!_other) return false;
+    WrappedPiece<Variant>* other = dynamic_cast<WrappedPiece<Variant>*>(_other.get());
+
+    if (other)
+      return m_piece == other->inner();
+    else {
+      MISMATCH(*_other.get(),WrappedPiece<Variant>);
+      return false;
+    }
   }
 
-  virtual Point size() const {
-    return inner().size();
+  virtual QString name() const {
+    return m_piece.name();
   }
 
-  virtual QStringList borderCoords() const {
-    return inner().borderCoords();
+  virtual QString typeSymbol() const {
+    return Piece::typeSymbol(m_piece.type());
   }
 
-  virtual PoolPtr pool() const {
-    PoolPtr p = PoolPtr(new AbstractPool);
-    for(typename Pool::const_iterator it = m_pos.pool().begin(); it != m_pos.pool().end(); ++it)
-      (*p)[ AbstractPiece::Ptr(new WrappedPiece<Variant>(it->first)) ] = it->second;
-    return p;
+  virtual AbstractPiece::Ptr clone() const {
+    return AbstractPiece::Ptr(new WrappedPiece<Variant>(m_piece));
   }
+};
 
-  virtual void addToPool(AbstractPiece::Ptr _piece, int n) {
-    WrappedPiece<Variant>* piece = dynamic_cast<WrappedPiece<Variant>*>(_piece.get());
 
-    if (piece)
-      m_pos.addToPool(piece->inner(), n);
-    else
-      MISMATCH(*_piece.get(),WrappedPiece<Variant>);
+template <typename Variant>
+class WrappedMove : public AbstractMove {
+  typedef typename Variant::Move Move;
+  typedef typename Variant::Position Position;
+
+  Move m_move;
+public:
+  const Move& inner() const { return m_move; }
+
+  WrappedMove(const Move& move)
+  : m_move(move) { }
+
+  virtual QString SAN(AbstractPosition::Ptr _pos) const {
+    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
+
+    if (pos) {
+      MoveSerializer<Position> serializer(m_move, pos->inner());
+      return serializer.SAN();
+    }
+    else {
+      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
+      return "$@%";
+    }
   }
 
-  virtual void removeFromPool(AbstractPiece::Ptr _piece, int n) {
-    WrappedPiece<Variant>* piece = dynamic_cast<WrappedPiece<Variant>*>(_piece.get());
+  virtual DecoratedMove toDecoratedMove(boost::shared_ptr<AbstractPosition> _pos) const {
+    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
 
-    if (piece)
-      m_pos.removeFromPool(piece->inner(), n);
-    else
-      MISMATCH(*_piece.get(),WrappedPiece<Variant>);
+    if (pos) {
+      MoveSerializer<Position> serializer(m_move, pos->inner());
+      return serializer.toDecoratedMove();
+    }
+    else {
+      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
+      return DecoratedMove();
+    }
   }
 
-  virtual void copyPoolFrom(AbstractPosition::Ptr _other) {
-    WrappedPosition<Variant>* other = dynamic_cast<WrappedPosition<Variant>*>(_other.get());
+  virtual QString toString(AbstractPosition::Ptr _pos) const {
+    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
 
-    if (other)
-      m_pos.pool() = other->inner().pool();
-    else
-      MISMATCH(*_other.get(),WrappedPosition<Variant>);
+    if (pos)
+      return m_move.toString(pos->inner().size().y);
+    else {
+      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
+      return "$@%";
+    }
   }
 
-  virtual void setPool(PoolPtr pool) {
-    m_pos.pool().clear();
+  virtual NormalUserMove toUserMove() const {
+    return MoveFactory<Variant>::toNormal(m_move);
+  }
 
-    for(typename AbstractPool::iterator it = pool->begin(); it != pool->end(); ++it) {
-      WrappedPiece<Variant>* piece = dynamic_cast<WrappedPiece<Variant>*>(it->first.get());
+  virtual bool equals(AbstractMove::Ptr _other) const {
+    WrappedMove<Variant>* other = dynamic_cast<WrappedMove<Variant>*>(_other.get());
+
+    if (!other)
+      return m_move == other->inner();
+    else {
+      MISMATCH(*_other.get(),WrappedMove<Variant>);
+      return false;
+    }
+  }
+};
+
+
+template <typename Variant>
+class WrappedPool : public AbstractPool {
+  typedef typename Variant::Pool Pool;
+  typedef typename Variant::Piece Piece;
+
+  Pool* m_pool;
+public:
+  WrappedPosition(Pool* pool)
+  : m_pool(pool) { }
+
+  virtual int size() {
+    return m_pool->size();
+  }
+
+  virtual int insert(int pref_index, AbstractPiece::Ptr _piece) {
+    if (!_piece) {
+      return m_pool->insert(pref_index, 0);
+    }
+    else {
+      WrappedPiece<Variant>* piece = dynamic_cast<WrappedPiece<Variant>*>(_piece.get());
 
       if (piece)
-        m_pos.pool()[piece->inner()] += it->second;
-      else {
-        MISMATCH(*it->first.get(), WrappedPiece<Variant>);
-        return;
-      }
+        return m_pool->insert(p, new Piece(piece->inner()) );
+      else
+        MISMATCH(*_piece.get(),WrappedPiece<Variant>);
     }
+    return m_pool->size();
+    
+  }
+
+  virtual AbstractPiece::Ptr get(int index) {
+    
+  }
+
+  virtual AbstractPiece::Ptr take(int index) {
+    
+  }
+};
+
+
+template <typename Variant>
+class WrappedPosition : public AbstractPosition {
+  typedef typename Variant::Position Position;
+  typedef typename Variant::Move Move;
+  typedef typename Variant::Piece Piece;
+  typedef typename Variant::Pool Pool;
+
+  Position m_pos;
+public:
+  const Position& inner() const { return m_pos; }
+  Position& inner() { return m_pos; }
+
+  WrappedPosition(const Position& pos)
+  : m_pos(pos) { }
+
+  virtual Point size() const {
+    return QSize(200, 200);
+  }
+
+  virtual QStringList borderCoords() const {
+    return inner().borderCoords();
+  }
+
+  virtual void setup() {
+    m_pos.setup();
   }
 
   virtual AbstractPiece::Ptr get(const Point& p) const {
@@ -174,6 +268,10 @@ public:
     }
   }
 
+  virtual AbstractPool::Ptr pool(int player) {
+    return AbstractPool::Ptr(new WrappedPool<Variant>(m_pos.pool(player)));
+  }
+
   virtual int turn() const {
     return static_cast<int>(m_pos.turn());
   }
@@ -210,10 +308,6 @@ public:
       MISMATCH(*_move.get(),WrappedMove<Variant>);
   }
 
-  virtual void setup() {
-    m_pos.setup();
-  }
-
   virtual AbstractPosition::Ptr clone() const {
     return AbstractPosition::Ptr(new WrappedPosition<Variant>(m_pos));
   }
@@ -268,131 +362,15 @@ public:
     return AbstractPiece::Ptr();
   }
 
-  virtual void dump() const {
-    m_pos.dump();
-  }
-};
-
-template <typename Variant>
-class WrappedMove : public AbstractMove {
-  typedef typename Variant::Move Move;
-  typedef typename Variant::Position Position;
-
-  Move m_move;
-public:
-  const Move& inner() const { return m_move; }
-
-  WrappedMove(const Move& move)
-  : m_move(move) { }
-
-  virtual QString SAN(AbstractPosition::Ptr _pos) const {
-    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
-
-    if (pos) {
-      MoveSerializer<Position> serializer(m_move, pos->inner());
-      return serializer.SAN();
-    }
-    else {
-      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
-      return "$@%";
-    }
-  }
-
-  virtual DecoratedMove toDecoratedMove(boost::shared_ptr<AbstractPosition> _pos) const {
-    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
-
-    if (pos) {
-      MoveSerializer<Position> serializer(m_move, pos->inner());
-      return serializer.toDecoratedMove();
-    }
-    else {
-      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
-      return DecoratedMove();
-    }
-  }
-
-  virtual QString toString(AbstractPosition::Ptr _pos) const {
-    WrappedPosition<Variant>* pos = dynamic_cast<WrappedPosition<Variant>*>(_pos.get());
-
-    if (pos)
-      return m_move.toString(pos->inner().size().y);
-    else {
-      MISMATCH(*_pos.get(),WrappedPosition<Variant>);
-      return "$@%";
-    }
-  }
-
-  virtual NormalUserMove toUserMove() const {
-    return MoveFactory<Variant>::toNormal(m_move);
+  virtual QString variant() const {
+    return Variant::m_name;
   }
 
-  virtual bool equals(AbstractMove::Ptr _other) const {
-    WrappedMove<Variant>* other = dynamic_cast<WrappedMove<Variant>*>(_other.get());
-
-    if (other)
-      return m_move == other->inner();
-    else {
-      MISMATCH(*_other.get(),WrappedMove<Variant>);
-      return false;
-    }
+  virtual void dump() const {
+    m_pos.dump();
   }
 };
 
-template <typename Variant>
-class WrappedPiece : public AbstractPiece {
-  typedef typename Variant::Piece Piece;
-
-  Piece m_piece;
-public:
-  const Piece& inner() const { return m_piece; }
-
-  WrappedPiece(const Piece& piece)
-  : m_piece(piece) { }
-
-  virtual int type() const {
-    return static_cast<int>(m_piece.type());
-  }
-
-  virtual int color() const {
-    return static_cast<int>(m_piece.color());
-  }
-
-  virtual QString name() const {
-    return m_piece.name();
-  }
-
-  virtual QString typeSymbol() const {
-    return Piece::typeSymbol(m_piece.type());
-  }
-
-  virtual bool equals(AbstractPiece::Ptr _other) const {
-    if (!_other) return false;
-    WrappedPiece<Variant>* other = dynamic_cast<WrappedPiece<Variant>*>(_other.get());
-
-    if (other)
-      return m_piece == other->inner();
-    else {
-      MISMATCH(*_other.get(),WrappedPiece<Variant>);
-      return false;
-    }
-  }
-
-  virtual bool less(AbstractPiece::Ptr _other) const {
-    if (!_other) return false;
-    WrappedPiece<Variant>* other = dynamic_cast<WrappedPiece<Variant>*>(_other.get());
-
-    if (other)
-      return m_piece < other->inner();
-    else {
-      MISMATCH(*_other.get(),WrappedPiece<Variant>);
-      return false;
-    }
-  }
-
-  virtual AbstractPiece::Ptr clone() const {
-    return AbstractPiece::Ptr(new WrappedPiece<Variant>(m_piece));
-  }
-};
 
 template <typename Variant>
 class WrappedAnimator : public AbstractAnimator {
diff --git a/src/kboard.h b/src/kboard.h
index 7380b66..15d7f55 100644
--- a/src/kboard.h
+++ b/src/kboard.h
@@ -206,12 +206,19 @@ public:
   virtual AbstractPool::Ptr pool(int player);
 
   /**
-    * Return an id corresponding to the player
+    * \return an id corresponding to the player
     * who is in turn.
     */
   virtual int turn() const = 0;
+
+  /**
+    * Sets the player on move
+    */
   virtual void setTurn(int) = 0;
 
+  /**
+    * \return the player that just moved
+    */
   virtual int previousTurn() const = 0;
 
   /**
@@ -222,13 +229,13 @@ public:
   /**
     * Check move legality. Set move fields as needed.
     * Return whether the move is legal.
-    * This function should return immediately if @a m
+    * This function should return immediately if \a m
     * has already been tested.
     */
   virtual bool testMove(AbstractMove::Ptr m) const = 0;
 
   /**
-    * Execute move @a m. Assume that m is legal and tested.
+    * Execute move \a m. Assume that \a m is legal and tested.
     */
   virtual void move(AbstractMove::Ptr m) = 0;
 
diff --git a/src/unwrapped_graphicalapi.h b/src/unwrapped_graphicalapi.h
index 0455ac2..8cc3b39 100644
--- a/src/unwrapped_graphicalapi.h
+++ b/src/unwrapped_graphicalapi.h
@@ -11,6 +11,8 @@
 #ifndef UNWRAPPEDGRAPHICALAPI_H
 #define UNWRAPPEDGRAPHICALAPI_H
 
+#include "graphicalapi.h"
+
 /**
   * This class moves the interface that will be used by the animator to modify
   * kboard graphics into the variant's semantics.
@@ -23,6 +25,8 @@ public:
     : m_graphical_api(interface) {
   }
 
+  virtual ~UnwrappedGraphicalAPI(){}
+
   virtual const PointConverter* converter() {
     return m_graphical_api->converter();
   }
@@ -50,17 +54,21 @@ public:
     return m_graphical_api->takeSprite(p);
   }
 
-  virtual SpritePtr insertPoolSprite(int index, const AbstractPiece& piece) {
+  virtual int poolSize(int pool) {
+    return m_graphical_api->poolSize(pool);
+  }
+
+  virtual SpritePtr insertPoolSprite(int pool, int index, const AbstractPiece& piece) {
     WrappedPiece<Variant> wpiece(piece);
-    return m_graphical_api->insertPoolSprite(index, &wpiece);
+    return m_graphical_api->insertPoolSprite(pool, index, &wpiece);
   }
 
-  virtual SpritePtr getPoolSprite(int index) {
-    return m_graphical_api->getPoolSprite(index);
+  virtual SpritePtr getPoolSprite(int pool, int index) {
+    return m_graphical_api->getPoolSprite(pool, index);
   }
 
-  virtual SpritePtr takePoolSprite(int index) {
-    return m_graphical_api->takePoolSprite(index);
+  virtual SpritePtr takePoolSprite(int pool, int index) {
+    return m_graphical_api->takePoolSprite(pool, index);
   }
 };
 
diff --git a/src/variants/atomic.cpp b/src/variants/atomic.cpp_
similarity index 100%
rename from src/variants/atomic.cpp
rename to src/variants/atomic.cpp_
diff --git a/src/variants/atomic.h b/src/variants/atomic.h_
similarity index 100%
rename from src/variants/atomic.h
rename to src/variants/atomic.h_
diff --git a/src/variants/chainreaction.cpp b/src/variants/chainreaction.cpp_
similarity index 100%
rename from src/variants/chainreaction.cpp
rename to src/variants/chainreaction.cpp_
diff --git a/src/variants/chainreaction.h b/src/variants/chainreaction.h_
similarity index 100%
rename from src/variants/chainreaction.h
rename to src/variants/chainreaction.h_
diff --git a/src/variants/chess.cpp b/src/variants/chess.cpp
index 9226a6f..52379f3 100644
--- a/src/variants/chess.cpp
+++ b/src/variants/chess.cpp
@@ -16,38 +16,20 @@
 #include "moveserializer.impl.h"
 #include "xchess/animator.impl.h"
 #include "piecefunction.h"
+#include "unwrapped_graphicalapi.h"
+#include "animation.h"
 
 using namespace boost;
+typedef boost::shared_ptr<class Animation> AnimationPtr;
 
 const char *ChessVariant::m_name = "Chess";
 const char *ChessVariant::m_theme_proxy = "Chess";
 VariantInfo* ChessVariant::static_chess_variant = 0;
 
-class ChessAnimator : public SimpleAnimator<ChessVariant> {
-public:
-  ChessAnimator(PointConverter* converter,
-                               const shared_ptr<GPosition>& position)
-  : SimpleAnimator<ChessVariant>(converter, position) { }
-protected:
-  shared_ptr<MovementAnimation> 
-    createMovementAnimation(const GElement& element, const QPoint& destination) {
-      if (element.piece().type() == KNIGHT) {
-        return shared_ptr<MovementAnimation>(
-          new KnightMovementAnimation(element.sprite(),
-                                      destination, m_anim_rotate));
-      }
-      else {
-        return shared_ptr<MovementAnimation>(
-          new MovementAnimation(element.sprite(),
-                                destination, 1.0));
-      }
-  }
-};
 
 
 //BEGIN Dream code
 
-
 typedef UnwrappedGraphicalAPI<ChessVariant> ChessGraphicalAPI;
 
 class ChessAnimator {
@@ -59,73 +41,34 @@ public:
 
   AnimationPtr warp(const ChessPosition* final) {
     const ChessPosition* current = m_cinterface->position();
-    AnimationPtr res(new AnimationGroup);
+    boost::shared_ptr<AnimationGroup> res(new AnimationGroup);
 
-    for (Point i = m_current->first(); i <= m_position->last(); i = m_position->next(i)) {
-      ChessPiece* c = current->get(i);
-      ChessPiece* f = final->get(i);
+    for (Point i = current->first(); i <= current->last(); i = current->next(i)) {
+      const ChessPiece* c = current->get(i);
+      const ChessPiece* f = final->get(i);
 
       if( !c && f ) {
         //current->set(i, f);
-        PieceSpritePtr sprite = m_cinterface->setSprite(i, *f, false, false);
+        SpritePtr sprite = m_cinterface->setSprite(i, *f, false, false);
         res->addPreAnimation( shared_ptr<DropAnimation>(new DropAnimation(sprite)) );
       }
       else if (c && !f) {
-        //current->set(i, shared_ptr<ChessPiece>());
-        PieceSpritePtr old_sprite = m_cinterface->getSprite(i);
-        res->addPreAnimation( shared_ptr<CaptureAnimation>(new CaptureAnimation(sprite)) );
+        //current->set(i, NULL);
+        SpritePtr old_sprite = m_cinterface->getSprite(i);
+        res->addPreAnimation( shared_ptr<CaptureAnimation>(new CaptureAnimation(old_sprite)) );
       }
-      else if(!c.equals(f) ) {
-        current->set(i, f);
-        PieceSpritePtr old_sprite = m_cinterface->takeSprite(i);
-        res->addPreAnimation( shared_ptr<PromotionProAnimation>(new PromotionAnimation(sprite)) );
+      else if(c && !c->equals(f) ) {
+        //current->set(i, f);
+        SpritePtr old_sprite = m_cinterface->takeSprite(i);
+        SpritePtr sprite = m_cinterface->setSprite(i, *f, false, false);
+        res->addPreAnimation( shared_ptr<PromotionAnimation>(new PromotionAnimation(old_sprite, sprite)) );
       }
     }
-  }
 
-  //TODO: implement pool update
+    //TODO: implement pool update
 
-  return res;
-};
-
-
-
-typedef UnwrappedGraphicalAPI<ChessVariant> ChessGraphicalAPI;
-
-class ChessAnimator {
-  ChessGraphicalAPI* m_cinterface;
-public:
-  ChessAnimator(ChessGraphicalAPI* cinterface)
-    : m_cinterface(cinterface) {
+    return res;
   }
-
-  AnimationPtr warp(ChessPosition* final) {
-    ChessPosition* current = m_cinterface->position();
-    AnimationPtr res(new AnimationGroup);
-
-    for (Point i = m_current->first(); i <= m_position->last(); i = m_position->next(i)) {
-      ChessPiece* c = current->get(i);
-      ChessPiece* f = final->get(i);
-
-      if( !c && f ) {
-        current->set(i, f);
-        PieceSpritePtr sprite = m_cinterface->setSprite(i, *f, false, false);
-        res->addPreAnimation( shared_ptr<DropAnimation>(new DropAnimation(sprite)) );
-      }
-      else if (c && !f) {
-        current->set(i, shared_ptr<ChessPiece>());
-        PieceSpritePtr old_sprite = m_cinterface->getSprite(i);
-        res->addPreAnimation( shared_ptr<CaptureAnimation>(new CaptureAnimation(sprite)) );
-      }
-      else if(!c.equals(f) ) {
-        current->set(i, f);
-        PieceSpritePtr old_sprite = m_cinterface->takeSprite(i);
-        res->addPreAnimation( shared_ptr<PromotionProAnimation>(new PromotionAnimation(sprite)) );
-      }
-    }
-  }
-
-  return res;
 };
 
 
diff --git a/src/variants/chess.h b/src/variants/chess.h
index eea68c8..2cfeaed 100644
--- a/src/variants/chess.h
+++ b/src/variants/chess.h
@@ -21,6 +21,7 @@
 class ChessPiece;
 class ChessMove;
 class ChessAnimator;
+class VariantInfo;
 template <typename T> class PointerGrid;
 template <typename M, typename P, typename B> class Position;
 typedef Grid<ChessPiece> PieceGrid;
diff --git a/src/variants/connect4.cpp b/src/variants/connect4.cpp_
similarity index 100%
rename from src/variants/connect4.cpp
rename to src/variants/connect4.cpp_
diff --git a/src/variants/connect4.h b/src/variants/connect4.h_
similarity index 100%
rename from src/variants/connect4.h
rename to src/variants/connect4.h_
diff --git a/src/variants/crazyhouse.cpp b/src/variants/crazyhouse.cpp_
similarity index 100%
rename from src/variants/crazyhouse.cpp
rename to src/variants/crazyhouse.cpp_
diff --git a/src/variants/crazyhouse.h b/src/variants/crazyhouse.h_
similarity index 100%
rename from src/variants/crazyhouse.h
rename to src/variants/crazyhouse.h_
diff --git a/src/variants/crazyhouse_p.h b/src/variants/crazyhouse_p.h_
similarity index 99%
rename from src/variants/crazyhouse_p.h
rename to src/variants/crazyhouse_p.h_
index 18dbea2..4db7616 100644
--- a/src/variants/crazyhouse_p.h
+++ b/src/variants/crazyhouse_p.h_
@@ -153,6 +153,8 @@ public:
   }
 };
 
+#if 0
+//BROKEN
 template <typename Variant>
 class DropAnimator : public SimpleAnimator<Variant> {
 protected:
@@ -199,5 +201,6 @@ template <typename Variant>
 typename DropAnimator<Variant>::AnimationPtr DropAnimator<Variant>::warp(const Position& final) {
 	this->m_position->updatePool(final.pool());
 }
+#endif
 
 #endif // CRAZYHOUSE_P_H
diff --git a/src/variants/dummy.cpp b/src/variants/dummy.cpp_
similarity index 100%
rename from src/variants/dummy.cpp
rename to src/variants/dummy.cpp_
diff --git a/src/variants/dummy.h b/src/variants/dummy.h_
similarity index 100%
rename from src/variants/dummy.h
rename to src/variants/dummy.h_
diff --git a/src/variants/king4pawns.cpp b/src/variants/king4pawns.cpp_
similarity index 100%
rename from src/variants/king4pawns.cpp
rename to src/variants/king4pawns.cpp_
diff --git a/src/variants/king4pawns.h b/src/variants/king4pawns.h_
similarity index 100%
rename from src/variants/king4pawns.h
rename to src/variants/king4pawns.h_
diff --git a/src/variants/progressive.cpp b/src/variants/progressive.cpp_
similarity index 100%
rename from src/variants/progressive.cpp
rename to src/variants/progressive.cpp_
diff --git a/src/variants/progressive.h b/src/variants/progressive.h_
similarity index 100%
rename from src/variants/progressive.h
rename to src/variants/progressive.h_
diff --git a/src/variants/reversi.cpp b/src/variants/reversi.cpp_
similarity index 100%
rename from src/variants/reversi.cpp
rename to src/variants/reversi.cpp_
diff --git a/src/variants/reversi.h b/src/variants/reversi.h_
similarity index 100%
rename from src/variants/reversi.h
rename to src/variants/reversi.h_
diff --git a/src/variants/rubyvariant.cpp b/src/variants/rubyvariant.cpp_
similarity index 100%
rename from src/variants/rubyvariant.cpp
rename to src/variants/rubyvariant.cpp_
diff --git a/src/variants/rubyvariant.h b/src/variants/rubyvariant.h_
similarity index 100%
rename from src/variants/rubyvariant.h
rename to src/variants/rubyvariant.h_
diff --git a/src/variants/shogi.cpp b/src/variants/shogi.cpp_
similarity index 100%
rename from src/variants/shogi.cpp
rename to src/variants/shogi.cpp_
diff --git a/src/variants/shogi.h b/src/variants/shogi.h_
similarity index 100%
rename from src/variants/shogi.h
rename to src/variants/shogi.h_
diff --git a/src/variants/trivialanimator.h b/src/variants/trivialanimator.h_
similarity index 100%
rename from src/variants/trivialanimator.h
rename to src/variants/trivialanimator.h_
diff --git a/src/variants/variants.cpp b/src/variants/variants.cpp
index 888e133..6d21cc1 100644
--- a/src/variants/variants.cpp
+++ b/src/variants/variants.cpp
@@ -11,6 +11,8 @@
 #include "variants.h"
 #include "kboard.h"
 #include "variants/chess.h"
+
+#if 0
 #include "variants/crazyhouse.h"
 #include "variants/atomic.h"
 #include "variants/king4pawns.h"
@@ -21,6 +23,7 @@
 #include "variants/dummy.h"
 #include "variants/shogi.h"
 #include "variants/xiangqi.h"
+#endif
 
 bool Variant::s_initialized = false;
 
diff --git a/src/variants/xchess/position.h b/src/variants/xchess/position.h
index c920f70..6f16588 100644
--- a/src/variants/xchess/position.h
+++ b/src/variants/xchess/position.h
@@ -101,7 +101,7 @@ public:
     return valid(p) && m_board[p] ? &m_board[p] : 0;
   }
   virtual const P* operator[](const Point& p) const { return get(p); }
-  inline void set(const Point& p, P* piece) {
+  inline void set(const Point& p, const P* piece) {
     if(!valid(p))
       return;
     if(piece)
diff --git a/src/variants/xiangqi.cpp b/src/variants/xiangqi.cpp_
similarity index 100%
rename from src/variants/xiangqi.cpp
rename to src/variants/xiangqi.cpp_
diff --git a/src/variants/xiangqi.h b/src/variants/xiangqi.h_
similarity index 100%
rename from src/variants/xiangqi.h
rename to src/variants/xiangqi.h_
-- 
2.11.4.GIT