projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ed <icelus2k5@gmail.com>'s worldmap teleporter camera pan patch
[supertux.git]
/
src
/
worldmap
/
teleporter.cpp
diff --git
a/src/worldmap/teleporter.cpp
b/src/worldmap/teleporter.cpp
index
26dbeca
..
d1a7ffb
100644
(file)
--- a/
src/worldmap/teleporter.cpp
+++ b/
src/worldmap/teleporter.cpp
@@
-31,12
+31,12
@@
Teleporter::Teleporter(const lisp::Lisp* lisp)
{
lisp->get("x", pos.x);
lisp->get("y", pos.y);
{
lisp->get("x", pos.x);
lisp->get("y", pos.y);
-
+
std::string spritefile = "";
if (lisp->get("sprite", spritefile)) {
sprite.reset(sprite_manager->create(spritefile));
}
std::string spritefile = "";
if (lisp->get("sprite", spritefile)) {
sprite.reset(sprite_manager->create(spritefile));
}
-
+
lisp->get("worldmap", worldmap);
lisp->get("spawnpoint", spawnpoint);
lisp->get("automatic", automatic);
lisp->get("worldmap", worldmap);
lisp->get("spawnpoint", spawnpoint);
lisp->get("automatic", automatic);
@@
-55,4
+55,3
@@
Teleporter::update(float )
}
}
}
}
-