* Added scrolling support to InfoBlocks (we'll need an up and a down arrow image to display when scrolling can be performed)
SVN-Revision: 2918
|| main_controller->pressed(Controller::PAUSE_MENU)
|| main_controller->pressed(Controller::MENU_SELECT))
running = false;
|| main_controller->pressed(Controller::PAUSE_MENU)
|| main_controller->pressed(Controller::MENU_SELECT))
running = false;
+ else if(main_controller->pressed(Controller::DOWN))
+ box->scrolldown();
+ else if(main_controller->pressed(Controller::UP))
+ box->scrollup();
box->draw(*context);
draw();
sound_manager->update();
box->draw(*context);
draw();
sound_manager->update();
void
InfoBlock::hit(Player& )
{
void
InfoBlock::hit(Player& )
{
- GameSession::current()->display_info_box(message);
start_bounce();
if (!stopped) {
ringing->remove_me();
stopped = true;
}
start_bounce();
if (!stopped) {
ringing->remove_me();
stopped = true;
}
+ GameSession::current()->display_info_box(message);
}
IMPLEMENT_FACTORY(InfoBlock, "infoblock")
}
IMPLEMENT_FACTORY(InfoBlock, "infoblock")
: firstline(0)
{
split_text(text, lines);
: 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)));
+ }
+ }
+ for(std::map<std::string, Surface*>::iterator i = images.begin();
+ i != images.end(); ++i)
+ delete i->second;
+ const Surface* image = 0;
bool center = true;
switch(line[0])
{
bool center = true;
switch(line[0])
{
case '-': font = heading_font; break;
case '*': font = reference_font; break;
case '#': font = normal_font; center = false; break;
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;
+ }
- std::cerr << "Warning: text contains an unformated line.\n";
+ std::cerr << "Warning: text contains an unformatted line.\n";
font = normal_font;
center = false;
break;
}
font = normal_font;
center = false;
break;
}
+ 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);
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);
} 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;
+ }
#include <vector>
#include <string>
#include <vector>
#include <string>
+#include <map>
+
+#include "video/surface.hpp"
private:
size_t firstline;
std::vector<std::string> lines;
private:
size_t firstline;
std::vector<std::string> lines;
+ std::map<std::string, Surface*> images;
};
/** Reads a text file (using LispReader, so it as to be in its formatting)
};
/** Reads a text file (using LispReader, so it as to be in its formatting)