X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftextscroller.cpp;h=1cb243bd973c7d24008d00db66a7f2920f3f0766;hb=df5f7a082ae943e7b326d4e28dc6e0efdabdf96f;hp=9f7a5dd56a4e6b7c98e0802f69a86b62794bc947;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git diff --git a/src/textscroller.cpp b/src/textscroller.cpp index 9f7a5dd56..1cb243bd9 100644 --- a/src/textscroller.cpp +++ b/src/textscroller.cpp @@ -17,20 +17,21 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. - #include -#include "textscroller.h" +#include "textscroller.hpp" #include -#include "resources.h" -#include "video/font.h" -#include "video/drawing_context.h" -#include "app/globals.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "main.h" -#include "control/joystickkeyboardcontroller.h" +#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; @@ -55,7 +56,7 @@ static void split_text(const std::string& text, std::vector& lines) } } -void display_text_file(const std::string& file) +void display_text_file(const std::string& filename) { const Font* heading_font = white_big_text; const Font* normal_font = white_text; @@ -67,8 +68,8 @@ void display_text_file(const std::string& file) std::string text; std::string background_file; std::vector lines; + std::map images; - std::string filename = datadir + "/" + file; lisp::Parser parser; try { std::auto_ptr root (parser.parse(filename)); @@ -92,9 +93,19 @@ void display_text_file(const std::string& file) // Split text string lines into a vector split_text(text, lines); + for(size_t i = 0; i < lines.size(); ++i) { + const std::string& line = lines[i]; + if(line.size() == 0) + continue; + 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))); + } + } + // load background image - Surface* background = new Surface( - get_resource_filename("images/background/" + background_file), false); + Surface* background = new Surface("images/background/" + background_file); bool done = false; float scroll = 0; @@ -111,7 +122,7 @@ void display_text_file(const std::string& file) 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)) { @@ -140,6 +151,7 @@ void display_text_file(const std::string& file) } const Font* font = 0; + const Surface* image = 0; bool center = true; switch(line[0]) { @@ -148,29 +160,42 @@ void display_text_file(const std::string& file) 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"; font = normal_font; center = false; break; } - - if(center) { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT + y - scroll), - CENTER_ALLIGN, LAYER_FOREGROUND1); - } else { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(left_border, SCREEN_HEIGHT + y - scroll), - LEFT_ALLIGN, LAYER_FOREGROUND1); + + if(font != 0) { + if(center) { + context.draw_text(font, + line.substr(1, line.size()-1), + Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT + y - scroll), + CENTER_ALLIGN, LAYER_FOREGROUND1); + } else { + context.draw_text(font, + line.substr(1, line.size()-1), + Vector(left_border, SCREEN_HEIGHT + y - scroll), + LEFT_ALLIGN, LAYER_FOREGROUND1); + } + y += font->get_height() + ITEMS_SPACE; + } + if(image != 0) { + context.draw_surface(image, + Vector( (SCREEN_WIDTH - image->get_width()) / 2, + SCREEN_HEIGHT + y - scroll), 255); + y += image->get_height() + ITEMS_SPACE; } - - y += font->get_height() + ITEMS_SPACE; } context.do_drawing(); + sound_manager->update(); if(SCREEN_HEIGHT+y-scroll < 0 && 20+SCREEN_HEIGHT+y-scroll < 0) done = 1; @@ -183,7 +208,11 @@ void display_text_file(const std::string& file) SDL_Delay(10); } - + + for(std::map::iterator i = images.begin(); + i != images.end(); ++i) + delete i->second; + SDL_EnableKeyRepeat(0, 0); // disables key repeating delete background; } @@ -192,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::iterator i = images.begin(); + i != images.end(); ++i) + delete i->second; } void @@ -205,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) { @@ -226,6 +280,7 @@ InfoBox::draw(DrawingContext& context) } const Font* font = 0; + const Surface* image = 0; bool center = true; switch(line[0]) { @@ -234,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); } }