projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
695fa59
)
Set collision group according to block's solidity. (Fix for 684)
author
Wolfgang Becker
<uafr@gmx.de>
Tue, 24 Aug 2010 17:39:17 +0000
(17:39 +0000)
committer
Wolfgang Becker
<uafr@gmx.de>
Tue, 24 Aug 2010 17:39:17 +0000
(17:39 +0000)
SVN-Revision: 6650
src/object/magicblock.cpp
patch
|
blob
|
history
diff --git
a/src/object/magicblock.cpp
b/src/object/magicblock.cpp
index
072ddc8
..
c69066b
100644
(file)
--- a/
src/object/magicblock.cpp
+++ b/
src/object/magicblock.cpp
@@
-131,9
+131,11
@@
MagicBlock::update(float elapsed_time)
solid_time+=elapsed_time;
color.alpha = ALPHA_SOLID;
sprite->set_action("solid");
+ set_group(COLGROUP_STATIC);
} else {
color.alpha = ALPHA_NONSOLID;
sprite->set_action("normal");
+ set_group(COLGROUP_DISABLED);
}
}