From 398dd3c5c5b614acfabf8b43346891a89986f6d2 Mon Sep 17 00:00:00 2001
From: Maurizio Monge <maurizio@localhost.localdomain>
Date: Fri, 13 Jul 2007 23:08:38 +0200
Subject: [PATCH] Cleaned old and commented code that used m_drop_sprite.

---
 src/board.h             |  6 ------
 src/graphicalsystem.cpp | 17 +----------------
 src/piecepool.cpp       | 19 -------------------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/board.h b/src/board.h
index be017fc..fcc0f90 100644
--- a/src/board.h
+++ b/src/board.h
@@ -81,12 +81,6 @@ private:
   /** displayed m_sprites */
   PieceGrid   m_sprites;
 
-#if 0
-  /** used by a PiecePool to make available the piece that is being dropped
-     on the board to the GraphicalInfo and the variant-specific animator */
-  NamedSprite m_drop_sprite;
-#endif
-
   /** the visual move hint */
   NamedSprite m_hinting;
   Point m_hinting_pos;
diff --git a/src/graphicalsystem.cpp b/src/graphicalsystem.cpp
index 3b7e684..7a76d45 100644
--- a/src/graphicalsystem.cpp
+++ b/src/graphicalsystem.cpp
@@ -114,25 +114,10 @@ NamedSprite GraphicalSystem::createPiece(const Point& p, const AbstractPiece* pi
   if (!m_board->m_sprites.valid(p))
     return NamedSprite();
 
-  QPixmap px = m_board->m_loader(piece->name());
-
-#if 0
-  SpritePtr s;
-  if (usedrop && m_board->m_drop_sprite) {
-    s = m_board->m_drop_sprite.sprite();
-    m_board->m_drop_sprite = NamedSprite();
-  }
-  else {
-    s = m_board->createSprite(px, p);
-    if (show) s->show();
-  }
-  return m_board->m_sprites[p] = NamedSprite(piece->name(), s);
-#else
-  NamedSprite s(piece->name(), m_board->createSprite(px, p));
+  NamedSprite s(piece->name(), m_board->createSprite(m_board->m_loader(piece->name()), p));
   if (show)
     s.sprite()->show();
   return s;
-#endif
 }
 
 void GraphicalSystem::setSprite(const Point& p, const NamedSprite& sprite) {
diff --git a/src/piecepool.cpp b/src/piecepool.cpp
index 4845d61..f75220c 100644
--- a/src/piecepool.cpp
+++ b/src/piecepool.cpp
@@ -237,19 +237,6 @@ void PiecePool::onMouseRelease(const QPoint& pos, int button) {
   m_board->m_dropped_pool = -1;
   m_board->m_dropped_index = -1;
 
-#if 0
-  bool fadeOff = true;
-  if(!m_board->m_drop_sprite && m_dragged) {
-
-    //this happens if the animator used the piece being dropped but removed another piece from the pool
-    //for instance it remove another piece of the same type.
-    m_dragged = NamedSprite( m_dragged.name(), SpritePtr(m_dragged.sprite()->duplicate()) );
-    fadeOff = false;
-  }
-  m_board->m_drop_sprite = NamedSprite();
-  cancelDragging(fadeOff);
-#endif
-
   cancelDragging(true);
 }
 
@@ -260,9 +247,6 @@ void PiecePool::onMousePress(const QPoint& pos, int button) {
 
   if(m_dragged) {
     std::cout << "Eh? We are already dragging?" << std::endl;
-#if 0
-    m_board->m_drop_sprite = NamedSprite();
-#endif
     cancelDragging(); //never remove implicitly a piece from the pool
   }
 
@@ -280,9 +264,6 @@ void PiecePool::onMousePress(const QPoint& pos, int button) {
   m_dragged.sprite()->raise();
   m_dragged.sprite()->show();
   m_dragged_index = index;
-#if 0
-  m_board->m_drop_sprite = m_dragged;
-#endif
 }
 
 /*****************************************************************************************/
-- 
2.11.4.GIT