projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qmax patch to fix bug #0000389 - colors in infoblocks
[supertux.git]
/
src
/
badguy
/
treewillowisp.cpp
diff --git
a/src/badguy/treewillowisp.cpp
b/src/badguy/treewillowisp.cpp
index
db417a6
..
4a0c06b
100644
(file)
--- a/
src/badguy/treewillowisp.cpp
+++ b/
src/badguy/treewillowisp.cpp
@@
-38,6
+38,8
@@
TreeWillOWisp::TreeWillOWisp(GhostTree* tree, const Vector& pos,
this->angle = 0;
this->speed = speed;
start_position = tree->get_pos() + treepos_delta;
this->angle = 0;
this->speed = speed;
start_position = tree->get_pos() + treepos_delta;
+
+ set_colgroup_active(COLGROUP_MOVING);
}
TreeWillOWisp::~TreeWillOWisp()
}
TreeWillOWisp::~TreeWillOWisp()
@@
-53,8
+55,6
@@
TreeWillOWisp::activate()
sound_source->set_gain(2.0);
sound_source->set_reference_distance(32);
sound_source->play();
sound_source->set_gain(2.0);
sound_source->set_reference_distance(32);
sound_source->play();
-
- set_group(COLGROUP_MOVING);
}
void
}
void
@@
-62,7
+62,7
@@
TreeWillOWisp::vanish()
{
mystate = STATE_VANISHING;
sprite->set_action("vanishing", 1);
{
mystate = STATE_VANISHING;
sprite->set_action("vanishing", 1);
- set_
group
(COLGROUP_DISABLED);
+ set_
colgroup_active
(COLGROUP_DISABLED);
}
void
}
void
@@
-92,6
+92,19
@@
TreeWillOWisp::collides(GameObject& other, const CollisionHit& ) {
}
void
}
void
+TreeWillOWisp::draw(DrawingContext& context)
+{
+ sprite->draw(context, get_pos(), layer);
+
+ context.push_target();
+ context.set_target(DrawingContext::LIGHTMAP);
+
+ sprite->draw(context, get_pos(), layer);
+
+ context.pop_target();
+}
+
+void
TreeWillOWisp::active_update(float elapsed_time)
{
// remove TreeWillOWisp if it has completely vanished
TreeWillOWisp::active_update(float elapsed_time)
{
// remove TreeWillOWisp if it has completely vanished