projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turned stuff in supertux/resources.cpp into a class Resources
[supertux.git]
/
src
/
worldmap
/
special_tile.cpp
diff --git
a/src/worldmap/special_tile.cpp
b/src/worldmap/special_tile.cpp
index
9bc419d
..
9fba90b
100644
(file)
--- a/
src/worldmap/special_tile.cpp
+++ b/
src/worldmap/special_tile.cpp
@@
-18,12
+18,13
@@
#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
+#include "util/reader.hpp"
#include "video/drawing_context.hpp"
#include "worldmap/special_tile.hpp"
namespace WorldMapNS {
#include "video/drawing_context.hpp"
#include "worldmap/special_tile.hpp"
namespace WorldMapNS {
-SpecialTile::SpecialTile(const
lisp::Lisp*
lisp) :
+SpecialTile::SpecialTile(const
Reader&
lisp) :
pos(),
sprite(),
map_message(),
pos(),
sprite(),
map_message(),
@@
-35,22
+36,22
@@
SpecialTile::SpecialTile(const lisp::Lisp* lisp) :
apply_action_south(true),
apply_action_west(true)
{
apply_action_south(true),
apply_action_west(true)
{
- lisp
->
get("x", pos.x);
- lisp
->
get("y", pos.y);
- lisp
->
get("invisible-tile", invisible);
+ lisp
.
get("x", pos.x);
+ lisp
.
get("y", pos.y);
+ lisp
.
get("invisible-tile", invisible);
if(!invisible) {
std::string spritefile = "";
if(!invisible) {
std::string spritefile = "";
- lisp
->
get("sprite", spritefile);
+ lisp
.
get("sprite", spritefile);
sprite = sprite_manager->create(spritefile);
}
sprite = sprite_manager->create(spritefile);
}
- lisp
->
get("map-message", map_message);
- lisp
->
get("passive-message", passive_message);
- lisp
->
get("script", script);
+ lisp
.
get("map-message", map_message);
+ lisp
.
get("passive-message", passive_message);
+ lisp
.
get("script", script);
std::string apply_direction;
std::string apply_direction;
- lisp
->
get("apply-to-direction", apply_direction);
+ lisp
.
get("apply-to-direction", apply_direction);
if(!apply_direction.empty()) {
apply_action_north = false;
apply_action_south = false;
if(!apply_direction.empty()) {
apply_action_north = false;
apply_action_south = false;