X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftextscroller.cpp;h=1cb243bd973c7d24008d00db66a7f2920f3f0766;hb=df5f7a082ae943e7b326d4e28dc6e0efdabdf96f;hp=d76342a062eb4048d2612a7a30798966e5eaa30d;hpb=74467e814cadd3f941e69e489afbf17f9741c4c2;p=supertux.git

diff --git a/src/textscroller.cpp b/src/textscroller.cpp
index d76342a06..1cb243bd9 100644
--- a/src/textscroller.cpp
+++ b/src/textscroller.cpp
@@ -25,11 +25,13 @@
 #include "resources.hpp"
 #include "video/font.hpp"
 #include "video/drawing_context.hpp"
+#include "video/surface.hpp"
 #include "lisp/parser.hpp"
 #include "lisp/lisp.hpp"
 #include "audio/sound_manager.hpp"
 #include "main.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
+#include "exceptions.hpp"
 
 static const float DEFAULT_SPEED = .02;
 static const float SCROLL = 60;
@@ -98,13 +100,12 @@ void display_text_file(const std::string& filename)
     if(line[0] == '!') {
       std::string imagename = line.substr(1, line.size()-1);
       std::cout << "Imagename: " << imagename << "\n";
-      images.insert(std::make_pair(imagename, new Surface(imagename, true)));
+      images.insert(std::make_pair(imagename, new Surface(imagename)));
     }
   }
 
   // load background image
-  Surface* background 
-    = new Surface("images/background/" + background_file, false);
+  Surface* background = new Surface("images/background/" + background_file);
 
   bool done = false;
   float scroll = 0;
@@ -121,7 +122,7 @@ void display_text_file(const std::string& filename)
     while(SDL_PollEvent(&event)) {
       main_controller->process_event(event);
       if(event.type == SDL_QUIT)
-        throw std::runtime_error("received window close");
+        throw graceful_shutdown();
     }
 
     if(main_controller->hold(Controller::UP)) {
@@ -187,9 +188,9 @@ void display_text_file(const std::string& filename)
       }
       if(image != 0) {
         context.draw_surface(image,
-            Vector( (SCREEN_WIDTH - image->w) / 2,
+            Vector( (SCREEN_WIDTH - image->get_width()) / 2,
                     SCREEN_HEIGHT + y - scroll), 255);
-        y += image->h + ITEMS_SPACE;
+        y += image->get_height() + ITEMS_SPACE;
       }
     }
     
@@ -220,10 +221,35 @@ InfoBox::InfoBox(const std::string& text)
   : firstline(0)
 {
   split_text(text, lines);
+
+  for(size_t i = 0; i < lines.size(); ++i) {
+    if(lines[i].size() == 0)
+      continue;
+    if(lines[i][0] == '!') {
+      std::string imagename = lines[i].substr(1, lines[i].size()-1);
+      images.insert(std::make_pair(imagename, new Surface(imagename)));
+    }
+  }
+
+  try
+  {
+    // get the arrow sprites
+    arrow_scrollup   = new Surface("images/engine/menu/scroll-up.png");
+    arrow_scrolldown = new Surface("images/engine/menu/scroll-down.png");
+  }
+  catch (std::exception& e)
+  {
+    std::cout << "Could not load scrolling images: " << e.what() << std::endl;
+    arrow_scrollup = 0;
+    arrow_scrolldown = 0;
+  }
 }
 
 InfoBox::~InfoBox()
 {
+  for(std::map<std::string, Surface*>::iterator i = images.begin();
+    i != images.end(); ++i)
+    delete i->second;
 }
 
 void
@@ -233,14 +259,14 @@ InfoBox::draw(DrawingContext& context)
   const Font* normal_font = white_text;
   const Font* small_font = white_small_text;
   const Font* reference_font = blue_text;
-  
+
   float x1 = 200;
   float y1 = 100;
   float width = 400;
   float height = 200;
-  
+
   context.draw_filled_rect(Vector(x1, y1), Vector(width, height),
-      Color(150, 180, 200, 125), LAYER_GUI-1);
+      Color(0.6f, 0.7f, 0.8f, 0.5f), LAYER_GUI-1);
 
   float y = y1;
   for(size_t i = firstline; i < lines.size(); ++i) {
@@ -254,6 +280,7 @@ InfoBox::draw(DrawingContext& context)
     }
 
     const Font* font = 0;
+    const Surface* image = 0;
     bool center = true;
     switch(line[0])
     {
@@ -262,26 +289,48 @@ InfoBox::draw(DrawingContext& context)
       case '-': font = heading_font; break;
       case '*': font = reference_font; break;
       case '#': font = normal_font; center = false; break;
+      case '!': {
+        std::string imagename = line.substr(1, line.size()-1);
+        image = images[imagename];
+        break;
+      }
       default:
-        std::cerr << "Warning: text contains an unformated line.\n";
+        std::cerr << "Warning: text contains an unformatted line.\n";
         font = normal_font;
         center = false;
         break;
     }
-    
-    if(center) {
+
+    if(image != 0) {
+      context.draw_surface(image,
+      Vector( (SCREEN_WIDTH - image->get_width()) / 2,
+              y), LAYER_GUI);
+      y += image->get_height() + ITEMS_SPACE;
+    } else if(center) {
       context.draw_text(font,
           line.substr(1, line.size()-1),
           Vector(SCREEN_WIDTH/2, y),
           CENTER_ALLIGN, LAYER_GUI);
+      y += font->get_height() + ITEMS_SPACE;
     } else {
       context.draw_text(font,
           line.substr(1, line.size()-1),
           Vector(x1, y),
           LEFT_ALLIGN, LAYER_GUI);
+      y += font->get_height() + ITEMS_SPACE;
     }
-      
-    y += font->get_height() + ITEMS_SPACE;
+
+    // draw the scrolling arrows
+    if (arrow_scrollup && firstline > 0)
+      context.draw_surface(arrow_scrollup,
+      Vector( x1 + width  - arrow_scrollup->get_width(),  // top-right corner of box
+              y1), LAYER_GUI);
+
+    if (arrow_scrolldown && firstline < lines.size()-1)
+      context.draw_surface(arrow_scrolldown,
+      Vector( x1 + width  - arrow_scrolldown->get_width(),  // bottom-light corner of box
+              y1 + height - arrow_scrolldown->get_height()),
+              LAYER_GUI);
   }
 }