projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* In the usage help, put LEVELFILE into brackets since it's an optional argument.
[supertux.git]
/
src
/
tile.cpp
diff --git
a/src/tile.cpp
b/src/tile.cpp
index
68e271e
..
0712dcd
100644
(file)
--- a/
src/tile.cpp
+++ b/
src/tile.cpp
@@
-69,8
+69,8
@@
Tile::parse(const lisp::Lisp& reader)
attributes |= ICE;
if(reader.get("water", value) && value)
attributes |= WATER;
attributes |= ICE;
if(reader.get("water", value) && value)
attributes |= WATER;
- if(reader.get("
spike
", value) && value)
- attributes |=
SPIKE
;
+ if(reader.get("
hurts
", value) && value)
+ attributes |=
HURTS
;
if(reader.get("fullbox", value) && value)
attributes |= FULLBOX;
if(reader.get("coin", value) && value)
if(reader.get("fullbox", value) && value)
attributes |= FULLBOX;
if(reader.get("coin", value) && value)