projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed missing include assert
[supertux.git]
/
src
/
tile.cpp
diff --git
a/src/tile.cpp
b/src/tile.cpp
index
a57d304
..
20835fb
100644
(file)
--- a/
src/tile.cpp
+++ b/
src/tile.cpp
@@
-24,11
+24,10
@@
#include <iostream>
#include <stdexcept>
#include <iostream>
#include <stdexcept>
-#include "app/globals.h"
#include "lisp/lisp.h"
#include "tile.h"
#include "lisp/lisp.h"
#include "tile.h"
-#include "scene.h"
#include "resources.h"
#include "resources.h"
+#include "timer.h"
#include "math/vector.h"
#include "video/drawing_context.h"
#include "math/vector.h"
#include "video/drawing_context.h"
@@
-68,8
+67,6
@@
Tile::parse(const lisp::Lisp& reader)
attributes |= SPIKE;
if(reader.get("fullbox", value) && value)
attributes |= FULLBOX;
attributes |= SPIKE;
if(reader.get("fullbox", value) && value)
attributes |= FULLBOX;
- if(reader.get("distro", value) && value)
- attributes |= COIN;
if(reader.get("coin", value) && value)
attributes |= COIN;
if(reader.get("goal", value) && value)
if(reader.get("coin", value) && value)
attributes |= COIN;
if(reader.get("goal", value) && value)