Scroll nonblocking infoblock by moving half a block away.

SVN-Revision: 4975

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 770d69c..e5957f3 100644 (file)
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -29,8 +29,13 @@
 #include "log.hpp"
 #include "object/player.hpp"
 
+namespace {
+  const float SCROLL_DELAY = 0.5;
+  const float SCROLL_DISTANCE = 16;
+}
+
 InfoBlock::InfoBlock(const lisp::Lisp& lisp)
-  : Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite")), shown_pct(0), dest_pct(0)
+  : Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite")), shown_pct(0), dest_pct(0), slowdown_scroll(0)
 {
   Vector pos;
   lisp.get("x", pos.x);
@@ -98,7 +103,7 @@ InfoBlock::update(float delta)
 {
   if (delta == 0) return;
 
-  // hide message if player is too far away
+  // hide message if player is too far away or above infoblock
   if (dest_pct > 0) {
     Player* player = get_nearest_player();
     if (player) {
@@ -106,7 +111,17 @@ InfoBlock::update(float delta)
       Vector p2 = player->get_pos() + (player->get_bbox().p2 - player->get_bbox().p1) / 2;
       Vector dist = (p2 - p1);
       float d = dist.norm();
-      if (d > 128) dest_pct = 0;
+      if (d > 128 || dist.y < 0) dest_pct = 0;
+      slowdown_scroll += delta; 
+      if ( slowdown_scroll > SCROLL_DELAY ) {
+        slowdown_scroll = 0; 
+        if (dist.x > SCROLL_DISTANCE) {
+          infoBox->scrolldown();
+        }
+        if( dist.x < -SCROLL_DISTANCE) {
+          infoBox->scrollup();
+        }
+      }
     }
   }
 

diff --git a/src/object/infoblock.hpp b/src/object/infoblock.hpp
index 65eaf16..f67b81a 100644 (file)
--- a/src/object/infoblock.hpp
+++ b/src/object/infoblock.hpp
@@ -45,6 +45,9 @@ protected:
   std::auto_ptr<InfoBox> infoBox;
 
   Player* get_nearest_player();
+
+private:
+  float slowdown_scroll;
 };
 
 #endif

diff --git a/tools/autopackage/default.apspec b/tools/autopackage/default.apspec
index 030b89f..4e2601f 100644 (file)
--- a/tools/autopackage/default.apspec
+++ b/tools/autopackage/default.apspec
@@ -9,7 +9,7 @@ Maintainer: SuperTux Development Team <supertux-devel@lists.berlios.de>
 Packager: Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 Summary: SuperTux is a classic style 2D jump and run sidescroller game in a style similar to the original SuperMario games.
 SoftwareVersion: 0.3.0
-PackageVersion: 1
+PackageVersion: 2
 AutopackageTarget: 1.0
 
 [Description]