-// $Id: worldmap.cpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
+// $Id$
//
// SuperTux - A Jump'n Run
// Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
#include "video/drawing_context.hpp"
#include "player_status.hpp"
#include "worldmap.hpp"
-#include "level.hpp"
+#include "worldmap/level.hpp"
#include "special_tile.hpp"
#include "sprite_change.hpp"
#include "control/joystickkeyboardcontroller.hpp"
+#include "scripting/squirrel_util.hpp"
#include "main.hpp"
namespace WorldMapNS
if (input_direction == D_NONE)
return;
- Level* level = worldmap->at_level();
+ LevelTile* level = worldmap->at_level();
// We got a new direction, so lets start walking when possible
Vector next_tile;
// if this is a special_tile with passive_message, display it
SpecialTile* special_tile = worldmap->at_special_tile();
- if(special_tile && special_tile->passive_message)
+ if(special_tile)
{
// direction and the apply_action_ are opposites, since they "see"
// directions in a different way
(direction == D_WEST && special_tile->apply_action_east) ||
(direction == D_EAST && special_tile->apply_action_west))
{
- worldmap->passive_message = special_tile->map_message;
- worldmap->passive_message_timer.start(map_message_TIME);
+ if(special_tile->passive_message) {
+ worldmap->passive_message = special_tile->map_message;
+ worldmap->passive_message_timer.start(map_message_TIME);
+ } else if(special_tile->script != "") {
+ try {
+ std::istringstream in(special_tile->script);
+ worldmap->run_script(in, "specialtile");
+ } catch(std::exception& e) {
+ log_warning << "Couldn't execute special tile script: " << e.what()
+ << std::endl;
+ }
+ }
}
}
// stop if we reached a level, a WORLDMAP_STOP tile or a special tile without a passive_message
if ((worldmap->at_level())
|| (worldmap->at(tile_pos)->getData() & Tile::WORLDMAP_STOP)
- || (special_tile && !special_tile->passive_message)) {
+ || (special_tile && !special_tile->passive_message
+ && special_tile->script == "")) {
if(special_tile && !special_tile->map_message.empty()
&& !special_tile->passive_message)
worldmap->passive_message_timer.start(0);