projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbf855f
)
Hope this takes care of the problems with scripted objects caused by r4076.
author
Wolfgang Becker
<uafr@gmx.de>
Tue, 1 Aug 2006 21:45:40 +0000
(21:45 +0000)
committer
Wolfgang Becker
<uafr@gmx.de>
Tue, 1 Aug 2006 21:45:40 +0000
(21:45 +0000)
SVN-Revision: 4110
src/object/scripted_object.cpp
patch
|
blob
|
history
diff --git
a/src/object/scripted_object.cpp
b/src/object/scripted_object.cpp
index
e95e5b5
..
ee6000b
100644
(file)
--- a/
src/object/scripted_object.cpp
+++ b/
src/object/scripted_object.cpp
@@
-47,6
+47,11
@@
ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
lisp.get("physic-enabled", physic_enabled);
lisp.get("visible", visible);
lisp.get("z-pos", layer);
+ if( solid ){
+ set_group( COLGROUP_MOVING );
+ } else {
+ set_group( COLGROUP_DISABLED );
+ }
}
void
@@
-124,6
+129,11
@@
void
ScriptedObject::set_solid(bool solid)
{
this->solid = solid;
+ if( solid ){
+ set_group( COLGROUP_MOVING );
+ } else {
+ set_group( COLGROUP_DISABLED );
+ }
}
bool